修改部分问题

BaseLibrary/src/main/java/com/cooleshow/base/utils/AppUtils.java

@@ -853,6 +853,10 @@ public final class AppUtils {
                 for (ActivityManager.RunningAppProcessInfo app : runApps) {
                     if (app.processName.equals(context.getPackageName())) {
                         //不是前台进程就返回true
+                        LOG.i("app.importance:" + app.importance);
+                        if(app.importance == ActivityManager.RunningAppProcessInfo.IMPORTANCE_VISIBLE){
+                            return false;
+                        }
                         if (app.importance != ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
                             return true;
                         }
@@ -893,13 +897,13 @@ public final class AppUtils {
      */
     public static class AppInfo {
 
-        private String   packageName;
-        private String   name;
+        private String packageName;
+        private String name;
         private Drawable icon;
-        private String   packagePath;
-        private String   versionName;
-        private int      versionCode;
-        private boolean  isSystem;
+        private String packagePath;
+        private String versionName;
+        private int versionCode;
+        private boolean isSystem;
 
         public Drawable getIcon() {
             return icon;
@@ -986,13 +990,14 @@ public final class AppUtils {
 
     /**
      * 检测是否安装支付宝
-     * @return     * @param context
+     *
+     * @return * @param context
      */
-    public static boolean checkAliPayInstalled(Context context){
+    public static boolean checkAliPayInstalled(Context context) {
         Uri uri = Uri.parse("alipays://platformapi/startApp");
-        Intent intent = new Intent(Intent.ACTION_VIEW,uri);
+        Intent intent = new Intent(Intent.ACTION_VIEW, uri);
         ComponentName componentName = intent.resolveActivity(context.getPackageManager());
-        return componentName!=null;
+        return componentName != null;
 
     }
 }

tclive/src/main/java/com/daya/tclive/ui/floatPop/FloatWindowHelper.java

@@ -23,6 +23,7 @@ import android.widget.RelativeLayout;
 import com.cooleshow.base.common.AppManager;
 import com.cooleshow.base.utils.ActivityUtils;
 import com.cooleshow.base.utils.AppUtils;
+import com.cooleshow.base.utils.LOG;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIDisplayHelper;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
@@ -304,6 +305,10 @@ public class FloatWindowHelper implements View.OnTouchListener {
             if (taskInfoList != null) {
                 for (ActivityManager.RunningTaskInfo taskInfo : taskInfoList) {
                     //找到本应用的 task，并将它切换到前台
+                    if (taskInfo.topActivity != null) {
+                        LOG.i("taskInfo:" + taskInfo.topActivity.getClassName());
+                        LOG.i("taskInfo:" + taskInfo.topActivity.getPackageName());
+                    }
                     if (taskInfo.topActivity != null && taskInfo.topActivity.getPackageName().equals(context.getPackageName())) {
                         activityManager.moveTaskToFront(taskInfo.id, 0);
                         break;

usercenter/src/main/java/com/cooleshow/usercenter/helper/UserHelper.java

@@ -6,6 +6,7 @@ import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.data.net.CommonParamsHelper;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.utils.DateUtil;
+import com.cooleshow.base.utils.LOG;
 import com.cooleshow.base.utils.SPUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.usercenter.R;
@@ -138,9 +139,9 @@ public class UserHelper {
         //头像
         SPUtils.getInstance().put(USER_AVATAR, userInfo.heardUrl);
         //机构id
-        SPUtils.getInstance().put(TENANTID_KEY, userInfo.tenantId);
+        SPUtils.getInstance().put(TENANTID_KEY+ "_" + getUserId(), userInfo.tenantId);
         //机构名称
-        SPUtils.getInstance().put(TENANTNAME_KEY, userInfo.getTenantName());
+        SPUtils.getInstance().put(TENANTNAME_KEY+ "_" + getUserId(), userInfo.getTenantName());
 
     }
 
@@ -161,9 +162,9 @@ public class UserHelper {
         //头像
         SPUtils.getInstance().put(USER_AVATAR, userInfo.heardUrl);
         //机构id
-        SPUtils.getInstance().put(TENANTID_KEY, userInfo.getTenantId());
+        SPUtils.getInstance().put(TENANTID_KEY+ "_" + getUserId(), userInfo.getTenantId());
         //机构名称
-        SPUtils.getInstance().put(TENANTNAME_KEY, userInfo.getTenantName());
+        SPUtils.getInstance().put(TENANTNAME_KEY+ "_" + getUserId(), userInfo.getTenantName());
 
     }
 
@@ -192,11 +193,11 @@ public class UserHelper {
     }
 
     public static String getTenantName() {
-        return SPUtils.getInstance().getString(TENANTNAME_KEY);
+        return SPUtils.getInstance().getString(TENANTNAME_KEY+ "_" + getUserId());
     }
 
     public static String getTenantId() {
-        return SPUtils.getInstance().getString(TENANTID_KEY, "-1");
+        return SPUtils.getInstance().getString(TENANTID_KEY+ "_" + getUserId(), "-1");
     }
 
     public static String getTeacherName(String name, String id) {
@@ -266,6 +267,7 @@ public class UserHelper {
     }
 
     public static boolean isTenantAccount(String tenantId) {
+        LOG.i("isTenantAccount:"+tenantId);
         if (TextUtils.isEmpty(tenantId)) {
             return false;
         }