去掉老版本StudentUserInfo和TeacherUserInfo

BaseLibrary/src/main/res/values/colors.xml

@@ -195,5 +195,6 @@
     <color name="color_fef9f4">#fef9f4</color>
     <color name="color_33000000">#33000000</color>
     <color name="color_66000000">#66000000</color>
+    <color name="color_ff5a56">#FF5A56</color>
 
 </resources>

student/src/main/java/com/cooleshow/student/api/APIService.java

@@ -34,11 +34,11 @@ import com.cooleshow.student.bean.RecommendTalentListBean;
 import com.cooleshow.student.bean.SelectMyGroupBean;
 import com.cooleshow.student.bean.SparringCourseCommentBean;
 import com.cooleshow.student.bean.SparringCourseHomeworkBean;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.bean.SystemMessageBean;
 import com.cooleshow.student.bean.TempLiveTeacherListBean;
 import com.cooleshow.student.bean.VideoCourseListBean;
 import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 
 import java.util.ArrayList;

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

@@ -1,67 +0,0 @@
-package com.cooleshow.student.bean;
-
-import java.io.Serializable;
-
-/**
- * 创建日期：2022/5/26 13:51
- *
- * @author Ryan
- * 类说明：
- */
-public class StudentUserInfo implements Serializable {
-    /*
-    	"birthdate": "",
-		"cloudStudySequenceDays": 0,
-		"cloudStudyUseLastDay": "",
-		"createTime": "",
-		"exerciseDays": 0,
-		"exerciseHours": 0,
-		"finshClassHours": 0,
-		"gender": "",
-		"heardUrl": "",
-		"idCardNo": "",
-		"isReal": "",
-		"memberRankSettingId": 0,
-		"membershipDays": 0,
-		"membershipEndTime": "",
-		"membershipStartTime": "",
-		"phone": "",
-		"realName": "",
-		"starTeacherNum": 0,
-		"subjectId": "",
-		"subjectName": "",
-		"testingNum": 0,
-		"unfinshClassHours": 0,
-		"updateTime": "",
-		"userId": 0,
-		"username": ""
-     */
-    public String birthdate;
-    public int cloudStudySequenceDays;
-    public String cloudStudyUseLastDay;
-    public String createTime;
-    public int exerciseDays;
-    public int exerciseHours;
-    public int finshClassHours;
-    public int isVip;
-    public String gender;
-    public String heardUrl;
-    public String idCardNo;
-    public String isReal;
-    public long memberRankSettingId;
-    public int membershipDays;
-    public String membershipEndTime;
-    public String membershipStartTime;
-    public String phone;
-    public String realName;
-    public String starTeacherNum;
-    public String subjectId;
-    public String subjectName;
-    public int testingNum;
-    public int unfinshClassHours;
-    public String updateTime;
-    public long userId;
-    public String username;
-
-
-}

student/src/main/java/com/cooleshow/student/contract/CheckTeachableContract.java

@@ -1,7 +1,7 @@
 package com.cooleshow.student.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
