修改部分网络教室songId字段类型

classRoom/src/main/java/com/dayayuemeng/classroom/im/message/TTControlDeviceStateMessage.java

@@ -78,8 +78,8 @@ public class TTControlDeviceStateMessage extends BaseTIMMessageContent {
         return targetName;
     }
 
-    public int getSongId() {
-        return Integer.parseInt(songId);
+    public String getSongId() {
+        return songId;
     }
 
     public int getSoundVolume() {

classRoom/src/main/java/com/dayayuemeng/classroom/im/message/TTMusicSyncMessage.java

@@ -21,7 +21,7 @@ public class TTMusicSyncMessage extends BaseTIMMessageContent {
 
     private String url; // 曲谱url
     private String mp3Url; // 曲谱url
-    private int songId; // songId
+    private String songId; // songId
     private int speed; // speed
 
 
@@ -40,7 +40,7 @@ public class TTMusicSyncMessage extends BaseTIMMessageContent {
             }
             url = jsonObject.optString("url");
             mp3Url = jsonObject.optString("mp3Url");
-            songId = jsonObject.optInt("songId");
+            songId = jsonObject.optString("songId");
             speed = jsonObject.optInt("speed");
         } catch (JSONException e) {
             LOG.e(TAG, e.toString());
@@ -63,11 +63,11 @@ public class TTMusicSyncMessage extends BaseTIMMessageContent {
         this.mp3Url = mp3Url;
     }
 
-    public int getSongId() {
+    public String getSongId() {
         return songId;
     }
 
-    public void setSongId(int songId) {
+    public void setSongId(String songId) {
         this.songId = songId;
     }
 
@@ -82,7 +82,7 @@ public class TTMusicSyncMessage extends BaseTIMMessageContent {
     public TTMusicSyncMessage(Parcel parcel) {
         url = parcel.readString();
         mp3Url = parcel.readString();
-        songId = parcel.readInt();
+        songId = parcel.readString();
         speed = parcel.readInt();
         readBase(parcel);
     }
@@ -116,7 +116,7 @@ public class TTMusicSyncMessage extends BaseTIMMessageContent {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(url);
         dest.writeString(mp3Url);
-        dest.writeInt(songId);
+        dest.writeString(songId);
         dest.writeInt(speed);
         writeBase(dest,flags);
 

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

@@ -155,7 +155,7 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
 
             if (what == SEND_APP_BACKGROUND_MSG) {
                 if (!isOnResume && AppUtils.isApplicationInBackground(StudentNetClassRoomActivity.this)) {
-                    Log.i("pq", "cameraDisable");
+                    LOG.i("pq", "cameraDisable");
                     switchCameraStatus(false);
                 }
                 return;
@@ -271,7 +271,7 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
     }
 
     private void initLiveConfig() {
-        Log.i("pq", "initPublishConfig");
+        LOG.i("pq", "initPublishConfig");
         if (loginResult != null) {
             LoginResult.RoomConfig rtcRoomConfig = loginResult.getRtcRoomConfig();
             presenter.initPublishConfig(this, Integer.parseInt(rtcRoomConfig.getAppKey()),getRoomId());
@@ -591,7 +591,7 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
         boolean isOnPlayBeat = isPlayBeat != null ? isPlayBeat : false;
         boolean isOnPlayMusic = isPlayMusic != null ? isPlayMusic : false;
         boolean isPlay = isOnPlayBeat || isOnPlayMusic;
-        Log.i(TAG, "changeOtherVolume:" + isPlay);
+        LOG.i(TAG, "changeOtherVolume:" + isPlay);
         if (isPlay) {
             presenter.changeRemoteAudioVolume(mUserId, value, false);
         } else {
@@ -699,10 +699,10 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
     }
 
     private void handleVideoData() {
-        Log.i(TAG, "handleVideoData:" + loginResult);
+        LOG.i(TAG, "handleVideoData:" + loginResult);
         if (loginResult != null) {
             ScreenDisplay screenDisplay = ScreenDisplay.createScreenDisplay(loginResult.getDisplay());
-            Log.i(TAG, "screenDisplay:" + screenDisplay.toString());
+            LOG.i(TAG, "screenDisplay:" + screenDisplay.toString());
             if (screenDisplay != null && !TextUtils.isEmpty(screenDisplay.getUserId())) {
                 if (screenDisplay.getType() == ScreenDisplay.Display.WHITEBOARD) {
                     switchWhiteBorardOrVideo(NewTeachingToolsFragment.Operate.SHARE_WHITE_BOARD);
@@ -733,7 +733,7 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
     @Override
     public void connectIMError(int code, String desc) {
         hideLoading();
-        Log.i(TAG, "connectIMError errorCode:" + code + "--errorStr:" + desc);
+        LOG.i(TAG, "connectIMError errorCode:" + code + "--errorStr:" + desc);
         ToastUtil.getInstance().show(this, "IM连接失败");
         finish();
     }
@@ -787,7 +787,7 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
         if (!checkActivityExist()) {
             return;
         }
-        Log.i(TAG, "onMemberChanged:" + content.toString());
+        LOG.i(TAG, "onMemberChanged:" + content.toString());
 
         if (content.getAction() == ClassMemberChangedAction.JOIN) {
             //用户加入
@@ -827,7 +827,7 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
         if (!checkActivityExist()) {
             return;
         }
-        Log.i(TAG, "onDisPlayChangeMessage:" + ttDisplayMessage.toString());
+        LOG.i(TAG, "onDisPlayChangeMessage:" + ttDisplayMessage.toString());
         if (ttDisplayMessage != null && ttDisplayMessage.getDisplay() != null) {
             ScreenDisplay display = ttDisplayMessage.getDisplay();
             if (display.getType() == ScreenDisplay.Display.WHITEBOARD) {
@@ -926,7 +926,7 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
     @Override
     public void onDeviceStateChanged(TTDeviceStateChangedMessage stateChangedMessage) {
         if (stateChangedMessage != null) {
-            Log.i("classRoom", "stateChangedMessage:" + stateChangedMessage.toString());
+            LOG.i("classRoom", "stateChangedMessage:" + stateChangedMessage.toString());
             DeviceType type = stateChangedMessage.getType();
             classViewModel.updateDeviceStateV2(stateChangedMessage.getSendUserInfo().getSendUserId(), type, stateChangedMessage.getEnable(), "");
         }
@@ -1001,7 +1001,7 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
             if (value == null) {
                 return;
             }
-            Log.i(TAG, "playMusic:" + value.toString());
+            LOG.i(TAG, "playMusic:" + value.toString());
             String url = type == DeviceType.MusicScore ? value.getUrl() : value.getMp3Url();
             presenter.startPlay(PLAY_MUSIC_ID, url);
             Integer playVolume = classViewModel.getSoundVolume().getValue();
@@ -1019,10 +1019,10 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
         }
     }
 
-    private ClassMember.ScheduleStudentMusicScoresBean getPlayBean(int songId) {
+    private ClassMember.ScheduleStudentMusicScoresBean getPlayBean(String songId) {
         List<ClassMember.ScheduleStudentMusicScoresBean> value = classViewModel.getPlaySongData().getValue();
         int size = value != null ? value.size() : -1;
-        Log.i(TAG, "getPlayBean:" + size);
+        LOG.i(TAG, "getPlayBean:" + size);
         if (value != null) {
             for (int i = 0; i < value.size(); i++) {
                 ClassMember.ScheduleStudentMusicScoresBean playSongDataBean = value.get(i);
@@ -1059,7 +1059,7 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
         if (!checkActivityExist()) {
             return;
         }
-        Log.i(TAG, "onMusicSyncMessage:" + musicSyncMessage.toString());
+        LOG.i(TAG, "onMusicSyncMessage:" + musicSyncMessage.toString());
         if (musicSyncMessage != null) {
             ClassMember.ScheduleStudentMusicScoresBean playSongDataBean = new ClassMember.ScheduleStudentMusicScoresBean();
             playSongDataBean.setUrl(musicSyncMessage.getUrl());
@@ -1177,8 +1177,8 @@ public class StudentNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomS
             //是否可自行解除静音模式
             ClassRoomConstants.isCanCancelMute = groupAttributeJson.optBoolean(ClassRoomConstants.CANCEL_MUTE_FLAG, true);
             ClassRoomConstants.isMuteAll = groupAttributeJson.optBoolean(ClassRoomConstants.IS_MUTE_ALL, false);
-            Log.i("pq", "isCanCancel:" + ClassRoomConstants.isCanCancelMute);
-            Log.i("pq", "isMuteAll:" + ClassRoomConstants.isMuteAll);
+            LOG.i("pq", "isCanCancel:" + ClassRoomConstants.isCanCancelMute);
+            LOG.i("pq", "isMuteAll:" + ClassRoomConstants.isMuteAll);
         }
     }
 

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

@@ -38,7 +38,6 @@ import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.ViewHolder;
 import com.cooleshow.base.widgets.dialog.CommonConfirmDialog;
 import com.cooleshow.usercenter.helper.UserHelper;
-import com.daya.tclive.BuildConfig;
 import com.daya.tclive.bean.SendUserInfo;
 import com.daya.tclive.bean.TTMessage;
 import com.daya.tclive.manager.TCIMSdkManager;
@@ -161,7 +160,7 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
 
             if (what == SEND_APP_BACKGROUND_MSG) {
                 if (!isOnResume && AppUtils.isApplicationInBackground(TeacherNetClassRoomActivity.this)) {
-                    Log.i("pq", "cameraDisable");
+                    LOG.i("pq", "cameraDisable");
                     switchCameraStatus(false);
                 }
                 return;
@@ -290,7 +289,7 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
     }
 
     private void initLiveConfig() {
-        Log.i("pq", "initPublishConfig");
+        LOG.i("pq", "initPublishConfig");
         if (loginResult != null) {
             LoginResult.RoomConfig rtcRoomConfig = loginResult.getRtcRoomConfig();
             presenter.initPublishConfig(this, Integer.parseInt(rtcRoomConfig.getAppKey()), getRoomId());
@@ -731,7 +730,7 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
 
             @Override
             public void onSpeech(String userIds, boolean isSpeech) {
-                Log.i("classRoom", "onSpeech:" + userIds + "--isSpeech:" + isSpeech);
+                LOG.i("classRoom", "onSpeech:" + userIds + "--isSpeech:" + isSpeech);
                 if (null != teachingToolsFragment) {
                     teachingToolsFragment.checkButton(NewTeachingToolsFragment.Operate.SHARE_VIDEO.getValue());
                 }
@@ -840,11 +839,11 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
     }
 
     private void handleVideoData() {
-        Log.i(TAG, "handleVideoData:" + loginResult);
+        LOG.i(TAG, "handleVideoData:" + loginResult);
         if (loginResult != null) {
             ScreenDisplay screenDisplay = ScreenDisplay.createScreenDisplay(loginResult.getDisplay());
             String videoId = screenDisplay != null ? screenDisplay.getUserId() : "";
-            Log.i(TAG, "主屏id:" + videoId);
+            LOG.i(TAG, "主屏id:" + videoId);
             if (screenDisplay != null) {
                 classViewModel.switchDisplay(getRoomId(), screenDisplay.getType(), screenDisplay.getUserId(), false);
             } else {
@@ -873,7 +872,7 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
     @Override
     public void connectIMError(int code, String desc) {
         hideLoading();
-        Log.i(TAG, "connectIMError errorCode:" + code + "--errorStr:" + desc);
+        LOG.i(TAG, "connectIMError errorCode:" + code + "--errorStr:" + desc);
         ToastUtil.getInstance().show(this, "IM连接失败");
         finish();
     }
@@ -908,7 +907,7 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
         if (!checkActivityExist()) {
             return;
         }
-        Log.i(TAG, "onMemberChanged:" + content.toString());
+        LOG.i(TAG, "onMemberChanged:" + content.toString());
         if (content.getAction() == ClassMemberChangedAction.JOIN) {
             //用户加入
             classViewModel.addClassMember(createClassMember(content));
@@ -976,7 +975,7 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
     @Override
     public void onDeviceStateChanged(TTDeviceStateChangedMessage stateChangedMessage) {
         if (stateChangedMessage != null) {
-            Log.i("classRoom", "stateChangedMessage:" + stateChangedMessage.toString());
+            LOG.i("classRoom", "stateChangedMessage:" + stateChangedMessage.toString());
             DeviceType type = stateChangedMessage.getType();
             classViewModel.updateDeviceStateV2(stateChangedMessage.getSendUserInfo().getSendUserId(), type, stateChangedMessage.getEnable(), "");
             classViewModel.postDeviceChangeToast(new DeviceChangeToast(stateChangedMessage.getSendUserInfo().getSendUserId(), stateChangedMessage.getSendUserInfo().getSendUserId(), type, stateChangedMessage.getEnable()));
@@ -1364,7 +1363,7 @@ public class TeacherNetClassRoomActivity extends BaseMVPActivity<AcNetClassRoomT
             if(value.getType() == ScreenDisplay.Display.STUDENT){
                 return false;
             }
-//            Log.i("pq","isDisplayOwner:"+value.getType().getType());
+//            LOG.i("pq","isDisplayOwner:"+value.getType().getType());
 //            if(value.getType() == ScreenDisplay.Display.WHITEBOARD || value.getType() == ScreenDisplay.Display.NONE){
 //                return true;
 //            }