Parcourir la source

删除融云模块修改老师端一些报错问题

Pq il y a 1 an
Parent
commit
906ee5f46d

+ 28 - 0
chatModule/src/main/java/com/cooleshow/chatmodule/bean/ContactListBean.java

@@ -53,4 +53,32 @@ public class ContactListBean extends BaseIndexPinyinBean{
     public String getTarget() {
         return TextUtils.isEmpty(friendNickname) ? "#" : friendNickname;
     }
+
+    public String getFriendAvatar() {
+        return friendAvatar;
+    }
+
+    public String getFriendId() {
+        return friendId;
+    }
+
+    public String getFriendNickname() {
+        return friendNickname;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public String getUpdateTime() {
+        return updateTime;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
 }

+ 87 - 0
tclive/src/main/java/com/daya/tclive/bean/FriendInfoBean.java

@@ -60,4 +60,91 @@ public class FriendInfoBean {
         this.friendId = friendId;
     }
 
+    public String getTags() {
+        return tags;
+    }
+
+    public void setTags(String tags) {
+        this.tags = tags;
+    }
+
+    public int getUserId() {
+        return userId;
+    }
+
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    public int getMemberRankSettingId() {
+        return memberRankSettingId;
+    }
+
+    public void setMemberRankSettingId(int memberRankSettingId) {
+        this.memberRankSettingId = memberRankSettingId;
+    }
+
+    public Object getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Object createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+
+    public String getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(String subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Object getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Object updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getSubjectName() {
+        return subjectName;
+    }
+
+    public void setSubjectName(String subjectName) {
+        this.subjectName = subjectName;
+    }
+
+    public String getFriendNickname() {
+        return friendNickname;
+    }
+
+    public void setFriendNickname(String friendNickname) {
+        this.friendNickname = friendNickname;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(int tenantId) {
+        this.tenantId = tenantId;
+    }
 }

+ 3 - 7
teacher/build.gradle

@@ -119,9 +119,9 @@ dependencies {
 
     implementation project(path: ':BaseLibrary')
     api project(path: ':usercenter')
-    implementation project(path: ':rong_im:kit')
-    implementation project(path: ':rong_im:live')
-    implementation project(path: ':rong_im:common_im_ui')
+//    implementation project(path: ':rong_im:kit')
+//    implementation project(path: ':rong_im:live')
+//    implementation project(path: ':rong_im:common_im_ui')
     implementation project(path: ':live_teaching')
     implementation project(path: ':metronome')
     implementation project(path: ':musictuner')
@@ -131,10 +131,6 @@ dependencies {
     implementation project(path: ':classRoom')
     implementation "com.alibaba:arouter-api:$rootProject.ext.android.arouter_api_version"
     kapt "com.alibaba:arouter-compiler:$rootProject.ext.android.arouter_api_version"
-    //融云美颜库 //cn.rongcloud.sdk:rtc_lib:5.2.1
-    implementation('cn.rongcloud.sdk:face_beautifier:5.2.4') {
-        exclude(group: 'cn.rongcloud.sdk', module: 'rtc_lib')
-    }
 
 //    api(name: 'openDefault-10.10.0', ext: 'aar')
 //    极光推送start

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/adapter/MineStyleFansGroupListAdapter.java

@@ -2,8 +2,8 @@ package com.cooleshow.teacher.adapter;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
-import com.common.im.bean.ContactRoomListBean;
 import com.cooleshow.base.utils.GlideUtils;
+import com.cooleshow.chatmodule.bean.ContactRoomListBean;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
 

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/api/APIService.java

@@ -1,9 +1,9 @@
 package com.cooleshow.teacher.api;
 
-import com.common.im.bean.ContactRoomListBean;
 import com.cooleshow.base.bean.CommonCourseConfigBean;
 import com.cooleshow.base.bean.QueryParamsConfigBean;
 import com.cooleshow.base.data.net.BaseResponse;
+import com.cooleshow.chatmodule.bean.ContactRoomListBean;
 import com.cooleshow.teacher.bean.AwardStatusBean;
 import com.cooleshow.teacher.bean.HomeHotAlbumListBean;
 import com.cooleshow.teacher.bean.HomeHotMusicSheetBean;

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/contract/LiveRoomContract.java

@@ -2,9 +2,10 @@ package com.cooleshow.teacher.contract;
 
 import android.view.View;
 
-import com.common.im.bean.RongIMUserInfo;
 import com.cooleshow.base.presenter.view.BaseView;
+import com.cooleshow.chatmodule.bean.ContactListBean;
 import com.cooleshow.teacher.bean.LiveRoomInfoBean;
+import com.daya.tclive.bean.FriendInfoBean;
 import com.rong.io.live.message.RCChatJoinRoomMessage;
 import com.rong.io.live.message.RCOnSnappingUpMessage;
 import com.rong.io.live.message.RCUserAddLikeMessage;
@@ -121,7 +122,7 @@ public interface LiveRoomContract {
          * 获取用户信息成功
          * @param data
          */
-        void getFriendInfoSuccess(RongIMUserInfo data);
+        void getFriendInfoSuccess(FriendInfoBean data);
 
         /**
          * 用户离开房间消息

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/contract/MineStyleContract.java

@@ -1,7 +1,7 @@
 package com.cooleshow.teacher.contract;
 
-import com.common.im.bean.ContactRoomListBean;
 import com.cooleshow.base.presenter.view.BaseView;
+import com.cooleshow.chatmodule.bean.ContactRoomListBean;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
 
 import java.util.List;

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/contract/MineStylePageContract.java

@@ -1,7 +1,7 @@
 package com.cooleshow.teacher.contract;
 
-import com.common.im.bean.ContactRoomListBean;
 import com.cooleshow.base.presenter.view.BaseView;
+import com.cooleshow.chatmodule.bean.ContactRoomListBean;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
 import com.cooleshow.usercenter.bean.SetDetailBean;
 import com.cooleshow.usercenter.bean.TeacherUserInfo;

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/presenter/homePage/MineStylePresenter.java

@@ -1,8 +1,8 @@
 package com.cooleshow.teacher.presenter.homePage;
 
-import com.common.im.bean.ContactRoomListBean;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.chatmodule.bean.ContactRoomListBean;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.TeacherSelfStyleInfoBean;
 import com.cooleshow.teacher.bean.request.QueryGroupListEntry;

+ 7 - 4
teacher/src/main/java/com/cooleshow/teacher/presenter/live/LiveRoomPresenter.java

@@ -3,20 +3,23 @@ package com.cooleshow.teacher.presenter.live;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.common.im.api.IMApi;
-import com.common.im.bean.RongIMUserInfo;
 import com.cooleshow.base.data.net.BaseResponse;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.Utils;
+import com.cooleshow.chatmodule.api.IMApi;
+import com.cooleshow.chatmodule.bean.ContactListBean;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.LiveRoomInfoBean;
 import com.cooleshow.teacher.contract.LiveRoomContract;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.common.ErrorCode;
 import com.daya.live_teaching.common.ResultCallback;
+import com.daya.tclive.api.StudentAPIService;
+import com.daya.tclive.api.TeacherAPIService;
+import com.daya.tclive.bean.FriendInfoBean;
 import com.google.gson.Gson;
 import com.rong.io.live.LiveRoomMsgConstants;
 import com.rong.io.live.bean.ImUserState;
@@ -1015,9 +1018,9 @@ public class LiveRoomPresenter extends BasePresenter<LiveRoomContract.LiveRoomVi
     }
 
     public void getUserInfoByUserId(String userId) {
-        addSubscribe(create(IMApi.class).queryTeaFriendDetail(userId), new DisposableObserver<BaseResponse<RongIMUserInfo>>() {
+        addSubscribe(create(TeacherAPIService.class).queryFriendDetail(userId), new DisposableObserver<BaseResponse<FriendInfoBean>>() {
             @Override
-            public void onNext(BaseResponse<RongIMUserInfo> friendInfoBeanBaseResponse) {
+            public void onNext(BaseResponse<FriendInfoBean> friendInfoBeanBaseResponse) {
                 if (getView() != null && friendInfoBeanBaseResponse != null) {
                     getView().getFriendInfoSuccess(friendInfoBeanBaseResponse.getData());
                 }

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/presenter/minestyle/MineStylePagePresenter.java

@@ -11,7 +11,6 @@ import com.bumptech.glide.Glide;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
-import com.common.im.bean.ContactRoomListBean;
 import com.cooleshow.base.constanst.UploadConstants;
 import com.cooleshow.base.data.net.BaseResponse;
 import com.cooleshow.base.presenter.BasePresenter;
@@ -21,6 +20,7 @@ import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.helper.upload.UploadHelper;
+import com.cooleshow.chatmodule.bean.ContactRoomListBean;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.HomePageSheetMusicListBean;

+ 3 - 2
teacher/src/main/java/com/cooleshow/teacher/ui/homepage/MineStyleFragment.java

@@ -6,11 +6,12 @@ import android.view.View;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
-import com.common.im.bean.ContactRoomListBean;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.ui.video.VideoPlayActivity;
 import com.cooleshow.base.utils.SizeUtils;
+import com.cooleshow.chatmodule.bean.ContactRoomListBean;
+import com.cooleshow.chatmodule.constants.TCChatRouterPath;
 import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineStyleFansGroupListAdapter;
@@ -66,7 +67,7 @@ public class MineStyleFragment extends BaseMVPFragment<FragmentMineStyleLayoutBi
                 .setEmptyText(getString(R.string.fans_empty_text))
                 .setOpeBtn(getString(R.string.goto_create))
                 .setOpeBtnClickListener(v -> {
-                    ARouter.getInstance().build(RouterPath.ChatCenter.CHAT_CREATE_GROUP)
+                    ARouter.getInstance().build(TCChatRouterPath.CHAT_CREATE_GROUP)
                             .navigation();
                 });
         mFansGroupListAdapter.setEmptyView(fansEmptyView);

+ 4 - 5
teacher/src/main/java/com/cooleshow/teacher/ui/live/TeacherLiveRoomActivity.java

@@ -20,9 +20,6 @@ import android.widget.TextView;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.bumptech.glide.Glide;
-import com.common.im.bean.RongIMUserInfo;
-import com.cooleshow.base.common.BaseApplication;
-import com.cooleshow.base.constanst.EventConstants;
 import com.cooleshow.base.data.net.ApiException;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
@@ -39,6 +36,7 @@ import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.widgets.InputBar;
 import com.cooleshow.base.widgets.dialog.CommonConfirmDialog;
 import com.cooleshow.base.widgets.dialog.InputBarDialog;
+import com.cooleshow.chatmodule.bean.ContactListBean;
 import com.cooleshow.chatmodule.constants.TCChatRouterPath;
 import com.cooleshow.chatmodule.utils.helper.ChatHelper;
 import com.cooleshow.teacher.R;
@@ -55,6 +53,7 @@ import com.cooleshow.teacher.widgets.dialog.LiveRoomManagerDialog;
 import com.cooleshow.teacher.widgets.helper.VideoViewManager;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.utils.ToastUtils;
+import com.daya.tclive.bean.FriendInfoBean;
 import com.gyf.immersionbar.ImmersionBar;
 import com.rong.io.live.LiveRoomMsgConstants;
 import com.rong.io.live.bean.User;
@@ -1120,12 +1119,12 @@ public class TeacherLiveRoomActivity extends BaseMVPActivity<ActivityTeacherLive
     }
 
     @Override
-    public void getFriendInfoSuccess(RongIMUserInfo data) {
+    public void getFriendInfoSuccess(FriendInfoBean data) {
         if (isFinishing() || isDestroyed()) {
             return;
         }
         User user = new User();
-        user.setUserId(data.getFriendId());
+        user.setUserId(data.getImFriendId());
         user.setUserName(data.getFriendNickname());
         user.setPortrait(data.getFriendAvatar());
         mRoomMicMemberHelper.refreshUserInfo(user);

+ 6 - 7
teacher/src/main/java/com/cooleshow/teacher/ui/main/MainActivity.java

@@ -13,7 +13,6 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
-import com.common.im.ui.MessageFragment;
 import com.cooleshow.base.bean.RouteBean;
 import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.constanst.LoginStatusConstants;
@@ -94,7 +93,6 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
     private long lastTime = 0;
     private boolean isNeedSetPushId = true;
     private String floatViewEventUrl = "";
-    private MessageFragment mMessageFragment;
 
     private IUnReadMessageObserver mUnReadMessageObserver = new IUnReadMessageObserver() {
         @Override
@@ -102,6 +100,7 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
             onCountChanged(totalUnreadCount);
         }
     };
+    private ChatFragment mChatFragment;
 
     /**
      * 打开首页并选中指定tab
@@ -177,12 +176,12 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
         CourseTableFragment courseTableFragment = new CourseTableFragment();
 //        mMessageFragment = new MessageFragment();
         shopMallFragment = new MallFragment();
-        ChatFragment chatFragment = new ChatFragment();
+        mChatFragment = new ChatFragment();
         mMineFragment = new MineFragment();
         mHomeFragment = new NewHomeFragment();
         mFragments.add(mHomeFragment);
         mFragments.add(courseTableFragment);
-        mFragments.add(chatFragment);
+        mFragments.add(mChatFragment);
         mFragments.add(shopMallFragment);
         mFragments.add(mMineFragment);
         homePageAdapter.setFragments(mFragments);
@@ -319,9 +318,9 @@ public class MainActivity extends BaseMVPActivity<ActivityMainBinding, MainPrese
         if (id == R.id.view_chat) {
             if (UiUtils.isFastClick(200)) {
                 //双击操作
-                if (mMessageFragment != null) {
-                    mMessageFragment.onFindConversationUnRead();
-                }
+//                if (mChatFragment != null) {
+//                    mChatFragment.onFindConversationUnRead();
+//                }
                 return;
             }
             lastCurrentItemPosition = 2;

+ 73 - 84
teacher/src/main/java/com/cooleshow/teacher/ui/minestyle/MineStylePageActivity.java

@@ -16,13 +16,13 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.common.im.bean.ContactRoomListBean;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.ui.video.VideoPlayActivity;
@@ -39,6 +39,7 @@ import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.widgets.CommonItemDecoration;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.base.widgets.dialog.CommonDialog;
+import com.cooleshow.chatmodule.bean.ContactRoomListBean;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.MineStyleFansGroupListAdapter;
 import com.cooleshow.teacher.adapter.MineStyleVideoAdapter;
@@ -109,92 +110,76 @@ public class MineStylePageActivity extends BaseMVPActivity<ActivityMineStylePage
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.tv_select_fans:
-                isModify = true;
-                Bundle bundle = new Bundle();
-                bundle.putSerializable("selectTeachableInstrument", (Serializable) selectTeachableInstrument);
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_TEACHABLE_INSTRUMENT)
-                        .withBundle("bundle", bundle)
-                        .navigation(this, SELECT_RESULT);
-                break;
-            case com.cooleshow.base.R.id.tv_right_text:
-            case R.id.tv_save:
-                myStyleInfoBean.styleVideo.clear();
-                for (TeacherSelfStyleInfoBean.StyleVideoBean styleVideoBean : videoBeanList) {
-                    if (styleVideoBean.type != 1) {
-                        if (TextUtils.isEmpty(styleVideoBean.cover)) {
-                            ToastUtil.getInstance().showShort("请上传个人风采视频封面");
-                            return;
-                        }
-                        myStyleInfoBean.styleVideo.add(styleVideoBean);
+        int id = view.getId();
+        if (id == R.id.tv_select_fans) {
+            isModify = true;
+            Bundle bundle = new Bundle();
+            bundle.putSerializable("selectTeachableInstrument", (Serializable) selectTeachableInstrument);
+            ARouter.getInstance().build(RouterPath.MineCenter.MINE_TEACHABLE_INSTRUMENT)
+                    .withBundle("bundle", bundle)
+                    .navigation(this, SELECT_RESULT);
+        } else if (id == com.cooleshow.base.R.id.tv_right_text || id == R.id.tv_save) {
+            myStyleInfoBean.styleVideo.clear();
+            for (TeacherSelfStyleInfoBean.StyleVideoBean styleVideoBean : videoBeanList) {
+                if (styleVideoBean.type != 1) {
+                    if (TextUtils.isEmpty(styleVideoBean.cover)) {
+                        ToastUtil.getInstance().showShort("请上传个人风采视频封面");
+                        return;
                     }
+                    myStyleInfoBean.styleVideo.add(styleVideoBean);
                 }
-                myStyleInfoBean.introduction = etSelfIntroduction.getText().toString().trim();
-                String subjectIdStr = "";
-                String subjectNameStr = "";
-                for (TeachableInstrumentBean teachableInstrumentBean : selectTeachableInstrument) {
-                    subjectIdStr += "," + teachableInstrumentBean.id;
-                    subjectNameStr += "," + teachableInstrumentBean.name;
-                }
-                if (subjectIdStr.startsWith(",")) {
-                    subjectIdStr = subjectIdStr.replaceFirst(",", "");
-                }
-                if (subjectNameStr.startsWith(",")) {
-                    subjectNameStr = subjectNameStr.replaceFirst(",", "");
-                }
-                myStyleInfoBean.subjectId = subjectIdStr;
-                myStyleInfoBean.subjectName = subjectNameStr;
-                presenter.saveTeacherStyle(GsonUtils.toJson(myStyleInfoBean));
-                break;
-            case R.id.tv_add_style:
-                getVideoPermission();
-                break;
-            case R.id.iv_avatar:
-                selectHeader();
-                break;
-            case R.id.view_nick_click:
-                //昵称修改
-                if (!TextUtils.isEmpty(currentNickName)) {
-                    ARouter.getInstance().build(RouterPath.MineCenter.MINE_MODIFY_NICKNAME)
-                            .withString("userName", currentNickName)
-                            .navigation(this);
-                }
-                break;
-            case R.id.view_real_name_click:
-                //实名认证
-                if (!TextUtils.isEmpty(isReal) && TextUtils.equals(isReal, "0")) {
-                    ARouter.getInstance().build(RouterPath.MineCenter.MINE_PERSONAL_CERTIFICATION)
-                            .navigation(this);
-                }
-                break;
-            case R.id.view_phone_click:
-                //手机号
-                ARouter.getInstance().build(RouterPath.MineCenter.MINE_CHECK_MODIFY_PHONENUM)
+            }
+            myStyleInfoBean.introduction = etSelfIntroduction.getText().toString().trim();
+            String subjectIdStr = "";
+            String subjectNameStr = "";
+            for (TeachableInstrumentBean teachableInstrumentBean : selectTeachableInstrument) {
+                subjectIdStr += "," + teachableInstrumentBean.id;
+                subjectNameStr += "," + teachableInstrumentBean.name;
+            }
+            if (subjectIdStr.startsWith(",")) {
+                subjectIdStr = subjectIdStr.replaceFirst(",", "");
+            }
+            if (subjectNameStr.startsWith(",")) {
+                subjectNameStr = subjectNameStr.replaceFirst(",", "");
+            }
+            myStyleInfoBean.subjectId = subjectIdStr;
+            myStyleInfoBean.subjectName = subjectNameStr;
+            presenter.saveTeacherStyle(GsonUtils.toJson(myStyleInfoBean));
+        } else if (id == R.id.tv_add_style) {
+            getVideoPermission();
+        } else if (id == R.id.iv_avatar) {
+            selectHeader();
+        } else if (id == R.id.view_nick_click) {//昵称修改
+            if (!TextUtils.isEmpty(currentNickName)) {
+                ARouter.getInstance().build(RouterPath.MineCenter.MINE_MODIFY_NICKNAME)
+                        .withString("userName", currentNickName)
                         .navigation(this);
-                break;
-            case R.id.tv_edit_introduce:
-                //编辑个人介绍
-                isModify = true;
-                SoftKeyboardUtils.showSoftKeyboard(viewBinding.etSelfIntroduction);
-                if (!TextUtils.isEmpty(viewBinding.etSelfIntroduction.getText())) {
-                    int length = viewBinding.etSelfIntroduction.getText().length();
-                    viewBinding.etSelfIntroduction.setSelection(length);
-                }
-                break;
-
-            case R.id.tv_male:
-                if (TextUtils.equals(currentGander, GENDER_TYPE_MALE)) {
-                    return;
-                }
-                modifySex(true);
-                break;
-            case R.id.tv_female:
-                if (TextUtils.equals(currentGander, GENDER_TYPE_FEMALE)) {
-                    return;
-                }
-                modifySex(false);
-                break;
+            }
+        } else if (id == R.id.view_real_name_click) {//实名认证
+            if (!TextUtils.isEmpty(isReal) && TextUtils.equals(isReal, "0")) {
+                ARouter.getInstance().build(RouterPath.MineCenter.MINE_PERSONAL_CERTIFICATION)
+                        .navigation(this);
+            }
+        } else if (id == R.id.view_phone_click) {//手机号
+            ARouter.getInstance().build(RouterPath.MineCenter.MINE_CHECK_MODIFY_PHONENUM)
+                    .navigation(this);
+        } else if (id == R.id.tv_edit_introduce) {//编辑个人介绍
+            isModify = true;
+            SoftKeyboardUtils.showSoftKeyboard(viewBinding.etSelfIntroduction);
+            if (!TextUtils.isEmpty(viewBinding.etSelfIntroduction.getText())) {
+                int length = viewBinding.etSelfIntroduction.getText().length();
+                viewBinding.etSelfIntroduction.setSelection(length);
+            }
+        } else if (id == R.id.tv_male) {
+            if (TextUtils.equals(currentGander, GENDER_TYPE_MALE)) {
+                return;
+            }
+            modifySex(true);
+        } else if (id == R.id.tv_female) {
+            if (TextUtils.equals(currentGander, GENDER_TYPE_FEMALE)) {
+                return;
+            }
+            modifySex(false);
         }
     }
 
@@ -236,6 +221,10 @@ public class MineStylePageActivity extends BaseMVPActivity<ActivityMineStylePage
         viewBinding.toolbarInclude.tvRightText.setBackgroundResource(com.cooleshow.base.R.drawable.shape_2dc7aa_14dp);
         viewBinding.toolbarInclude.tvRightText.setGravity(Gravity.CENTER);
         viewBinding.toolbarInclude.tvRightText.setPadding(SizeUtils.dp2px(12), SizeUtils.dp2px(4), SizeUtils.dp2px(12), SizeUtils.dp2px(4));
+        Toolbar.LayoutParams layoutParams = (Toolbar.LayoutParams) viewBinding.toolbarInclude.tvRightText.getLayoutParams();
+        layoutParams.setMargins(0,0,SizeUtils.dp2px(14),0);
+        viewBinding.toolbarInclude.tvRightText.setLayoutParams(layoutParams);
+
         etSelfIntroduction = viewBinding.etSelfIntroduction;
         videoList = viewBinding.rvTeacherStyleVideo;
         viewBinding.toolbarInclude.tvRightText.setOnClickListener(this);

+ 39 - 43
teacher/src/main/java/com/cooleshow/teacher/widgets/helper/LiveRoomBeautyHelper.java

@@ -1,9 +1,5 @@
 package com.cooleshow.teacher.widgets.helper;
 
-import cn.rongcloud.beauty.RCRTCBeautyEngine;
-import cn.rongcloud.beauty.RCRTCBeautyFilter;
-import cn.rongcloud.beauty.RCRTCBeautyOption;
-
 /**
  * Author by pq, Date on 2022/6/11.
  */
@@ -46,21 +42,21 @@ public class LiveRoomBeautyHelper {
     }
 
     public void update(int progress) {
-        RCRTCBeautyOption beautyOption = RCRTCBeautyEngine.getInstance().getCurrentBeautyOption();
-        if (currentType == OPTIONS_TYPE1) {
-            beauty_whiteness_progress = progress;
-            beautyOption.setWhitenessLevel(beauty_whiteness_progress);
-        } else if (currentType == OPTIONS_TYPE2) {
-            beauty_smooth_progress = progress;
-            beautyOption.setSmoothLevel(beauty_smooth_progress);
-        } else if (currentType == OPTIONS_TYPE3) {
-            beauty_ruddy_progress = progress;
-            beautyOption.setRuddyLevel(beauty_ruddy_progress);
-        } else if (currentType == OPTIONS_TYPE4) {
-            beauty_bright_progress = progress;
-            beautyOption.setBrightLevel(beauty_bright_progress);
-        }
-        RCRTCBeautyEngine.getInstance().setBeautyOption(isOpenBeauty, beautyOption);  // true 是使用美颜,false 不使用美颜
+//        RCRTCBeautyOption beautyOption = RCRTCBeautyEngine.getInstance().getCurrentBeautyOption();
+//        if (currentType == OPTIONS_TYPE1) {
+//            beauty_whiteness_progress = progress;
+//            beautyOption.setWhitenessLevel(beauty_whiteness_progress);
+//        } else if (currentType == OPTIONS_TYPE2) {
+//            beauty_smooth_progress = progress;
+//            beautyOption.setSmoothLevel(beauty_smooth_progress);
+//        } else if (currentType == OPTIONS_TYPE3) {
+//            beauty_ruddy_progress = progress;
+//            beautyOption.setRuddyLevel(beauty_ruddy_progress);
+//        } else if (currentType == OPTIONS_TYPE4) {
+//            beauty_bright_progress = progress;
+//            beautyOption.setBrightLevel(beauty_bright_progress);
+//        }
+//        RCRTCBeautyEngine.getInstance().setBeautyOption(isOpenBeauty, beautyOption);  // true 是使用美颜,false 不使用美颜
     }
 
     /**
@@ -71,12 +67,12 @@ public class LiveRoomBeautyHelper {
         beauty_smooth_progress = 0;
         beauty_ruddy_progress = 0;
         beauty_bright_progress = 0;
-        RCRTCBeautyOption beautyOption = RCRTCBeautyEngine.getInstance().getCurrentBeautyOption();
-        beautyOption.setWhitenessLevel(beauty_whiteness_progress);
-        beautyOption.setSmoothLevel(beauty_smooth_progress);
-        beautyOption.setRuddyLevel(beauty_ruddy_progress);
-        beautyOption.setBrightLevel(beauty_bright_progress);
-        RCRTCBeautyEngine.getInstance().setBeautyOption(isOpenBeauty, beautyOption);  // true 是使用美颜,false 不使用美颜
+//        RCRTCBeautyOption beautyOption = RCRTCBeautyEngine.getInstance().getCurrentBeautyOption();
+//        beautyOption.setWhitenessLevel(beauty_whiteness_progress);
+//        beautyOption.setSmoothLevel(beauty_smooth_progress);
+//        beautyOption.setRuddyLevel(beauty_ruddy_progress);
+//        beautyOption.setBrightLevel(beauty_bright_progress);
+//        RCRTCBeautyEngine.getInstance().setBeautyOption(isOpenBeauty, beautyOption);  // true 是使用美颜,false 不使用美颜
     }
 
 
@@ -86,8 +82,8 @@ public class LiveRoomBeautyHelper {
         } else {
             this.isOpenBeauty = true;
         }
-        RCRTCBeautyOption beautyOption = RCRTCBeautyEngine.getInstance().getCurrentBeautyOption();
-        RCRTCBeautyEngine.getInstance().setBeautyOption(isOpenBeauty, beautyOption);  // true 是使用美颜,false 不使用美颜
+//        RCRTCBeautyOption beautyOption = RCRTCBeautyEngine.getInstance().getCurrentBeautyOption();
+//        RCRTCBeautyEngine.getInstance().setBeautyOption(isOpenBeauty, beautyOption);  // true 是使用美颜,false 不使用美颜
     }
 
     public int getCurrentProgress(int type) {
@@ -113,21 +109,21 @@ public class LiveRoomBeautyHelper {
      * @param filterType
      */
     public void updateFilterMode(int filterType) {
-        if (filterType == FILTER_TYPE_NONE) {
-            //无滤镜模式
-            RCRTCBeautyEngine.getInstance().setBeautyFilter(RCRTCBeautyFilter.NONE);
-        }
-        if (filterType == FILTER_TYPE1) {
-            //唯美模式
-            RCRTCBeautyEngine.getInstance().setBeautyFilter(RCRTCBeautyFilter.ESTHETIC);  // 唯美
-        }
-        if (filterType == FILTER_TYPE2) {
-            //清新模式
-            RCRTCBeautyEngine.getInstance().setBeautyFilter(RCRTCBeautyFilter.FRESH);  // 清新
-        }
-        if (filterType == FILTER_TYPE3) {
-            //浪漫模式
-            RCRTCBeautyEngine.getInstance().setBeautyFilter(RCRTCBeautyFilter.ROMANTIC);  // 浪漫
-        }
+//        if (filterType == FILTER_TYPE_NONE) {
+//            //无滤镜模式
+//            RCRTCBeautyEngine.getInstance().setBeautyFilter(RCRTCBeautyFilter.NONE);
+//        }
+//        if (filterType == FILTER_TYPE1) {
+//            //唯美模式
+//            RCRTCBeautyEngine.getInstance().setBeautyFilter(RCRTCBeautyFilter.ESTHETIC);  // 唯美
+//        }
+//        if (filterType == FILTER_TYPE2) {
+//            //清新模式
+//            RCRTCBeautyEngine.getInstance().setBeautyFilter(RCRTCBeautyFilter.FRESH);  // 清新
+//        }
+//        if (filterType == FILTER_TYPE3) {
+//            //浪漫模式
+//            RCRTCBeautyEngine.getInstance().setBeautyFilter(RCRTCBeautyFilter.ROMANTIC);  // 浪漫
+//        }
     }
 }

+ 0 - 1
teacher/src/main/res/layout/activity_mine_style_page.xml

@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/color_f6f8f9"
     android:orientation="vertical">
 
     <include