-import com.cooleshow.student.bean.StudentUserInfo;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 
 /**
  * 创建日期：2022/6/5 20:18

student/src/main/java/com/cooleshow/student/contract/HomeContract.java

@@ -11,7 +11,7 @@ import com.cooleshow.student.bean.HomeLiveAndVideoBean;
 import com.cooleshow.student.bean.HomeStyleBean;
 import com.cooleshow.student.bean.HotAlbumBean;
 import com.cooleshow.student.bean.RecommendTalentListBean;
-import com.cooleshow.student.bean.StudentUserInfo;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 
 import java.util.ArrayList;
 import java.util.List;

student/src/main/java/com/cooleshow/student/contract/MineContract.java

@@ -1,7 +1,7 @@
 package com.cooleshow.student.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
-import com.cooleshow.student.bean.StudentUserInfo;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 
 /**
  * 创建日期：2022/5/26 10:06

student/src/main/java/com/cooleshow/student/contract/PersonalSettingContract.java

@@ -1,8 +1,8 @@
 package com.cooleshow.student.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 
 /**
  * 创建日期：2022/5/16 16:12

student/src/main/java/com/cooleshow/student/presenter/main/HomePresenter.java

@@ -19,10 +19,10 @@ import com.cooleshow.student.bean.HomeLiveAndVideoBean;
 import com.cooleshow.student.bean.HomeStyleBean;
 import com.cooleshow.student.bean.HotAlbumBean;
 import com.cooleshow.student.bean.RecommendTalentListBean;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.bean.TempLiveTeacherListBean;
 import com.cooleshow.student.constants.CommonConfig;
 import com.cooleshow.student.contract.HomeContract;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 
 import org.json.JSONException;
 import org.json.JSONObject;

student/src/main/java/com/cooleshow/student/presenter/main/MinePresenter.java

@@ -3,8 +3,8 @@ package com.cooleshow.student.presenter.main;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.student.api.APIService;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.contract.MineContract;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 
 /**
  * 创建日期：2022/5/26 10:05

student/src/main/java/com/cooleshow/student/presenter/mine/CheckTeachablePresenter.java

@@ -3,8 +3,8 @@ package com.cooleshow.student.presenter.mine;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.student.api.APIService;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.contract.CheckTeachableContract;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 
 /**
  * 创建日期：2022/6/5 20:17

student/src/main/java/com/cooleshow/student/presenter/mine/PersonalSettingPresenter.java

@@ -9,9 +9,9 @@ import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 
 import com.cooleshow.student.api.APIService;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.contract.PersonalSettingContract;
 import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 
 import java.io.File;
 

student/src/main/java/com/cooleshow/student/ui/main/HomeFragment.java

@@ -51,7 +51,6 @@ import com.cooleshow.student.bean.HomeLiveAndVideoBean;
 import com.cooleshow.student.bean.HomeStyleBean;
 import com.cooleshow.student.bean.HotAlbumBean;
 import com.cooleshow.student.bean.RecommendTalentListBean;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.constants.CourseConstants;
 import com.cooleshow.student.contract.HomeContract;
 import com.cooleshow.student.databinding.FragmentHomeLayoutBinding;
@@ -59,6 +58,7 @@ import com.cooleshow.student.presenter.main.HomePresenter;
 import com.cooleshow.student.ui.course.SparringCourseDetailActivity;
 import com.cooleshow.student.widgets.DialogUtils;
 import com.cooleshow.student.widgets.HomeHotAlbumDecoration;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.utils.DisplayUtils;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;

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

@@ -22,11 +22,11 @@ import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.student.R;
 import com.cooleshow.student.adapter.ItemMarkAdapter;
 import com.cooleshow.student.adapter.MineItemMarkAdapter;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.contract.MineContract;
 import com.cooleshow.student.databinding.FragmentMineLayoutBinding;
 import com.cooleshow.student.helper.EventHelper;
 import com.cooleshow.student.presenter.main.MinePresenter;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 import com.tbruyelle.rxpermissions3.RxPermissions;
 
 import java.util.ArrayList;

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

@@ -49,7 +49,6 @@ import com.cooleshow.student.bean.HomeLiveAndVideoBean;
 import com.cooleshow.student.bean.HomeStyleBean;
 import com.cooleshow.student.bean.HotAlbumBean;
 import com.cooleshow.student.bean.RecommendTalentListBean;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.constants.CommonConfig;
 import com.cooleshow.student.constants.CourseConstants;
 import com.cooleshow.student.contract.HomeContract;
@@ -60,6 +59,7 @@ import com.cooleshow.student.widgets.AppBarLayoutStateChangeListener;
 import com.cooleshow.student.widgets.DialogUtils;
 import com.cooleshow.student.widgets.HomeHotAlbumDecoration;
 import com.cooleshow.student.widgets.HomeHotMusicSheetItemDecoration;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.google.android.material.appbar.AppBarLayout;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;

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

@@ -9,10 +9,10 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.contract.CheckTeachableContract;
 import com.cooleshow.student.databinding.ActivityCheckTeachableBinding;
 import com.cooleshow.student.presenter.mine.CheckTeachablePresenter;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 
 /**
  * 创建日期：2022/6/5 20:16

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

@@ -23,6 +23,7 @@ import com.bigkoo.pickerview.view.TimePickerView;
 import com.cooleshow.base.bean.TeachableInstrumentBean;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.utils.MyFileUtils;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ActivityUtils;
@@ -32,7 +33,6 @@ import com.cooleshow.base.utils.PopupUtil;
 import com.cooleshow.base.utils.ToastUtil;
 
 import com.cooleshow.student.R;
-import com.cooleshow.student.bean.StudentUserInfo;
 import com.cooleshow.student.contract.PersonalSettingContract;
 import com.cooleshow.student.databinding.ActivityPersonalSettingBinding;
 import com.cooleshow.student.presenter.mine.PersonalSettingPresenter;

teacher/src/main/java/com/cooleshow/teacher/api/APIService.java

@@ -45,7 +45,6 @@ import com.cooleshow.teacher.bean.SparringCourseListBean;
 import com.cooleshow.teacher.bean.SystemMessageBean;
 import com.cooleshow.teacher.bean.TeachableInstrumentBean;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.bean.UserAccountBean;
 import com.cooleshow.teacher.bean.VideoCourseListBean;
 import com.cooleshow.teacher.bean.WithdrawalInfoBean;
@@ -55,6 +54,7 @@ import com.cooleshow.teacher.bean.request.SheetMusicEntry;
 import com.cooleshow.teacher.bean.request.TeacherPracticeCourseEntry;
 import com.cooleshow.teacher.bean.request.UnBindCardEntry;
 import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 import com.daya.live_teaching.model.CoursewareListBean;
 

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

@@ -1,120 +0,0 @@
-package com.cooleshow.teacher.bean;
-
-import android.text.TextUtils;
-
-import java.io.Serializable;
-
-/**
- * Author by pq, Date on 2022/4/26.
- */
-public class TeacherUserInfo implements Serializable {
-
-    /**
-     * username : 张三
-     * musicianAuthStatus : UNPAALY
-     * phone : 136****1518
-     * birthdate : null
-     * subjectName : 西洋管乐
-     * fansNum : 0
-     * expTime : 8
-     * unExpTime : 0
-     * starGrade : 4
-     * idCardNo :
-     * gender : null
-     * isReal : 0
-     * liveFlag : 0
-     * isBank : 0
-     * heardUrl : https://daya.ks3-cn-beijing.ksyun.com/202204/T3R3yxq.jpeg
-     * entryStatus : UNPAALY
-     * realName :
-     * subject :
-     * entryFlag : 0
-     * userId : 15
-     * subjectId : 1
-     * updateTime : 2022-04-25 17:41:45
-     * musicianFlag : 0
-     * entryAuthDate : null
-     * musicianDate : null
-     * introduction : 个人介绍
-     * graduateSchool : 12
-     * gradCertificate :
-     * degreeCertificate :
-     * teacherCertificate :
-     * memo :
-     * educationBackground :
-     * technicalTitles :
-     * workUnit :
-     * liveDate : null
-     * createTime : 2022-04-06 18:23:36
-     */
-
-    public String username;
-    public String musicianAuthStatus;
-    public String phone;
-    public Object birthdate;
-    public String subjectName;
-    public String fansNum;
-    public String expTime;
-    public String unExpTime;
-    public String membershipDays;
-    public int starGrade;
-    public String idCardNo;
-    public String gender;
-    public int isReal;
-    public int liveFlag;//是否有直播权限 0 否 1 是
-    public int isBank;
-    public String heardUrl;
-    public String entryStatus;
-    public String realName;
-    public String subject;
-    public int entryFlag;
-    public int degreeFlag;// 老师学历认证
-    public int teacherFlag;//教资认证
-    public int userId;
-    public String subjectId;
-    public String updateTime;
-    public int musicianFlag;
-    public Object entryAuthDate;
-    public Object musicianDate;
-    public String introduction;
-    public String graduateSchool;
-    public String gradCertificate;
-    public String degreeCertificate;
-    public String teacherCertificate;
-    public String memo;
-    public String educationBackground;
-    public String technicalTitles;
-    public String workUnit;
-    public Object liveDate;
-    public String createTime;
-    public boolean isSettlement;
-    public String tag;//用于显示老师徽章
-    public int isVip;//0非会员 1会员
-    private String defaultSubject;//当前声部id 为0表示没有默认声部id
-    public String defaultSubjectName;//当前声部name
-    private int tenantId;
-    private String tenantName;
-
-    public String getDefaultSubject() {
-        if (!TextUtils.equals(defaultSubject, "0")) {
-            return defaultSubject;
-        }
-        return "";
-    }
-
-    public int getTenantId() {
-        return tenantId;
-    }
-
-    public void setTenantId(int tenantId) {
-        this.tenantId = tenantId;
-    }
-
-    public String getTenantName() {
-        return tenantName;
-    }
-
-    public void setTenantName(String tenantName) {
-        this.tenantName = tenantName;
-    }
-}

