去掉auth下的userInfo调用

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

@@ -66,14 +66,6 @@ import retrofit2.http.Url;
  * 类说明：
  */
 public interface APIService {
-    /**
-     * 查询个人信息
-     *
-     * @param
-     * @return
-     */
-    @GET(AUTH_GROUP + "api/queryUserInfo")
-    Observable<BaseResponse<UserInfo>> getUserInfo(@Query("clientType") String clientType);
 
     /**
      * 查询学员基本信息

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

@@ -1,6 +1,7 @@
 package com.cooleshow.student.contract;
 
 import com.cooleshow.base.presenter.view.BaseView;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 
 /**
@@ -11,7 +12,7 @@ import com.cooleshow.usercenter.bean.UserInfo;
  */
 public interface MainContract {
     interface MainView extends BaseView {
-        void getUserInfoSuccess(UserInfo userInfo);
+        void getUserInfoSuccess(StudentUserInfo userInfo);
     }
 
     interface Presenter {

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

@@ -4,6 +4,7 @@ import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.student.api.APIService;
 import com.cooleshow.student.contract.MainContract;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 
 
@@ -21,9 +22,9 @@ public class MainPresenter extends BasePresenter<MainContract.MainView> implemen
      */
     @Override
     public void getUserInfo() {
-        addSubscribe(create(APIService.class).getUserInfo("STUDENT"), new BaseObserver<UserInfo>(getView()) {
+        addSubscribe(create(APIService.class).queryUserInfo(), new BaseObserver<StudentUserInfo>(getView()) {
             @Override
-            protected void onSuccess(UserInfo data) {
+            protected void onSuccess(StudentUserInfo data) {
                 if (getView() != null) {
                     getView().getUserInfoSuccess(data);
                 }

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

@@ -51,6 +51,7 @@ import com.cooleshow.student.databinding.ActivityMainBinding;
 import com.cooleshow.student.helper.EventHelper;
 import com.cooleshow.student.helper.PushIntentParseHelper;
 import com.cooleshow.student.presenter.main.MainPresenter;
+import com.cooleshow.usercenter.bean.StudentUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.common.ResultCallback;
@@ -412,7 +413,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     }
 
     @Override
-    public void getUserInfoSuccess(UserInfo userInfo) {
+    public void getUserInfoSuccess(StudentUserInfo userInfo) {
         if (isFinishing() || isDestroyed()) {
             return;
         }

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

@@ -260,14 +260,6 @@ public interface APIService {
     @POST(TEACHER_GROUP + "videoLessonGroup/page")
     Observable<BaseResponse<VideoCourseListBean>> getVideoCourses(@Body RequestBody body);
 
-    /**
-     * 查询个人信息
-     *
-     * @param
-     * @return
-     */
-    @GET(AUTH_GROUP + "api/queryUserInfo")
-    Observable<BaseResponse<UserInfo>> getUserInfo();
 
     /**
      * 查询老师个人信息

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

@@ -11,7 +11,6 @@ import com.cooleshow.usercenter.bean.UserInfo;
 public interface MainContract {
 
     interface MainView extends BaseView {
-        void getUserInfoSuccess(UserInfo userInfo);
 
         void getTeacherInfoSuccess(TeacherUserInfo teacherUserInfo);
 
@@ -19,8 +18,6 @@ public interface MainContract {
     }
 
     interface Presenter {
-        void getUserInfo();
-
         void getTeacherUserInfo();
     }
 }

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

@@ -19,14 +19,6 @@ public class HomePagePresenter extends BasePresenter<HomePageContract.HomePageVi
      * @param
      */
     public void getUserInfo() {
-        addSubscribe(create(APIService.class).getUserInfo(), new BaseObserver<UserInfo>(getView()) {
-            @Override
-            protected void onSuccess(UserInfo data) {
-//                if (getView() != null) {
-//                    getView().getUserInfoSuccess(data);
-//                }
-            }
-        });
     }
 
     @Override

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

@@ -23,14 +23,6 @@ public class MineStylePresenter extends BasePresenter<MineStyleContract.MineStyl
      * @param
      */
     public void getUserInfo() {
-        addSubscribe(create(APIService.class).getUserInfo(), new BaseObserver<UserInfo>(getView()) {
-            @Override
-            protected void onSuccess(UserInfo data) {
-//                if (getView() != null) {
-//                    getView().getUserInfoSuccess(data);
-//                }
-            }
-        });
     }
 
     @Override

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

@@ -33,14 +33,6 @@ public class SheetMusicPagePresenter extends BasePresenter<SheetMusicPageContrac
      * @param
      */
     public void getUserInfo() {
-        addSubscribe(create(APIService.class).getUserInfo(), new BaseObserver<UserInfo>(getView()) {
-            @Override
-            protected void onSuccess(UserInfo data) {
-//                if (getView() != null) {
-//                    getView().getUserInfoSuccess(data);
-//                }
-            }
-        });
     }
 
     /**

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

@@ -38,14 +38,6 @@ public class HomePresenter extends BasePresenter<HomeContract.HomeView> implemen
      * @param
      */
     public void getUserInfo() {
-        addSubscribe(create(APIService.class).getUserInfo(), new BaseObserver<UserInfo>(getView()) {
-            @Override
-            protected void onSuccess(UserInfo data) {
-//                if (getView() != null) {
-//                    getView().getUserInfoSuccess(data);
-//                }
-            }
-        });
     }
 
     public void getTeacherUserInfo() {

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

@@ -14,22 +14,6 @@ import com.cooleshow.usercenter.bean.UserInfo;
  */
 public class MainPresenter extends BasePresenter<MainContract.MainView> implements MainContract.Presenter {
 
-    /**
-     * 查询UserInfo
-     *
-     * @param
-     */
-    @Override
-    public void getUserInfo() {
-        addSubscribe(create(APIService.class).getUserInfo(), new BaseObserver<UserInfo>(getView()) {
-            @Override
-            protected void onSuccess(UserInfo data) {
-                if (getView() != null) {
-                    getView().getUserInfoSuccess(data);
-                }
-            }
-        });
-    }
 
     @Override
     public void getTeacherUserInfo() {

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

@@ -19,14 +19,6 @@ public class MinePresenter extends BasePresenter<MineContract.MineView> implemen
      * @param
      */
     public void getUserInfo() {
-        addSubscribe(create(APIService.class).getUserInfo(), new BaseObserver<UserInfo>(getView()) {
-            @Override
-            protected void onSuccess(UserInfo data) {
-//                if (getView() != null) {
-//                    getView().getUserInfoSuccess(data);
-//                }
-            }
-        });
     }
 
     public void getTeacherUserInfo() {

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

@@ -402,21 +402,10 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     @Override
     protected void onResume() {
         super.onResume();
-        presenter.getUserInfo();
         presenter.getTeacherUserInfo();
         presenter.getTeacherPromoteInfo();
     }
 
-    @Override
-    public void getUserInfoSuccess(UserInfo userInfo) {
-        if (isFinishing() || isDestroyed()) {
-            return;
-        }
-        //存储userInfo信息
-        UserHelper.saveUserInfo(userInfo);
-        connectIM();
-        bindPushId();
-    }
 
     private void bindPushId() {
         if (isNeedSetPushId && UserHelper.isLogin() && !TextUtils.isEmpty(UserHelper.getUserId())) {
@@ -445,6 +434,11 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
         if (isFinishing() || isDestroyed()) {
             return;
         }
+        //存储userInfo信息
+        UserHelper.saveUserInfo(teacherUserInfo);
+        connectIM();
+        bindPushId();
+
         //save达人认证状态和开通直播状态
         UserHelper.saveTeacherCertificationStatus(teacherUserInfo.entryStatus);
         UserHelper.saveTeacherOpenLiveFlag(teacherUserInfo.liveFlag);

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

@@ -121,25 +121,6 @@ public class UserHelper {
     }
 
 
-    public static void saveUserInfo(UserInfo userInfo) {
-        if (userInfo == null) {
-            return;
-        }
-        //userId
-        SPUtils.getInstance().put(USER_ID, userInfo.id);
-        //imUserId
-        SPUtils.getInstance().put(IM_USER_ID, userInfo.imUserId);
-        //昵称
-        SPUtils.getInstance().put(USERNAME, userInfo.username);
-        //imtoken
-        SPUtils.getInstance().put(USER_IM_TOKEN, userInfo.imToken);
-        //电话
-        SPUtils.getInstance().put(USER_PHONE, userInfo.phone);
-        //头像
-        SPUtils.getInstance().put(USER_AVATAR, userInfo.avatar);
-
-    }
-
     public static void saveUserInfo(StudentUserInfo userInfo) {
         if (userInfo == null) {
             return;