网络教室接口增加字段

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

@@ -0,0 +1,16 @@
+package com.cooleshow.base.utils;
+
+import com.cooleshow.base.common.BaseApplication;
+
+/**
+ * Author by pq, Date on 2022/10/20.
+ */
+public class ClientHelper {
+    public static final String TEACHER_CLIENT_TYPE = "TEACHER";
+    public static final String STUDENT_CLIENT_TYPE = "STUDENT";
+
+    public static String getClientType() {
+        boolean isTeacherClient = BaseApplication.Companion.isTeacherClient();
+        return isTeacherClient ? TEACHER_CLIENT_TYPE : STUDENT_CLIENT_TYPE;
+    }
+}

live_teaching/src/main/java/com/daya/live_teaching/im/message/MemberChangedMessage.java

@@ -24,6 +24,7 @@ public class MemberChangedMessage extends MessageContent {
     private final static String TAG = MemberChangedMessage.class.getSimpleName();
     private int action;     // 用户行为：1.加入；2.离开；3.踢出
     private String userId;
+    private String imUserId;
     private String userName;
     private String avatar;
     private int role;       // 用户角色
@@ -53,6 +54,7 @@ public class MemberChangedMessage extends MessageContent {
             }
             JSONObject roomMemberJson = jsonObject.optJSONObject("roomMember");
             userId = roomMemberJson.optString("userId");
+            imUserId = roomMemberJson.optString("imUserId");
             userName = roomMemberJson.optString("username");
             avatar = roomMemberJson.optString("avatar");
             role = roomMemberJson.optInt("role");
@@ -68,6 +70,7 @@ public class MemberChangedMessage extends MessageContent {
     public MemberChangedMessage(Parcel in) {
         action = in.readInt();
         userId = in.readString();
+        imUserId = in.readString();
         userName = in.readString();
         avatar = in.readString();
         role = in.readInt();
@@ -82,7 +85,7 @@ public class MemberChangedMessage extends MessageContent {
     }
 
     public String getUserId() {
-        return userId;
+        return imUserId;
     }
 
     public String getUserName() {
@@ -123,6 +126,7 @@ public class MemberChangedMessage extends MessageContent {
         try {
 //            jsonObject.put("action", action);
             jsonObject.put("userId", userId);
+            jsonObject.put("imUserId", imUserId);
             jsonObject.put("username", userName);
             jsonObject.put("avatar", avatar);
             jsonObject.put("role", role);
@@ -151,6 +155,7 @@ public class MemberChangedMessage extends MessageContent {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(action);
         dest.writeString(userId);
+        dest.writeString(imUserId);
         dest.writeString(userName);
         dest.writeString(avatar);
         dest.writeInt(role);

live_teaching/src/main/java/com/daya/live_teaching/model/ClassMember.java

@@ -25,6 +25,7 @@ public class ClassMember implements Serializable {
     private boolean micFlag;//是否开启麦克风
     private int role;
     private String userId;
+    private String imUserId;
     private String avatar;
     private String username;
 
@@ -112,11 +113,11 @@ public class ClassMember implements Serializable {
     }
 
     public String getUserId() {
-        return userId;
+        return imUserId;
     }
 
     public void setUserId(String userId) {
-        this.userId = userId;
+        this.imUserId = userId;
     }
 
     public String getUserName() {

live_teaching/src/main/java/com/daya/live_teaching/repository/ClassRepository.java

@@ -8,6 +8,7 @@ import com.cooleshow.base.data.net.BaseResponse;
 import com.cooleshow.base.data.net.RetrofitClientNoToken;
 import com.cooleshow.base.data.net.RetrofitFactory;
 import com.cooleshow.base.rx.BaseObserver;
+import com.cooleshow.base.utils.ClientHelper;
 import com.cooleshow.base.utils.DateUtil;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.RequestBodyUtil;
@@ -132,6 +133,7 @@ public class ClassRepository extends BaseRepository {
         HashMap<String, Object> bodyMap = new HashMap<>();
         bodyMap.put(PARAM_ROOM_ID, roomId);
         bodyMap.put(PARAM_USER_ID, userId);
+        bodyMap.put("clientType", ClientHelper.getClientType());
         bodyMap.put("deviceNum", (TextUtils.isEmpty(BaseApplication.Companion.getRegistrationId()) ? SystemUtils.getUniqueIdentificationCode(getContext()) : BaseApplication.Companion.getRegistrationId()));
         sealClassService.leave(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<Boolean>(callBack));
     }
@@ -296,6 +298,7 @@ public class ClassRepository extends BaseRepository {
         HashMap<String, Object> bodyMap = new HashMap<>();
         bodyMap.put(PARAM_ROOM_ID, roomId);
         bodyMap.put(PARAM_DEVICE_TYPE, deviceType);
+        bodyMap.put("clientType", ClientHelper.getClientType());
         sealClassService.deviceApprove(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<Boolean>(callBack));
     }
 
@@ -303,6 +306,7 @@ public class ClassRepository extends BaseRepository {
         HashMap<String, Object> bodyMap = new HashMap<>();
         bodyMap.put(PARAM_ROOM_ID, roomId);
         bodyMap.put(PARAM_DEVICE_TYPE, deviceType);
+        bodyMap.put("clientType", ClientHelper.getClientType());
         sealClassService.deviceReject(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<Boolean>(callBack));
     }
 
@@ -312,6 +316,7 @@ public class ClassRepository extends BaseRepository {
         bodyMap.put(PARAM_USER_ID, userId);
         bodyMap.put(PARAM_DEVICE_TYPE, PARAM_HAND_UP_TYPE);
         bodyMap.put("enable", handUpOn);
+        bodyMap.put("clientType", ClientHelper.getClientType());
         sealClassService.deviceSync(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<Boolean>(callBack));
     }
 
@@ -321,6 +326,7 @@ public class ClassRepository extends BaseRepository {
         bodyMap.put(MUSIC_MODE_ON, musicModeOn);
         bodyMap.put(PARAM_DEVICE_TYPE, PARAM_MUSIC_MODE_TYPE);
         bodyMap.put("enable", musicModeOn);
+        bodyMap.put("clientType", ClientHelper.getClientType());
         sealClassService.deviceSync(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<Boolean>(callBack));
     }
 
@@ -330,6 +336,7 @@ public class ClassRepository extends BaseRepository {
         bodyMap.put(PARAM_CAMERA_ON, cameraOn);
         bodyMap.put(PARAM_DEVICE_TYPE, PARAM_CAMERA_TYPE);
         bodyMap.put("enable", cameraOn);
+        bodyMap.put("clientType", ClientHelper.getClientType());
         sealClassService.deviceSync(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<Boolean>(callBack));
     }
 
@@ -338,6 +345,7 @@ public class ClassRepository extends BaseRepository {
         bodyMap.put(PARAM_ROOM_ID, roomId);
         bodyMap.put(PARAM_DEVICE_TYPE, PARAM_MICROPHONE_TYPE);
         bodyMap.put("enable", microphoneOn);
+        bodyMap.put("clientType", ClientHelper.getClientType());
         sealClassService.deviceSync(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<Boolean>(callBack));
     }
 
@@ -346,6 +354,7 @@ public class ClassRepository extends BaseRepository {
         bodyMap.put(PARAM_ROOM_ID, roomId);
         bodyMap.put(PARAM_DEVICE_TYPE, PARAM_MUSIC_SHEET_TYPE);
         bodyMap.put("enable", examSong);
+        bodyMap.put("clientType", ClientHelper.getClientType());
         sealClassService.deviceSync(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<Boolean>(callBack));
     }
 
@@ -471,6 +480,7 @@ public class ClassRepository extends BaseRepository {
         bodyMap.put(PARAM_ROOM_ID, roomId);
         bodyMap.put(EXAM_SONG_ID, musicScoreAccompanimentId);
         bodyMap.put("status", status);
+        bodyMap.put("clientType", ClientHelper.getClientType());
         sealClassService.adjustExamSong(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<>(callBack));
     }
 

live_teaching/src/main/java/com/daya/live_teaching/repository/UserRepository.java

@@ -6,6 +6,7 @@ import android.text.TextUtils;
 
 import com.cooleshow.base.common.BaseApplication;
 import com.cooleshow.base.data.net.RetrofitFactory;
+import com.cooleshow.base.utils.ClientHelper;
 import com.cooleshow.base.utils.SystemUtils;
 import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.api.LiveTeachingApi;
@@ -51,6 +52,8 @@ public class UserRepository extends BaseRepository {
         bodyMap.put("roomId", roomId);
         bodyMap.put("audience", String.valueOf(isListener));
         bodyMap.put("userName", userName);
+        bodyMap.put("clientType", ClientHelper.getClientType());
+
         authorization = UserHelper.getUserToken();
         getHttpManager().setAuthHeader(authorization);
         sealClassService.login(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<>(new ResultCallback<LoginResult>() {
@@ -129,6 +132,7 @@ public class UserRepository extends BaseRepository {
         bodyMap.put("userId", userId);
         bodyMap.put("requestStatus", requestStatus);
         bodyMap.put("deviceNum", (TextUtils.isEmpty(BaseApplication.Companion.getRegistrationId()) ? SystemUtils.getUniqueIdentificationCode(getContext()) : BaseApplication.Companion.getRegistrationId()));
+        bodyMap.put("clientType", ClientHelper.getClientType());
         sealClassService.joinRoomStatusNotify(RetrofitUtil.createJsonRequest(bodyMap)).enqueue(new CallBackWrapper<>(new ResultCallback<Boolean>() {
             @Override
             public void onSuccess(Boolean aBoolean) {