修改直播入口

BaseLibrary/src/main/java/com/cooleshow/base/router/RouterPath.kt

@@ -27,6 +27,9 @@ object RouterPath {
             const val ACTIVITY_LIVE_ROOM_TEACHER = "/teacher/ui/live/LiveRoomActivity"
             const val TEACHER_MINE_CREATE_COURSE = "/teacher/ui/live/CreateLiveActivity"
             const val TEACHER_LIVE_LIST = "/teacher/ui/live/LiveListActivity"
+
+            const val ACTIVITY_TC_LIVE_ROOM_TEACHER = "/live/ui/TCTeacherLiveRoomActivity"
+            const val ACTIVITY_TT_LIVE_ROOM = "/live/ui/TCStudentLiveRoomActivity"
         }
     }
 

BaseLibrary/src/main/java/com/cooleshow/base/utils/JumpUtils.java

@@ -128,7 +128,7 @@ public class JumpUtils {
                             if (TextUtils.isEmpty(liveRoomId)) {
                                 return false;
                             }
-                            ARouter.getInstance().build(RouterPath.LiveCenter.ACTIVITY_LIVE_ROOM)
+                            ARouter.getInstance().build(RouterPath.LiveCenter.ACTIVITY_TT_LIVE_ROOM)
                                     .withString("roomid_key", liveRoomId)
                                     .navigation();
                             return true;

chatModule/src/main/java/com/cooleshow/chatmodule/message/holder/TUIChatShareLiveMessageHolder.java

@@ -58,12 +58,13 @@ public class TUIChatShareLiveMessageHolder extends MessageContentHolder {
                     if (TextUtils.isEmpty(liveMessage.getRoomUID())) {
                         return;
                     }
+
                     if (BaseApplication.Companion.isTeacherClient()) {
-                        ARouter.getInstance().build(RouterPath.LiveCenter.ACTIVITY_LIVE_ROOM_TEACHER)
+                        ARouter.getInstance().build(RouterPath.LiveCenter.ACTIVITY_TC_LIVE_ROOM_TEACHER)
                                 .withString("roomid_key", liveMessage.getRoomUID())
                                 .navigation();
                     } else {
-                        ARouter.getInstance().build(RouterPath.LiveCenter.ACTIVITY_LIVE_ROOM)
+                        ARouter.getInstance().build(RouterPath.LiveCenter.ACTIVITY_TT_LIVE_ROOM)
                                 .withString("roomid_key", liveMessage.getRoomUID())
                                 .navigation();
                     }

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

@@ -61,7 +61,7 @@ public class TalentStyleFragment extends BaseFragment<FragmentHomeTalentLayoutBi
                 if (position < mTalentStyleAdapter.getData().size()) {
                     HomeStyleBean.RowsBean item = mTalentStyleAdapter.getData().get(position);
                     if (TextUtils.equals(item.liveStatus, Constants.ON_LIVING_TAG)) {
-                        ARouter.getInstance().build(ARouterConstace.ACTIVITY_TT_LIVE_ROOM)
+                        ARouter.getInstance().build(RouterPath.LiveCenter.ACTIVITY_TT_LIVE_ROOM)
                                 .withString("roomid_key",item.roomUid)
                                 .navigation();
 //                        LiveRoomActivity.startLiveRoomActivity(getContext(), item.roomUid);

student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java

@@ -79,6 +79,7 @@ import com.cooleshow.student.widgets.LollipopFixedWebView;
 import com.cooleshow.student.widgets.helper.JsInterfaceUtils;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.utils.GlideEngine;
+import com.daya.tclive.helper.TTLiveHelper;
 import com.google.gson.Gson;
 import com.gyf.immersionbar.ImmersionBar;
 import com.luck.picture.lib.PictureSelector;
@@ -597,7 +598,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     public void joinLiveRoom(String roomId, String teacherId) {
         //加入直播间
         if (!TextUtils.isEmpty(roomId)) {
-            LiveRoomActivity.startLiveRoomActivity(HtmlActivity.this, roomId);
+            TTLiveHelper.startLive(roomId);
         }
     }
 

tclive/src/main/java/com/daya/tclive/constants/ARouterConstace.java

@@ -1,9 +0,0 @@
-package com.daya.tclive.constants;
-
-/**
- * Author by pq, Date on 2023/8/14.
- */
-public class ARouterConstace {
-    public static final String ACTIVITY_TC_LIVE_ROOM_TEACHER    = "/live/ui/TCTeacherLiveRoomActivity";
-    public static final String ACTIVITY_TT_LIVE_ROOM    = "/live/ui/TCStudentLiveRoomActivity";
-}

tclive/src/main/java/com/daya/tclive/helper/TTLiveHelper.java

@@ -2,7 +2,11 @@ package com.daya.tclive.helper;
 
 import android.text.TextUtils;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.common.BaseApplication;
+import com.cooleshow.base.router.RouterPath;
 import com.daya.tclive.bean.SendUserInfo;
+import com.daya.tclive.constants.ARouterConstace;
 import com.daya.tclive.message.BaseTIMMessageContent;
 import com.daya.tclive.message.TCChatModeControlMessage;
 import com.daya.tclive.message.TCChatRoomLocalMessage;
@@ -57,4 +61,17 @@ public class TTLiveHelper {
         }
         return name;
     }
+
+    public static void startLive(String roomId){
+        boolean teacherClient = BaseApplication.Companion.isTeacherClient();
+        if(teacherClient){
+            ARouter.getInstance().build(RouterPath.LiveCenter.ACTIVITY_TC_LIVE_ROOM_TEACHER)
+                    .withString("roomid_key",roomId)
+                    .navigation();
+        }else{
+            ARouter.getInstance().build(RouterPath.LiveCenter.ACTIVITY_TT_LIVE_ROOM)
+                    .withString("roomid_key",roomId)
+                    .navigation();
+        }
+    }
 }

tclive/src/main/java/com/daya/tclive/ui/TCStudentLiveRoomActivity.java

@@ -118,7 +118,7 @@ import static com.tencent.live2.V2TXLiveDef.V2TXLiveRotation.V2TXLiveRotation0;
 /**
  * Author by pq, Date on 2023/2/22.
  */
-@Route(path = ARouterConstace.ACTIVITY_TT_LIVE_ROOM)
+@Route(path = RouterPath.LiveCenter.ACTIVITY_TT_LIVE_ROOM)
 public class TCStudentLiveRoomActivity extends BaseMVPActivity<AcTtLiveroomLayoutBinding, TTLiveRoomPresenter> implements TTLiveRoomContract.View, View.OnClickListener, SoftKeyboardUtil.OnSoftInputChangedListener {
     public static final String TAG = "TTLiveRoomActivity";
 

tclive/src/main/java/com/daya/tclive/ui/TCTeacherLiveRoomActivity.java

@@ -19,6 +19,7 @@ import android.widget.TextView;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.bumptech.glide.Glide;
+import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.AppUtils;
 import com.cooleshow.base.utils.GsonUtils;
@@ -94,7 +95,7 @@ import com.tencent.trtc.TRTCStatistics;
 /**
  * Author by pq, Date on 2023/3/2.
  */
-@Route(path = ARouterConstace.ACTIVITY_TC_LIVE_ROOM_TEACHER)
+@Route(path = RouterPath.LiveCenter.ACTIVITY_TC_LIVE_ROOM_TEACHER)
 public class TCTeacherLiveRoomActivity extends BaseMVPActivity<ActivityTcTeacherLiveRoomLayoutBinding, TCLivePresenter> implements TCLiveRoomContract.TCLiveRoomView, SoftKeyboardUtil.OnSoftInputChangedListener, LiveRoomMicMemberHelper.OnEventListener, View.OnClickListener {
     TXCloudVideoView mVideoView;
     FrameLayout mFlCreateOptions;

teacher/src/main/java/com/cooleshow/teacher/ui/live/CreateLiveActivity.java

@@ -22,6 +22,7 @@ import com.cooleshow.teacher.contract.CreateLiveContract;
 import com.cooleshow.teacher.databinding.ActivityCreateLiveBinding;
 import com.cooleshow.teacher.presenter.live.CreateLivePresenter;
 import com.daya.live_teaching.utils.GlideEngine;
+import com.daya.tclive.helper.TTLiveHelper;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
 import com.luck.picture.lib.config.PictureMimeType;
@@ -173,7 +174,7 @@ public class CreateLiveActivity extends BaseMVPActivity<ActivityCreateLiveBindin
     @Override
     public void onCreateLiveSuccess(String roomId) {
         ToastUtil.getInstance().showShort("创建成功");
-        TeacherLiveRoomActivity.start(this, roomId);
+        TTLiveHelper.startLive(roomId);
         finish();
     }
 

teacher/src/main/java/com/cooleshow/teacher/ui/live/LiveListFragment.java

@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemChildClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
+import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseFragment;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.ToastUtil;
@@ -92,10 +93,9 @@ public class LiveListFragment extends BaseMVPFragment<FragmentLiveListOnLayoutBi
                     LiveListBean.RowsBean rowsBean = mLiveListAdapter.getData().get(position);
                     if (view.getId() == R.id.ll_enter_live) {
                         //进入直播间
-                        ARouter.getInstance().build(ARouterConstace.ACTIVITY_TC_LIVE_ROOM_TEACHER)
+                        ARouter.getInstance().build(RouterPath.LiveCenter.ACTIVITY_TC_LIVE_ROOM_TEACHER)
                                 .withString("roomid_key",rowsBean.roomUid)
                                 .navigation();
-//                        TeacherLiveRoomActivity.start(getContext(), rowsBean.roomUid);
                         return;
                     }
                     if (view.getId() == R.id.tv_look_playback) {

teacher/src/main/java/com/cooleshow/teacher/ui/web/HtmlActivity.java

@@ -79,6 +79,7 @@ import com.cooleshow.teacher.widgets.LollipopFixedWebView;
 import com.cooleshow.teacher.widgets.helper.JsInterfaceUtils;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.utils.GlideEngine;
+import com.daya.tclive.helper.TTLiveHelper;
 import com.google.gson.Gson;
 import com.gyf.immersionbar.ImmersionBar;
 import com.luck.picture.lib.PictureSelector;
@@ -597,7 +598,7 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
     public void joinLiveRoom(String roomId, String teacherId) {
         //加入直播间
         if (!TextUtils.isEmpty(roomId)) {
-            TeacherLiveRoomActivity.start(HtmlActivity.this, roomId);
+            TTLiveHelper.startLive(roomId);
         }
     }