修改tenantId类型

chatModule/src/main/java/com/cooleshow/chatmodule/ui/CreateGroupActivity.java

@@ -74,8 +74,8 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
     }
 
     private boolean checkTenantCondition() {
-        int tenantId = UserHelper.getTenantId();
-        if (tenantId == UserConstants.NO_HAVE_TENANT) {
+        String tenantId = UserHelper.getTenantId();
+        if (!UserHelper.isTenantAccount(tenantId)) {
             return true;
         }
         int checkId = viewBinding.rgGroupType.getCheckedRadioButtonId();
@@ -94,7 +94,7 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
             ToastUtil.getInstance().showShort("请选择群成员");
             return false;
         }
-        memberListResult =new ArrayList<>();
+        memberListResult = new ArrayList<>();
         for (int i = data.size() - 1; i >= 0; i--) {
             StudentPageListBean.RowsBean rowsBean = data.get(i);
             if (!TextUtils.equals(currentUserId, rowsBean.getUserId())) {
@@ -122,8 +122,8 @@ public class CreateGroupActivity extends BaseMVPActivity<TcActivityCreateGroupBi
     public void initData() {
         super.initData();
         currentUserId = UserHelper.getUserId();
-        int tenantId = UserHelper.getTenantId();
-        if (tenantId != UserConstants.NO_HAVE_TENANT) {
+        String tenantId = UserHelper.getTenantId();
+        if (UserHelper.isTenantAccount(tenantId)) {
             viewBinding.csGroupType.setVisibility(View.VISIBLE);
             viewBinding.csMember.setVisibility(View.VISIBLE);
         }

student/src/main/java/com/cooleshow/student/ui/splash/SplashActivity.kt

@@ -195,7 +195,7 @@ class SplashActivity : BaseActivity<ActivitySplashLayoutBinding>() {
     private fun jumpMain(extra: String) {
         var build: Postcard = ARouter.getInstance().build(RouterPath.APPCenter.PATH_HOME)
         var tenantId = UserHelper.getTenantId()
-        if (tenantId != UserConstants.NO_HAVE_TENANT) {
+        if (UserHelper.isTenantAccount(tenantId)) {
             build = ARouter.getInstance().build(RouterPath.JGCenter.PATH_HOME)
         }
         if (extra.isNotEmpty()) {

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

@@ -126,7 +126,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         GlideUtils.INSTANCE.loadImage(requireContext(), teacherUserInfo.heardUrl, mViewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
         //昵称
         String teacherName = UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId);
-        if (teacherUserInfo.getTenantId() != UserConstants.NO_HAVE_TENANT) {
+        if (UserHelper.isTenantAccount(teacherUserInfo.getTenantId())) {
             mViewBinding.tvNickname.setText(String.format("%s%s", teacherUserInfo.getTenantName(), teacherName));
             mViewBinding.tvNickname.setEllipsize(TextUtils.TruncateAt.MARQUEE);
         } else {

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

@@ -581,7 +581,7 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
             String teacherName = UserHelper.getTeacherName(teacherUserInfo.username, teacherUserInfo.userId);
             mViewBinding.tvTeacherName.setEllipsize(TextUtils.TruncateAt.END);
             if (teacherName.length() > 4) {
-                if (teacherUserInfo.getTenantId() != UserConstants.NO_HAVE_TENANT) {
+                if (UserHelper.isTenantAccount(teacherUserInfo.getTenantId())) {
                     mViewBinding.tvTeacherName.setText(String.format("%s%s", teacherUserInfo.getTenantName(), teacherName));
                     mViewBinding.tvTeacherName.setEllipsize(TextUtils.TruncateAt.MARQUEE);
                 } else {

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

@@ -2,6 +2,7 @@ package com.cooleshow.teacher.ui.mine;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 
 import androidx.annotation.Nullable;
@@ -112,8 +113,8 @@ public class SettingActivity extends BaseMVPActivity<ActivitySettingBinding, Set
     public void initData() {
         super.initData();
         initListener();
-        int tenantId = UserHelper.getTenantId();
-        if (tenantId != UserConstants.NO_HAVE_TENANT) {
+        String tenantId = UserHelper.getTenantId();
+        if (UserHelper.isTenantAccount(tenantId)) {
             viewBinding.clUnbindTenant.setVisibility(View.VISIBLE);
         } else {
             viewBinding.clUnbindTenant.setVisibility(View.GONE);

usercenter/src/main/java/com/cooleshow/usercenter/bean/StudentUserInfo.java

@@ -62,7 +62,7 @@ public class StudentUserInfo implements Serializable {
     public String updateTime;
     public String userId;
     public String username;
-    public int tenantId;
+    public String tenantId;
     private String tenantName;
     public String imUserId;
     public String imToken;

usercenter/src/main/java/com/cooleshow/usercenter/bean/TeacherUserInfo.java

@@ -92,7 +92,7 @@ public class TeacherUserInfo implements Serializable {
     public int isVip;//0非会员 1会员
     private String defaultSubject;//当前声部id 为0表示没有默认声部id
     public String defaultSubjectName;//当前声部name
-    private int tenantId;
+    private String tenantId;
     private String tenantName;
 
     private String imUserId;
@@ -109,11 +109,11 @@ public class TeacherUserInfo implements Serializable {
         return "";
     }
 
-    public int getTenantId() {
+    public String getTenantId() {
         return tenantId;
     }
 
-    public void setTenantId(int tenantId) {
+    public void setTenantId(String tenantId) {
         this.tenantId = tenantId;
     }
 

usercenter/src/main/java/com/cooleshow/usercenter/constants/UserConstants.java

@@ -20,7 +20,7 @@ public class UserConstants {
     public static final String EMPTY_ICON_RESID="empty_icon_resid";
     public static final String EMPTY_BTN_TEXT="empty_btn_text";
     public static final String TENANT_ID = "tenantId";
-    public static final int NO_HAVE_TENANT = -1;
+    public static final String NO_HAVE_TENANT = "-1";
     public static final String GENDER_TYPE_MALE = "1";//男
     public static final String GENDER_TYPE_FEMALE = "0";//女
     public static final int VERIFY_CODE_COUNT_TIME = 60;//验证码计时一分钟

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

@@ -76,8 +76,8 @@ public class UserHelper {
         return resultToken;
     }
 
-    public static void addTenantIdParams(int tenantId) {
-        CommonParamsHelper.getInstance().addCommonHeaderParams(CommonParamsHelper.TENANT_ID, String.valueOf(tenantId));
+    public static void addTenantIdParams(String tenantId) {
+        CommonParamsHelper.getInstance().addCommonHeaderParams(CommonParamsHelper.TENANT_ID, tenantId);
     }
 
     public static void removeTenantIdParams() {
@@ -140,7 +140,7 @@ public class UserHelper {
         //机构id
         SPUtils.getInstance().put(TENANTID_KEY, userInfo.tenantId);
         //机构名称
-        SPUtils.getInstance().put(TENANTID_KEY, userInfo.getTenantName());
+        SPUtils.getInstance().put(TENANTNAME_KEY, userInfo.getTenantName());
 
     }
 
@@ -195,8 +195,8 @@ public class UserHelper {
         return SPUtils.getInstance().getString(TENANTNAME_KEY);
     }
 
-    public static int getTenantId() {
-        return SPUtils.getInstance().getInt(TENANTID_KEY,-1);
+    public static String getTenantId() {
+        return SPUtils.getInstance().getString(TENANTID_KEY, "-1");
     }
 
     public static String getTeacherName(String name, String id) {
@@ -264,4 +264,14 @@ public class UserHelper {
                 .withString(UserConstants.PHONE_NUM_KEY, UserHelper.getUserPhone())
                 .navigation();
     }
+
+    public static boolean isTenantAccount(String tenantId) {
+        if (TextUtils.isEmpty(tenantId)) {
+            return false;
+        }
+        if (!TextUtils.equals(tenantId, UserConstants.NO_HAVE_TENANT)) {
+            return true;
+        }
+        return false;
+    }
 }

usercenter/src/main/java/com/cooleshow/usercenter/presenter/contract/LoginContract.java

@@ -10,7 +10,7 @@ import com.cooleshow.usercenter.bean.UserLoginInfo;
 public interface LoginContract {
 
     interface LoginView extends BaseView {
-        void onLoginResult(UserLoginInfo userInfo, int tenantId);
+        void onLoginResult(UserLoginInfo userInfo, String tenantId);
     }
 
     interface Presenter {

usercenter/src/main/java/com/cooleshow/usercenter/presenter/contract/VerifyLoginContract.java

@@ -11,7 +11,7 @@ public interface VerifyLoginContract {
     interface VerifyLoginView extends BaseView {
         void sendVerifyCodeSuccess();
         void sendVerifyCodeFail();
-        void loginByCodeSuccess(UserLoginInfo data, int tenantId);
+        void loginByCodeSuccess(UserLoginInfo data, String tenantId);
     }
 
     interface Presenter {

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/LoginActivity.kt

@@ -91,11 +91,11 @@ class LoginActivity : BaseMVPActivity<ActivityLoginBinding, LoginPresenter>(),
     /**
      * 登录成功
      */
-    override fun onLoginResult(result: UserLoginInfo, tenantId: Int) {
+    override fun onLoginResult(result: UserLoginInfo, tenantId: String) {
         if (isFinishing || isDestroyed) {
             return;
         }
-        if (tenantId != UserConstants.NO_HAVE_TENANT) {
+        if (UserHelper.isTenantAccount(tenantId)) {
             UserHelper.addTenantIdParams(tenantId)
         } else {
             UserHelper.removeTenantIdParams()
@@ -104,7 +104,7 @@ class LoginActivity : BaseMVPActivity<ActivityLoginBinding, LoginPresenter>(),
         setLoginResult(tenantId)
     }
 
-    private fun setLoginResult(tenantId: Int) {
+    private fun setLoginResult(tenantId: String) {
         val intent = Intent()
         intent.putExtra(UserConstants.LOGIN_STATUS, UserConstants.LOGIN_STATUS_SUCCESS)
         intent.putExtra(UserConstants.TENANT_ID, tenantId)

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/VerifyCodeInputActivity.java

@@ -40,7 +40,7 @@ public class VerifyCodeInputActivity extends BaseMVPActivity<ActivityInputCodeLa
     public static final int TIME_COUNT_TOTAL = 60000;
     public static final int REQUEST_CODE_FOR_SET_PASSWORD = 100001;
     private String mPhoneNum;
-    private int tenantId = UserConstants.NO_HAVE_TENANT;
+    private String tenantId = UserConstants.NO_HAVE_TENANT;
 
     private CountDownTimer mCountDownTimer = new CountDownTimer(TIME_COUNT_TOTAL, TIME_COUNT_SPACE) {
         @Override
@@ -192,13 +192,13 @@ public class VerifyCodeInputActivity extends BaseMVPActivity<ActivityInputCodeLa
     }
 
     @Override
-    public void loginByCodeSuccess(UserLoginInfo data, int tenantId) {
+    public void loginByCodeSuccess(UserLoginInfo data, String tenantId) {
         //添加公共参数
         if (isFinishing() || isDestroyed()) {
             return;
         }
         if (data != null) {
-            if (tenantId != UserConstants.NO_HAVE_TENANT) {
+            if (UserHelper.isTenantAccount(tenantId)) {
                 this.tenantId = tenantId;
                 UserHelper.addTenantIdParams(tenantId);
             } else {

usercenter/src/main/java/com/cooleshow/usercenter/ui/activity/VerifyCodeLoginActivity.java

@@ -163,10 +163,10 @@ public class VerifyCodeLoginActivity extends BaseMVPActivity<ActivityVerifyCodeL
             if (data != null && requestCode == LOGIN_STATUS_REQUEST_CODE) {
                 String status = data.getStringExtra(UserConstants.LOGIN_STATUS);
                 if (TextUtils.equals(status, UserConstants.LOGIN_STATUS_SUCCESS)) {
-                    int tenantId = data.getIntExtra(UserConstants.TENANT_ID, UserConstants.NO_HAVE_TENANT);
+                    String tenantId = data.getStringExtra(UserConstants.TENANT_ID);
                     //密码登录或者验证码登录(设置密码)等两种登录行为,最终通过这里跳转首页
                     Postcard build = ARouter.getInstance().build(RouterPath.APPCenter.PATH_HOME);
-                    if (BaseConstant.isStudentClient() && tenantId != UserConstants.NO_HAVE_TENANT) {
+                    if (BaseConstant.isStudentClient() && UserHelper.isTenantAccount(tenantId)) {
                         build = ARouter.getInstance().build(RouterPath.JGCenter.PATH_HOME);
                     }