teacher/src/main/java/com/cooleshow/teacher/contract/HomeContract.java

@@ -10,7 +10,6 @@ import com.cooleshow.teacher.bean.HomeHotMusicSheetBean;
 import com.cooleshow.teacher.bean.HomeLiveAndVideoBean;
 import com.cooleshow.teacher.bean.HomeMenuBean;
 import com.cooleshow.teacher.bean.TeachableInstrumentBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 
 import java.util.List;

teacher/src/main/java/com/cooleshow/teacher/contract/HomePageContract.java

@@ -1,7 +1,7 @@
 package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 /**
  * Author by pq, Date on 2022/4/20.

teacher/src/main/java/com/cooleshow/teacher/contract/LiveCoursePageContract.java

@@ -4,7 +4,7 @@ import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.teacher.bean.LiveCourseListBean;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 /**
  * Author by pq, Date on 2022/4/20.

teacher/src/main/java/com/cooleshow/teacher/contract/MainContract.java

@@ -2,7 +2,7 @@ package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.teacher.bean.TeacherPromoteIncomeBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 
 /**

teacher/src/main/java/com/cooleshow/teacher/contract/MineLiveCourseContract.java

@@ -2,7 +2,7 @@ package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 /**
  * 创建日期：2022/5/19 15:16

teacher/src/main/java/com/cooleshow/teacher/contract/MineStylePageContract.java

@@ -3,8 +3,8 @@ package com.cooleshow.teacher.contract;
 import com.common.im.bean.ContactRoomListBean;
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 import java.util.List;
 

teacher/src/main/java/com/cooleshow/teacher/contract/MineVideoCourseContract.java

@@ -2,8 +2,8 @@ package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.teacher.bean.MineVideoCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.bean.VideoCourseListBean;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 /**
  * 创建日期：2022/5/20 13:52

teacher/src/main/java/com/cooleshow/teacher/contract/PersonalSettingContract.java

@@ -1,8 +1,8 @@
 package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 /**
  * 创建日期：2022/5/16 16:12

teacher/src/main/java/com/cooleshow/teacher/contract/SparringCoursePageContract.java

@@ -3,7 +3,7 @@ package com.cooleshow.teacher.contract;
 import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.teacher.bean.CourseCommentListBean;
 import com.cooleshow.teacher.bean.SparringCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 /**
  * 创建日期：2022/6/6 17:41

teacher/src/main/java/com/cooleshow/teacher/contract/UnbindTenantContract.java

@@ -0,0 +1,17 @@
+package com.cooleshow.teacher.contract;
+
+import com.cooleshow.base.presenter.view.BaseView;
+
+/**
+ * 创建日期：2022/5/18 14:11
+ *
+ * @author Ryan
+ * 类说明：
+ */
+public interface UnbindTenantContract {
+    interface View extends BaseView {
+
+    }
+    interface Presenter {
+    }
+}

