Browse Source

修改部分问题

Pq 1 year ago
parent
commit
5b581ca448

+ 7 - 3
BaseLibrary/src/main/java/com/cooleshow/base/common/BaseConstant.java

@@ -29,9 +29,9 @@ public class BaseConstant {
     public final static String CHECK_ADDRESS = "check_address";
     public static final String CLIENT_API_GROUP_NAME = getClientApiGroup();
 
-    public static final String CLIENT_TYPE =getClientType();
-    public static final String TEACHER_CLIENT_TYPE ="TEACHER";
-    public static final String STUDENT_CLIENT_TYPE ="STUDENT";
+    public static final String CLIENT_TYPE = getClientType();
+    public static final String TEACHER_CLIENT_TYPE = "TEACHER";
+    public static final String STUDENT_CLIENT_TYPE = "STUDENT";
 
     private static String getClientType() {
         if (BaseApplication.Companion.isTeacherClient()) {
@@ -58,4 +58,8 @@ public class BaseConstant {
         }
         return STUDENT_GROUP2;
     }
+
+    public static boolean isStudentClient() {
+        return !BaseApplication.Companion.isTeacherClient();
+    }
 }

+ 2 - 1
usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/VerifyCodeLoginActivity.java

@@ -14,6 +14,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.common.AppManager;
 import com.cooleshow.base.common.BaseApplication;
+import com.cooleshow.base.common.BaseConstant;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.constanst.EventConstants;
@@ -165,7 +166,7 @@ public class VerifyCodeLoginActivity extends BaseMVPActivity<ActivityVerifyCodeL
                     int tenantId = data.getIntExtra(UserConstants.TENANT_ID, UserConstants.NO_HAVE_TENANT);
                     //密码登录或者验证码登录(设置密码)等两种登录行为,最终通过这里跳转首页
                     Postcard build = ARouter.getInstance().build(RouterPath.APPCenter.PATH_HOME);
-                    if (tenantId != UserConstants.NO_HAVE_TENANT) {
+                    if (BaseConstant.isStudentClient() && tenantId != UserConstants.NO_HAVE_TENANT) {
                         build = ARouter.getInstance().build(RouterPath.JGCenter.PATH_HOME);
                     }