修改网络教室流程逻辑

chatModule/src/main/java/com/cooleshow/chatmodule/widget/CustomChatInputMusicExtension.java

@@ -60,7 +60,7 @@ public class CustomChatInputMusicExtension extends ServiceInitializer implements
             //群聊
             TUIExtensionInfo extensionInfo = new TUIExtensionInfo();
             extensionInfo.setText("曲谱");
-            extensionInfo.setIcon(R.drawable.icon_group_fans);
+            extensionInfo.setIcon(R.drawable.rc_ext_plugin_score);
             extensionInfo.setExtensionListener(new TUIExtensionEventListener() {
                 @Override
                 public void onClicked(Map<String, Object> param) {

classRoom/build.gradle

@@ -63,4 +63,8 @@ dependencies {
     implementation project(path: ':usercenter')
 //    implementation project(path: ':live_teaching')
     implementation 'com.h6ah4i.android.widget.verticalseekbar:verticalseekbar:1.0.0'
+    //ARouter
+    annotationProcessor("com.alibaba:arouter-compiler:$rootProject.ext.android.arouter_api_version")
+    implementation 'com.alibaba:arouter-api:1.5.2'
+    kapt 'com.alibaba:arouter-compiler:1.5.2'
 }

classRoom/src/main/java/com/dayayuemeng/classroom/api/LiveTeachingUrls.java

@@ -8,7 +8,7 @@ public class LiveTeachingUrls {
 //            public static final String DOMAIN = "http://192.168.3.38:8000/";
 
     public static final String DOMAIN    = BuildConfig.BASE_SERVER_URL;
-    static final        String api       = "api-im/";
+    static final        String api       = "api-classroom/";
     public static final String LOGIN     = api + "room/join";
     public static final String hereWhite = api + "hereWhite/create";
     public static final String SIGN_IN   = api + "room/signIn";

classRoom/src/main/java/com/dayayuemeng/classroom/presenter/TeacherNetClassRoomPresenter.java

@@ -65,7 +65,7 @@ public class TeacherNetClassRoomPresenter extends BasePresenter<TeacherNetClassR
                     getView().enterLiveRoomSuccess();
                 }
             } else {
-                Log.d(TAG, "Enter room failed");
+                Log.d(TAG, "Enter room failed:"+result);
                 if (getView() != null) {
                     getView().enterLiveRoomError();
                 }

classRoom/src/main/java/com/dayayuemeng/classroom/repository/UserRepository.java

@@ -18,6 +18,7 @@ import com.dayayuemeng.classroom.bean.ClassMember;
 import com.dayayuemeng.classroom.bean.LoginResult;
 import com.dayayuemeng.classroom.bean.UserInfo;
 import com.dayayuemeng.classroom.constants.Role;
+import com.dayayuemeng.classroom.utils.ClientUtils;
 
 import java.util.HashMap;
 import java.util.List;
@@ -49,6 +50,7 @@ public class UserRepository extends BaseRepository {
         bodyMap.put("roomId", roomId);
         bodyMap.put("audience", String.valueOf(isListener));
         bodyMap.put("userName", userName);
+        bodyMap.put("clientType", ClientUtils.getClientType());
         sealClassService.login(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<>(new ResultCallback<LoginResult>() {
             @Override
             public void onSuccess(final LoginResult result) {
@@ -154,6 +156,7 @@ public class UserRepository extends BaseRepository {
         bodyMap.put("userId", userId);
         bodyMap.put("requestStatus", requestStatus);
         bodyMap.put("deviceNum", DeviceUtils.getAndroidID());
+        bodyMap.put("clientType", ClientUtils.getClientType());
         sealClassService.joinRoomStatusNotify(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<>(new ResultCallback<Boolean>() {
             @Override
             public void onSuccess(Boolean aBoolean) {

classRoom/src/main/java/com/dayayuemeng/classroom/ui/TeacherNetClassRoomActivity.java

@@ -787,7 +787,8 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
         Log.i(TAG, "handleVideoData:" + loginResult);
         if (loginResult != null) {
             ScreenDisplay screenDisplay = ScreenDisplay.createScreenDisplay(loginResult.getDisplay());
-            Log.i(TAG, "主屏id:" + screenDisplay != null ? screenDisplay.getUserId() : "");
+            String videoId = screenDisplay != null ? screenDisplay.getUserId() : "";
+            Log.i(TAG, "主屏id:" +videoId );
             if (screenDisplay != null) {
                 classViewModel.switchDisplay(getRoomId(), screenDisplay.getType(), screenDisplay.getUserId(), false);
             } else {

classRoom/src/main/java/com/dayayuemeng/classroom/utils/ClientUtils.java

@@ -0,0 +1,17 @@
+package com.dayayuemeng.classroom.utils;
+
+import com.cooleshow.base.common.BaseApplication;
+
+/**
+ * Author by pq, Date on 2023/8/21.
+ */
+public class ClientUtils {
+    public static final String TEACHER_CLIENT = "TEACHER";
+    public static final String STUDENT_CLIENT = "STUDENT";
+    public static String getClientType(){
+        if(BaseApplication.Companion.isTeacherClient()){
+            return TEACHER_CLIENT;
+        }
+        return STUDENT_CLIENT;
+    }
+}

classRoom/src/main/java/com/dayayuemeng/classroom/widget/DisplayNullView.java

@@ -41,7 +41,7 @@ public class DisplayNullView extends LinearLayout {
     }
 
     private void initView() {
-        View view = View.inflate(getContext(), R.layout.class_view_display_null, this);
+        View view = View.inflate(getContext(), R.layout.new_class_view_display_null, this);
         displayNullImage = view.findViewById(R.id.class_display_null_image);
         displayNullContent = view.findViewById(R.id.class_display_null_content);
         mRootView = findViewById(R.id.ll_root);