修复部分bug

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

@@ -52,10 +52,5 @@ public class ErrorParse {
         }
         ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
                 .navigation();
-       /* UserHelper.saveUserToken("");
-        ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
-                .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
-                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
-                .navigation();*/
     }
 }

student/src/main/java/com/cooleshow/student/ui/mine/ModifyPasswordActivity.java

@@ -126,7 +126,6 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
         UserHelper.saveUserToken("");
         ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
                 .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
-                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
                 .navigation();
         finish();
     }

student/src/main/java/com/cooleshow/student/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -53,7 +53,6 @@ public class JsInterfaceAccomPanyUtils extends Object {
                     UserHelper.saveUserToken("");
                     ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
                             .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
                             .navigation();
                     activity.finish();
                 } else if ("openConversationActivity".equals(api)) {

student/src/main/java/com/cooleshow/student/widgets/helper/JsInterfaceUtils.java

@@ -53,11 +53,7 @@ public class JsInterfaceUtils extends Object {
                     activity.finish();
                 }
                 if ("login".equals(api)) {
-                    UserHelper.saveUserToken("");
-                    ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
-                            .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
-                            .navigation();
+                    UserHelper.logout();
                     activity.finish();
                 }
                 if ("openConversationActivity".equals(api)) {

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/HomePageActivity.java

@@ -161,17 +161,8 @@ public class HomePageActivity extends BaseMVPActivity<ActivityHomePageLayoutBind
             viewBinding.tvNoScore.setVisibility(View.VISIBLE);
         }
         //徽章信息
-        if (!TextUtils.isEmpty(info.tag)) {
-            viewBinding.llBadge.setVipIcon(info.isVip == 1);
-            viewBinding.llBadge.setData(info.tag);
-        } else {
-            if (info.isVip == 1) {
-                viewBinding.llBadge.setVipIcon(true);
-            } else {
-                viewBinding.llBadge.setVipIcon(false);
-            }
-        }
-
+        viewBinding.llBadge.setVipIcon(info.isVip == 1);
+        viewBinding.llBadge.setData(info.tag);
         //粉丝数
         viewBinding.tvFansNum.setText(info.fansNum);
         //已上课时数

teacher/src/main/java/com/cooleshow/teacher/ui/main/HomeFragment.kt

@@ -100,16 +100,8 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
             mViewBinding.ratingBar.visibility = View.GONE
             mViewBinding.tvNoScore.visibility = View.VISIBLE
         }
-        if (!TextUtils.isEmpty(teacherUserInfo.tag)) {
-            mViewBinding.llBadge.setVipIcon(teacherUserInfo.isVip == 1)
-            mViewBinding.llBadge.setData(teacherUserInfo.tag)
-        } else {
-            if (teacherUserInfo.isVip == 1) {
-                mViewBinding.llBadge.setVipIcon(true)
-            } else {
-                mViewBinding.llBadge.setVipIcon(false)
-            }
-        }
+        mViewBinding.llBadge.setData(teacherUserInfo.tag)
+        mViewBinding.llBadge.setVipIcon(teacherUserInfo.isVip == 1)
 
         //粉丝数
         mViewBinding.tvFansNum.text = teacherUserInfo.fansNum;

teacher/src/main/java/com/cooleshow/teacher/ui/main/MineFragment.java

@@ -84,18 +84,8 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
             mViewBinding.ratingBar.setVisibility(View.GONE);
             mViewBinding.tvNoScore.setVisibility(View.VISIBLE);
         }
-
-        if (!TextUtils.isEmpty(teacherUserInfo.tag)) {
-            mViewBinding.llBadge.setVipIcon(teacherUserInfo.isVip == 1);
-            mViewBinding.llBadge.setData(teacherUserInfo.tag);
-        } else {
-            if (teacherUserInfo.isVip == 1) {
-                mViewBinding.llBadge.setVipIcon(true);
-            } else {
-                mViewBinding.llBadge.setVipIcon(false);
-            }
-        }
-
+        mViewBinding.llBadge.setVipIcon(teacherUserInfo.isVip == 1);
+        mViewBinding.llBadge.setData(teacherUserInfo.tag);
         //粉丝数
         mViewBinding.tvFansNum.setText(teacherUserInfo.fansNum);
         //已上课时数

teacher/src/main/java/com/cooleshow/teacher/ui/mine/ModifyPasswordActivity.java

@@ -139,7 +139,6 @@ public class ModifyPasswordActivity extends BaseMVPActivity<ActivityModifyPasswo
         UserHelper.saveUserToken("");
         ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
                 .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
-                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
                 .navigation();
 
         finish();

teacher/src/main/java/com/cooleshow/teacher/ui/mine/SettingActivity.java

@@ -65,7 +65,6 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
                 UserHelper.saveUserToken("");
                 ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
                         .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
-//                        .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
                         .navigation();
                 break;
             case R.id.cl_feedback:

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -50,11 +50,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                 if ("back".equals(api)) {
                     activity.finish();
                 } else if ("login".equals(api)) {
-                    UserHelper.saveUserToken("");
-                    ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
-                            .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
-                            .navigation();
+                    UserHelper.logout();
                     activity.finish();
                 } else if ("openConversationActivity".equals(api)) {
                     JSONObject contentBean = jsonObject.getJSONObject("content");

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceHelper.java

@@ -106,11 +106,8 @@ public class JsInterfaceHelper extends Object {
             return;
         }
         if (TextUtils.equals(LOGIN, api)) {
-            UserHelper.saveUserToken("");
-            ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
-                    .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
-                    .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
-                    .navigation();
+            UserHelper.logout();
+            activity.finish();
             return;
         }
         if (TextUtils.equals(OPENACCOMPANYWEBVIEW, api)) {

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceUtils.java

@@ -13,6 +13,7 @@ import android.webkit.JavascriptInterface;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.common.WebApi;
 import com.cooleshow.base.router.RouterPath;
+import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.usercenter.constants.UserConstants;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.gyf.immersionbar.ImmersionBar;
@@ -54,11 +55,7 @@ public class JsInterfaceUtils extends Object {
                     return;
                 }
                 if ("login".equals(api)) {
-                    UserHelper.saveUserToken("");
-                    ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
-                            .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
-                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK)
-                            .navigation();
+                    UserHelper.logout();
                     activity.finish();
                     return;
                 }

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

@@ -2,7 +2,9 @@ package com.cooleshow.usercenter.helper;
 
 import android.text.TextUtils;
 
+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.SPUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.usercenter.R;
@@ -176,4 +178,9 @@ public class UserHelper {
         //头像
         SPUtils.getInstance().put(USER_AVATAR, "");
     }
+
+    public static void logout(){
+        ARouter.getInstance().build(RouterPath.UserCenter.PATH_VERIFY_LOGIN)
+                .navigation();
+    }
 }