teacher/src/main/java/com/cooleshow/teacher/contract/VideoCoursePageContract.java

@@ -1,8 +1,8 @@
 package com.cooleshow.teacher.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.bean.VideoCourseListBean;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 /**
  * 创建日期：2022/6/7 9:41

teacher/src/main/java/com/cooleshow/teacher/presenter/course/MineLiveCoursePresenter.java

@@ -5,9 +5,9 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.bean.request.LiveCourseEntry;
 import com.cooleshow.teacher.contract.MineLiveCourseContract;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 /**
  * 创建日期：2022/5/19 15:15

teacher/src/main/java/com/cooleshow/teacher/presenter/course/MineVideoCoursePresenter.java

@@ -7,10 +7,10 @@ import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
 import com.cooleshow.teacher.bean.MineVideoCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.bean.VideoCourseListBean;
 import com.cooleshow.teacher.contract.MineLiveCourseContract;
 import com.cooleshow.teacher.contract.MineVideoCourseContract;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 import org.json.JSONException;
 import org.json.JSONObject;

teacher/src/main/java/com/cooleshow/teacher/presenter/homePage/HomePagePresenter.java

@@ -3,9 +3,9 @@ package com.cooleshow.teacher.presenter.homePage;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.teacher.api.APIService;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.HomePageContract;
 import com.cooleshow.teacher.contract.MineContract;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 
 /**

teacher/src/main/java/com/cooleshow/teacher/presenter/homePage/LiveCoursePagePresenter.java

@@ -6,8 +6,8 @@ import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.request.LiveCourseEntry;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.LiveCoursePageContract;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 /**
  * Author by pq, Date on 2022/4/20.

teacher/src/main/java/com/cooleshow/teacher/presenter/homePage/MineStylePresenter.java

@@ -5,7 +5,6 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.bean.request.QueryGroupListEntry;
 import com.cooleshow.teacher.contract.HomePageContract;
 import com.cooleshow.teacher.contract.MineStyleContract;

teacher/src/main/java/com/cooleshow/teacher/presenter/homePage/SparringCoursePagePresenter.java

@@ -6,9 +6,9 @@ import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.SparringCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.bean.request.TeacherPracticeCourseEntry;
 import com.cooleshow.teacher.contract.SparringCoursePageContract;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 import org.json.JSONException;
 import org.json.JSONObject;

teacher/src/main/java/com/cooleshow/teacher/presenter/homePage/VideoCoursePagePresenter.java

@@ -5,10 +5,10 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.teacher.api.APIService;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.bean.VideoCourseListBean;
 import com.cooleshow.teacher.contract.LiveCoursePageContract;
 import com.cooleshow.teacher.contract.VideoCoursePageContract;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 import org.json.JSONException;
 import org.json.JSONObject;

teacher/src/main/java/com/cooleshow/teacher/presenter/main/HomePresenter.java

@@ -16,8 +16,8 @@ import com.cooleshow.teacher.bean.HomeHotMusicSheetBean;
 import com.cooleshow.teacher.bean.HomeLiveAndVideoBean;
 import com.cooleshow.teacher.bean.HomeMenuBean;
 import com.cooleshow.teacher.bean.TeachableInstrumentBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.HomeContract;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 

teacher/src/main/java/com/cooleshow/teacher/presenter/main/MainPresenter.java

@@ -4,9 +4,9 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.TeacherPromoteIncomeBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.HomeContract;
 import com.cooleshow.teacher.contract.MainContract;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 
 /**

teacher/src/main/java/com/cooleshow/teacher/presenter/main/MinePresenter.java

@@ -3,9 +3,9 @@ package com.cooleshow.teacher.presenter.main;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.teacher.api.APIService;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.HomeContract;
 import com.cooleshow.teacher.contract.MineContract;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 
 /**

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/PersonalSettingPresenter.java

@@ -9,9 +9,9 @@ import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.PersonalSettingContract;
 import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 
 import java.io.File;
 

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/UnbindTenantPresenter.java

@@ -0,0 +1,15 @@
+package com.cooleshow.teacher.presenter.mine;
+
+import com.cooleshow.base.presenter.BasePresenter;
+import com.cooleshow.teacher.contract.AboutContract;
+import com.cooleshow.teacher.contract.UnbindTenantContract;
+
+/**
+ * 创建日期：2022/5/18 14:08
+ *
+ * @author Ryan
+ * 类说明：
+ */
+public class UnbindTenantPresenter extends BasePresenter<UnbindTenantContract.View> implements UnbindTenantContract.Presenter {
+
+}

