增加学生端直播间入口

student/src/main/java/com/cooleshow/student/App.java

@@ -16,6 +16,25 @@ import com.cooleshow.base.utils.ProcessUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.im.IMManager;
+import com.rong.io.live.message.RCChatJoinRoomMessage;
+import com.rong.io.live.message.RCChatModeMessage;
+import com.rong.io.live.message.RCChatRoomCloseMessage;
+import com.rong.io.live.message.RCChatRoomMemberNumMessage;
+import com.rong.io.live.message.RCChatroomLocationMessage;
+import com.rong.io.live.message.RCLiveBlackUserBlockMessage;
+import com.rong.io.live.message.RCLiveBlackUserUnBlockMessage;
+import com.rong.io.live.message.RCLiveGoodsChangeMessage;
+import com.rong.io.live.message.RCOnSnappingUpMessage;
+import com.rong.io.live.message.RCPauseLiveMessage;
+import com.rong.io.live.message.RCUserAddLikeMessage;
+import com.rong.io.live.message.RCUserKickOutMessage;
+import com.rong.io.live.message.RCUserLeaveRoomMessage;
+import com.rong.io.live.message.RCUserLogOutUnusualMessage;
+import com.rong.io.live.message.RCUserMicLeaveMessage;
+import com.rong.io.live.message.RCUserSeatApplyMessage;
+import com.rong.io.live.message.RCUserSeatResponseMessage;
+import com.rong.io.live.message.RCUserSeatsCtrlMessage;
+import com.rong.io.live.message.RCUserSyncAddLikeCountMessage;
 import com.tencent.bugly.crashreport.CrashReport;
 import com.rong.io.live.helper.LiveRTCEngineInitHelper;
 import com.umeng.commonsdk.UMConfigure;
@@ -29,6 +48,7 @@ import io.reactivex.rxjava3.core.ObservableEmitter;
 import io.reactivex.rxjava3.core.ObservableOnSubscribe;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.rong.imlib.RongIMClient;
 import io.rong.push.RongPushClient;
 import io.rong.push.pushconfig.PushConfig;
 
@@ -103,6 +123,27 @@ public class App extends BaseApplication {
         }*/
         IMManager.init(this, "0vnjpoad0jbdz");
 //        RouteUtils.registerActivity(RouteUtils.RongActivityType.ConversationActivity, ConversationActivity.class);
+        // RTCLib 初始化
+        RongIMClient.registerMessageType(RCChatJoinRoomMessage.class);//加入直播房间消息
+        RongIMClient.registerMessageType(RCChatModeMessage.class);//直播间聊天模式控制消息
+        RongIMClient.registerMessageType(RCChatRoomCloseMessage.class);//直播间关闭消息
+        RongIMClient.registerMessageType(RCChatroomLocationMessage.class);//本地消息
+        RongIMClient.registerMessageType(RCChatRoomMemberNumMessage.class);//观众数量
+        RongIMClient.registerMessageType(RCUserAddLikeMessage.class);//用户点赞消息
+        RongIMClient.registerMessageType(RCUserKickOutMessage.class);//用户被踢出房间消息
+        RongIMClient.registerMessageType(RCUserLeaveRoomMessage.class);//退出直播间消息
+        RongIMClient.registerMessageType(RCUserLogOutUnusualMessage.class);//用户异常退出消息
+        RongIMClient.registerMessageType(RCUserMicLeaveMessage.class);//观众下麦发送消息
+        RongIMClient.registerMessageType(RCUserSeatApplyMessage.class);//申请连麦消息
+        RongIMClient.registerMessageType(RCUserSeatResponseMessage.class);//连麦回复消息
+        RongIMClient.registerMessageType(RCUserSeatsCtrlMessage.class);//连麦控制
+        RongIMClient.registerMessageType(RCUserSyncAddLikeCountMessage.class);//连麦控制
+        RongIMClient.registerMessageType(RCLiveGoodsChangeMessage.class);//直播间商品变化
+        RongIMClient.registerMessageType(RCPauseLiveMessage.class);//直播间商品变化
+        RongIMClient.registerMessageType(RCOnSnappingUpMessage.class);//XXX正在抢购
+        RongIMClient.registerMessageType(RCLiveBlackUserBlockMessage.class);//添加黑名单
+        RongIMClient.registerMessageType(RCLiveBlackUserUnBlockMessage.class);//解除黑名单
+
         LiveRTCEngineInitHelper.initRTC();
         EmojiManager.install(new IosEmojiProvider());
         /**

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

@@ -395,7 +395,7 @@ public interface APIService {
      *
      * @return
      */
-    @GET("api-web/imLiveBroadcastRoom/queryRoom")
+    @GET(STUDENT_GROUP+"liveRoom/studentCheckRoomInfo")
     Observable<BaseResponse<LiveRoomInfoBean>> getLiveRoomInfo(@Query("roomUid") String roomUid);
 
     /**

student/src/main/java/com/cooleshow/student/ui/live/LiveRoomActivity.java

@@ -657,9 +657,9 @@ public class LiveRoomActivity extends BaseMVPActivity<ActivityLiveroomLayoutBind
         if (roomInfoBean == null || isFinishing() || isDestroyed()) {
             return;
         }
+        mRoomInfoBean = roomInfoBean;
         isPcClientLive = TextUtils.equals(mRoomInfoBean.os, "pc");
         resetVideoContainer(!isPcClientLive);
-        mRoomInfoBean = roomInfoBean;
         currentAddLikeCount = roomInfoBean.likeNum;
         if (!TextUtils.isEmpty(roomInfoBean.roomConfig)) {
             try {

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

@@ -65,6 +65,7 @@ import com.cooleshow.student.bean.alipay.AuthResult;
 import com.cooleshow.student.bean.alipay.PayResult;
 import com.cooleshow.student.bean.weixinpay.WeixinPayInfo;
 import com.cooleshow.student.databinding.ActivityHtml1Binding;
+import com.cooleshow.student.ui.live.LiveRoomActivity;
 import com.cooleshow.student.widgets.FileUtils;
 import com.cooleshow.student.widgets.LollipopFixedWebView;
 import com.cooleshow.student.widgets.helper.JsInterfaceUtils;
@@ -540,7 +541,10 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
 
     @Override
     public void joinLiveRoom(String roomId, String teacherId) {
-
+        //加入直播间
+        if (!TextUtils.isEmpty(roomId)) {
+            LiveRoomActivity.startLiveRoomActivity(HtmlActivity.this, roomId);
+        }
     }
 
     @Override