teacher/src/main/java/com/cooleshow/teacher/presenter/minestyle/MineStylePagePresenter.java

@@ -25,11 +25,11 @@ import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.HomePageSheetMusicListBean;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.bean.request.QueryGroupListEntry;
 import com.cooleshow.teacher.contract.MineStylePageContract;
 import com.cooleshow.teacher.ui.minestyle.MineStylePageActivity;
 import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.daya.live_teaching.LiveTeachingApp;
 import com.daya.live_teaching.model.FileUploadBean;
 import com.daya.live_teaching.repository.ClassRepository;

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineLiveCourseFragment.java

@@ -23,10 +23,10 @@ import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineLiveCourseAdapter;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.MineLiveCourseContract;
 import com.cooleshow.teacher.databinding.FragmentMineLiveCourseBinding;
 import com.cooleshow.teacher.presenter.course.MineLiveCoursePresenter;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener;

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineVideoCourseFragment.java

@@ -18,7 +18,6 @@ import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.teacher.R;
@@ -28,6 +27,7 @@ import com.cooleshow.teacher.bean.VideoCourseListBean;
 import com.cooleshow.teacher.contract.MineVideoCourseContract;
 import com.cooleshow.teacher.databinding.FragmentMineVideoCourseBinding;
 import com.cooleshow.teacher.presenter.course.MineVideoCoursePresenter;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 

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

@@ -20,13 +20,13 @@ import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.HomePagerAdapter;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.HomePageContract;
 import com.cooleshow.teacher.databinding.ActivityHomePageLayoutBinding;
 import com.cooleshow.teacher.presenter.homePage.HomePagePresenter;
 import com.cooleshow.teacher.widgets.AppBarLayoutStateChangeListener;
 import com.cooleshow.teacher.widgets.dialog.BadgeDesDialog;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.tabs.TabLayout;

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

@@ -21,11 +21,11 @@ import com.cooleshow.teacher.adapter.MineLiveCourseListAdapter;
 import com.cooleshow.teacher.bean.LiveCourseListBean;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.teacher.bean.MineLiveCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.LiveCoursePageContract;
 import com.cooleshow.teacher.databinding.FragmentLiveCoursePageLayoutBinding;
 import com.cooleshow.teacher.presenter.homePage.LiveCoursePagePresenter;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 

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

@@ -21,7 +21,6 @@ import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.SparringCourseListAdapter;
 import com.cooleshow.teacher.bean.SparringCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.constants.CourseConstants;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.SparringCoursePageContract;
@@ -29,6 +28,7 @@ import com.cooleshow.teacher.databinding.FragmentSparringCoursePageLayoutBinding
 import com.cooleshow.teacher.presenter.homePage.SparringCoursePagePresenter;
 import com.cooleshow.teacher.ui.course.SparringCourseDetailActivity;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 

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

@@ -19,7 +19,6 @@ import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineVideoCourseAdapter;
 import com.cooleshow.teacher.bean.MineVideoCourseListBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.bean.VideoCourseListBean;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.VideoCoursePageContract;
@@ -27,6 +26,7 @@ import com.cooleshow.teacher.presenter.homePage.VideoCoursePagePresenter;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.teacher.databinding.FragmentVideoCoursePageLayoutBinding;
 import com.cooleshow.teacher.ui.course.MineVideoCourseActivity;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 

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

@@ -39,11 +39,11 @@ import com.cooleshow.teacher.App;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.HomePageAdapter;
 import com.cooleshow.teacher.bean.TeacherPromoteIncomeBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.MainContract;
 import com.cooleshow.teacher.databinding.ActivityMainBinding;
 import com.cooleshow.teacher.helper.PushIntentParseHelper;
 import com.cooleshow.teacher.presenter.main.MainPresenter;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.common.ResultCallback;

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

@@ -22,7 +22,6 @@ import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.MineCommonToolAdapter;
 import com.cooleshow.teacher.bean.MineToolMenuBean;
 import com.cooleshow.teacher.bean.TeacherPromoteIncomeBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.MineContract;
 import com.cooleshow.teacher.databinding.FragmentMineLayoutBinding;
@@ -30,6 +29,7 @@ import com.cooleshow.teacher.helper.EventHelper;
 import com.cooleshow.teacher.presenter.main.MinePresenter;
 import com.cooleshow.teacher.widgets.dialog.BadgeDesDialog;
 import com.cooleshow.teacher.widgets.helper.MineFragmentToolsHelper;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.constants.UserConstants;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.tbruyelle.rxpermissions3.RxPermissions;

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

@@ -42,7 +42,6 @@ import com.cooleshow.teacher.bean.HomeMenuBean;
 import com.cooleshow.teacher.bean.QuerySubjectBean;
 import com.cooleshow.teacher.bean.SubjectBean;
 import com.cooleshow.teacher.bean.TeachableInstrumentBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.constants.CourseConstants;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.HomeContract;
@@ -53,6 +52,7 @@ import com.cooleshow.teacher.widgets.HomeHotAlbumItemDecoration;
 import com.cooleshow.teacher.widgets.HomeHotMusicSheetItemDecoration;
 import com.cooleshow.teacher.widgets.dialog.BadgeDesDialog;
 import com.cooleshow.teacher.widgets.dialog.HomeCertTipDialog;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.constants.UserConstants;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;

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

@@ -18,7 +18,7 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.utils.MyFileUtils;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.ActivityUtils;

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

@@ -0,0 +1,51 @@
+package com.cooleshow.teacher.ui.mine;
+
+import android.text.TextUtils;
+
+import com.cooleshow.base.ui.activity.BaseMVPActivity;
+import com.cooleshow.teacher.databinding.AcUnbindTenantLayoutBinding;
+import com.cooleshow.teacher.presenter.mine.UnbindTenantPresenter;
+import com.cooleshow.usercenter.helper.UserHelper;
+
+/**
+ * Author by pq, Date on 2023/9/14.
+ */
+public class UnBindTenantActivity extends BaseMVPActivity<AcUnbindTenantLayoutBinding, UnbindTenantPresenter> {
+    private String mPhoneNum;
+
+    @Override
+    protected void initView() {
+
+    }
+
+    @Override
+    public void initData() {
+        super.initData();
+        initListener();
+        mPhoneNum = UserHelper.getUserPhone();
+        if (TextUtils.isEmpty(mPhoneNum)) {
+            finish();
+            return;
+        }
+        try {
+            String cPhone = mPhoneNum.substring(0, 3) + "****" + mPhoneNum.substring(7, mPhoneNum.length());
+            viewBinding.tvTitle.setText(String.format("将%s所绑定的机构解绑", cPhone));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void initListener() {
+
+    }
+
+    @Override
+    protected AcUnbindTenantLayoutBinding getLayoutView() {
+        return AcUnbindTenantLayoutBinding.inflate(getLayoutInflater());
+    }
+
+    @Override
+    protected UnbindTenantPresenter createPresenter() {
+        return new UnbindTenantPresenter();
+    }
+}

teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/MineStylePageActivity.java

@@ -45,13 +45,13 @@ import com.cooleshow.teacher.adapter.MineStyleVideoAdapter;
 import com.cooleshow.teacher.adapter.TeachableSelectAdapter;
 import com.cooleshow.teacher.bean.TeachableInstrumentBean;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
-import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.MineStylePageContract;
 import com.cooleshow.teacher.databinding.ActivityMineStylePageBinding;
 import com.cooleshow.teacher.presenter.minestyle.MineStylePagePresenter;
 import com.cooleshow.teacher.widgets.MineStyleVideoItemDecoration;
 import com.cooleshow.teacher.widgets.StyleEmptyView;
 import com.cooleshow.usercenter.bean.SetDetailBean;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.utils.GlideEngine;
 import com.google.android.flexbox.AlignItems;

teacher/src/main/res/layout/ac_unbind_tenant_layout.xml

@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <include
+        android:id="@+id/toolbar_include"
+        layout="@layout/common_toolbar_layout" />
+
+    <ScrollView
+        android:id="@+id/scrollView"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginStart="13dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="13dp"
+        android:background="@drawable/bg_white_10dp"
+        android:scrollbars="vertical"
+        android:layout_marginBottom="30dp"
+        app:layout_constraintBottom_toTopOf="@+id/tv_confirm"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/toolbar_include">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="10dp">
+
+            <ImageView
+                android:id="@+id/iv_tip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="32dp"
+                android:src="@drawable/icon_exclamation_mark_tip"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <TextView
+                android:id="@+id/tv_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="24dp"
+                android:includeFontPadding="false"
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_18"
+                android:textStyle="bold"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/iv_tip"
+                tools:text="将155****4306所绑定的机构解绑" />
+
+            <TextView
+                android:id="@+id/tv_tip"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:includeFontPadding="false"
+                android:paddingStart="20dp"
+                android:paddingEnd="20dp"
+                android:textColor="@color/color_666666"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_title"
+                tools:text="解绑机构后，在此机构的数据将无法恢复，确认要继续解绑" />
+
+            <TextView
+                android:id="@+id/tv_star"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:includeFontPadding="false"
+                android:paddingStart="12dp"
+                android:text="*"
+                android:textColor="@color/color_ff5a56"
+                android:textSize="@dimen/sp_16"
+                app:layout_constraintBottom_toBottomOf="@+id/tv_reason_title"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/tv_reason_title" />
+
+            <TextView
+                android:id="@+id/tv_reason_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="28dp"
+                android:includeFontPadding="false"
+                android:text="解绑原因："
+                android:textColor="@color/color_333333"
+                android:textSize="@dimen/sp_16"
+                android:textStyle="bold"
+                app:layout_constraintLeft_toRightOf="@+id/tv_star"
+                app:layout_constraintTop_toBottomOf="@+id/tv_tip" />
+
+            <EditText
+                android:id="@+id/et_content"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_83"
+                android:layout_marginLeft="12dp"
+                android:layout_marginTop="10dp"
+                android:layout_marginRight="12dp"
+                android:background="@drawable/shape_6dp_border_eaeaea_1dp"
+                android:gravity="left"
+                android:hint="请输入解绑原因"
+                android:inputType="text"
+                android:paddingLeft="5dp"
+                android:paddingTop="5dp"
+                android:paddingRight="5dp"
+                android:paddingBottom="5dp"
+                android:textColor="@color/black_333"
+                android:textColorHint="@color/color_999999"
+                android:textSize="@dimen/sp_16"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_reason_title" />
+
+            <View
+                android:id="@+id/view_verify_code_bg"
+                android:layout_width="0dp"
+                android:layout_height="54dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_marginBottom="23dp"
+                android:layout_marginTop="12dp"
+                android:background="@drawable/shape_6dp_border_eaeaea_1dp"
+                app:layout_constraintTop_toBottomOf="@+id/et_content"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent" />
+
+
+            <TextView
+                android:id="@+id/tv_send_verify_code"
+                android:layout_width="94dp"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="获取验证码"
+                android:textColor="@color/color_ff2dc7aa"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintBottom_toBottomOf="@+id/view_verify_code_bg"
+                app:layout_constraintRight_toRightOf="@+id/view_verify_code_bg"
+                app:layout_constraintTop_toTopOf="@+id/view_verify_code_bg" />
+
+            <View
+                android:id="@+id/view_line"
+                android:layout_width="1dp"
+                android:layout_height="18dp"
+                android:background="@color/color_ff2dc7aa"
+                app:layout_constraintBottom_toBottomOf="@+id/tv_send_verify_code"
+                app:layout_constraintRight_toLeftOf="@+id/tv_send_verify_code"
+                app:layout_constraintTop_toTopOf="@+id/tv_send_verify_code" />
+
+            <EditText
+                android:id="@+id/et_num"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:background="@color/transparent"
+                android:hint="请输入短信验证码"
+                android:inputType="number"
+                android:maxLength="6"
+                android:maxLines="1"
+                android:paddingStart="12dp"
+                android:textColor="@color/color_333333"
+                android:textColorHint="@color/color_999999"
+                android:textSize="@dimen/sp_16"
+                app:layout_constraintBottom_toBottomOf="@+id/view_verify_code_bg"
+                app:layout_constraintLeft_toLeftOf="@+id/view_verify_code_bg"
+                app:layout_constraintRight_toLeftOf="@+id/view_line"
+                app:layout_constraintTop_toTopOf="@+id/view_verify_code_bg" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+
+
+    <TextView
+        android:id="@+id/tv_confirm"
+        android:layout_width="match_parent"
+        android:layout_height="44dp"
+        android:layout_marginStart="25dp"
+        android:layout_marginEnd="25dp"
+        android:layout_marginBottom="26dp"
+        android:background="@drawable/shape_login_bt_bg"
+        android:gravity="center"
+        android:text="注销账号"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_18"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -92,7 +92,13 @@ public class TeacherUserInfo implements Serializable {
     public int isVip;//0非会员 1会员
     private String defaultSubject;//当前声部id 为0表示没有默认声部id
     public String defaultSubjectName;//当前声部name
-    public int tenantId;
+    private int tenantId;
+    private String tenantName;
+
+    private String imUserId;
+    private String imToken;
+
+
 
     public String getDefaultSubject() {
         if (!TextUtils.equals(defaultSubject, "0")) {
@@ -101,4 +107,35 @@ public class TeacherUserInfo implements Serializable {
         return "";
     }
 
+    public int getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(int tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public String getImUserId() {
+        return imUserId;
+    }
+
+    public void setImUserId(String imUserId) {
+        this.imUserId = imUserId;
+    }
+
+    public String getImToken() {
+        return imToken;
+    }
+
+    public void setImToken(String imToken) {
+        this.imToken = imToken;
+    }
 }

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

@@ -10,6 +10,7 @@ import com.cooleshow.base.utils.SPUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.usercenter.R;
 import com.cooleshow.usercenter.bean.StudentUserInfo;
+import com.cooleshow.usercenter.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 import com.cooleshow.usercenter.bean.UserLoginInfo;
 import com.cooleshow.usercenter.constants.UserConstants;
@@ -29,6 +30,8 @@ public class UserHelper {
     public static final String TEACHER_LIVE_FLAG_STATUS = "teacherLiveFlag";
     public static final String PRIVACY_KEY = "privacy_key";
     public static final String AWARD_DIALOG_TIP_KEY = "award_dialog_tip_key";
+    public static final String TENANTID_KEY = "tenantId";
+    public static final String TENANTNAME_KEY = "tenantName";
 
     /**
      * 获取用户是否同意app隐私协议
@@ -153,6 +156,33 @@ public class UserHelper {
         SPUtils.getInstance().put(USER_PHONE, userInfo.phone);
         //头像
         SPUtils.getInstance().put(USER_AVATAR, userInfo.heardUrl);
+        //机构id
+        SPUtils.getInstance().put(TENANTID_KEY, userInfo.tenantId);
+        //机构名称
+        SPUtils.getInstance().put(TENANTID_KEY, userInfo.getTenantName());
+
+    }
+
+    public static void saveUserInfo(TeacherUserInfo userInfo) {
+        if (userInfo == null) {
+            return;
+        }
+        //userId
+        SPUtils.getInstance().put(USER_ID, userInfo.userId);
+        //imUserId
+        SPUtils.getInstance().put(IM_USER_ID, userInfo.getImUserId());
+        //昵称
+        SPUtils.getInstance().put(USERNAME, userInfo.username);
+        //imtoken
+        SPUtils.getInstance().put(USER_IM_TOKEN, userInfo.getImToken());
+        //电话
+        SPUtils.getInstance().put(USER_PHONE, userInfo.phone);
+        //头像
+        SPUtils.getInstance().put(USER_AVATAR, userInfo.heardUrl);
+        //机构id
+        SPUtils.getInstance().put(TENANTID_KEY, userInfo.getTenantId());
+        //机构名称
+        SPUtils.getInstance().put(TENANTID_KEY, userInfo.getTenantName());
 
     }