浏览代码

修改网络教室字段类型

Pq 8 月之前
父节点
当前提交
0c9d220530

+ 4 - 4
classRoom/src/main/java/com/dayayuemeng/classroom/bean/ClassMember.java

@@ -197,7 +197,7 @@ public class ClassMember implements Serializable {
             this.playStatus = playStatus;
         }
 
-        public ScheduleStudentMusicScoresBean(int accompanimentPlayStatus, int downStatus, String musicScoreAccompanimentId, int playStatus, int speed, String url, String mp3Url, String musicScoreName) {
+        public ScheduleStudentMusicScoresBean(int accompanimentPlayStatus, int downStatus, String musicScoreAccompanimentId, int playStatus, String speed, String url, String mp3Url, String musicScoreName) {
             this.accompanimentPlayStatus = accompanimentPlayStatus;
             this.downStatus = downStatus;
             this.musicScoreAccompanimentId = musicScoreAccompanimentId;
@@ -224,7 +224,7 @@ public class ClassMember implements Serializable {
         private String id;
         private String musicScoreAccompanimentId;
         private int playStatus;
-        private int speed;
+        private String speed;
         private String url;
         private String mp3Url;
         private String musicScoreName;
@@ -287,11 +287,11 @@ public class ClassMember implements Serializable {
             this.playStatus = playStatus;
         }
 
-        public int getSpeed() {
+        public String getSpeed() {
             return speed;
         }
 
-        public void setSpeed(int speed) {
+        public void setSpeed(String speed) {
             this.speed = speed;
         }
 

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

@@ -22,7 +22,7 @@ public class TTMusicSyncMessage extends BaseTIMMessageContent {
     private String url; // 曲谱url
     private String mp3Url; // 曲谱url
     private String songId; // songId
-    private int speed; // speed
+    private String speed; // speed
 
 
     public TTMusicSyncMessage(byte[] data) {
@@ -41,7 +41,7 @@ public class TTMusicSyncMessage extends BaseTIMMessageContent {
             url = jsonObject.optString("url");
             mp3Url = jsonObject.optString("mp3Url");
             songId = jsonObject.optString("songId");
-            speed = jsonObject.optInt("speed");
+            speed = jsonObject.optString("speed");
         } catch (JSONException e) {
             LOG.e(TAG, e.toString());
         }
@@ -71,11 +71,11 @@ public class TTMusicSyncMessage extends BaseTIMMessageContent {
         this.songId = songId;
     }
 
-    public int getSpeed() {
+    public String getSpeed() {
         return speed;
     }
 
-    public void setSpeed(int speed) {
+    public void setSpeed(String speed) {
         this.speed = speed;
     }
 
@@ -83,7 +83,7 @@ public class TTMusicSyncMessage extends BaseTIMMessageContent {
         url = parcel.readString();
         mp3Url = parcel.readString();
         songId = parcel.readString();
-        speed = parcel.readInt();
+        speed = parcel.readString();
         readBase(parcel);
     }
 
@@ -117,7 +117,7 @@ public class TTMusicSyncMessage extends BaseTIMMessageContent {
         dest.writeString(url);
         dest.writeString(mp3Url);
         dest.writeString(songId);
-        dest.writeInt(speed);
+        dest.writeString(speed);
         writeBase(dest,flags);
 
     }

+ 6 - 6
classRoom/src/main/java/com/dayayuemeng/classroom/model/DownLoadSongStatus.java

@@ -12,7 +12,7 @@ public class DownLoadSongStatus implements Parcelable {
     private int downStatus;
     private int playStatus;
     private int accompanimentPlayStatus;
-    private int speed;
+    private String speed;
     private String url;
     private String mp3Url;
     private String musicScoreName;
@@ -20,7 +20,7 @@ public class DownLoadSongStatus implements Parcelable {
     public DownLoadSongStatus() {
     }
 
-    public DownLoadSongStatus(String musicScoreAccompanimentId, int downStatus, int playStatus, int accompanimentPlayStatus, int speed, String url, String mp3Url, String musicScoreName) {
+    public DownLoadSongStatus(String musicScoreAccompanimentId, int downStatus, int playStatus, int accompanimentPlayStatus, String speed, String url, String mp3Url, String musicScoreName) {
         this.musicScoreAccompanimentId = musicScoreAccompanimentId;
         this.downStatus = downStatus;
         this.playStatus = playStatus;
@@ -36,7 +36,7 @@ public class DownLoadSongStatus implements Parcelable {
         downStatus = in.readInt();
         playStatus = in.readInt();
         accompanimentPlayStatus = in.readInt();
-        speed = in.readInt();
+        speed = in.readString();
         url = in.readString();
         mp3Url = in.readString();
         musicScoreName = in.readString();
@@ -66,11 +66,11 @@ public class DownLoadSongStatus implements Parcelable {
         this.accompanimentPlayStatus = accompanimentPlayStatus;
     }
 
-    public int getSpeed() {
+    public String getSpeed() {
         return speed;
     }
 
-    public void setSpeed(int speed) {
+    public void setSpeed(String speed) {
         this.speed = speed;
     }
 
@@ -132,7 +132,7 @@ public class DownLoadSongStatus implements Parcelable {
             dest.writeInt(downStatus);
             dest.writeInt(playStatus);
             dest.writeInt(accompanimentPlayStatus);
-            dest.writeInt(speed);
+            dest.writeString(speed);
             dest.writeString(url);
             dest.writeString(mp3Url);
             dest.writeString(musicScoreName);

+ 1 - 1
classRoom/src/main/java/com/dayayuemeng/classroom/viewmodel/ClassViewModel.java

@@ -1380,7 +1380,7 @@ public class ClassViewModel extends ViewModel {
             musicScoresBean.setMp3Url(mp3Url);
             musicScoresBean.setDownStatus(0);
             musicScoresBean.setUrl(url);
-            musicScoresBean.setSpeed(Integer.valueOf(speed));
+            musicScoresBean.setSpeed(speed);
             musicScoresBean.setAccompanimentPlayStatus(0);
             musicScoresBean.setIsAccompaniment(TextUtils.isEmpty(url) ? 1 : 0);
             musicScoresBean.setPlayStatus(0);

+ 1 - 1
live_teaching/src/main/java/com/daya/live_teaching/im/message/ExamSongDownloadStatusMessage.java

@@ -45,7 +45,7 @@ public class ExamSongDownloadStatusMessage extends MessageContent {
                 Object object = jsonArray.get(i);
                 JSONObject json = (JSONObject) object;
                 DownLoadSongStatus student = new DownLoadSongStatus(json.optString("musicScoreAccompanimentId"), json.optInt("downStatus")
-                        , json.optInt("playStatus"), json.optInt("accompanimentPlayStatus"), json.optInt("speed"), json.optString("url")
+                        , json.optInt("playStatus"), json.optInt("accompanimentPlayStatus"), json.optString("speed"), json.optString("url")
                         , json.optString("mp3Url"), json.optString("musicScoreName"));
                 downLoadSongStatus.add(student);
 

+ 4 - 4
live_teaching/src/main/java/com/daya/live_teaching/model/ClassMember.java

@@ -213,7 +213,7 @@ public class ClassMember implements Serializable {
         private String id;
         private String musicScoreAccompanimentId;
         private int playStatus;
-        private int speed;
+        private String speed;
         private String url;
         private String mp3Url;
         private String musicScoreName;
@@ -228,7 +228,7 @@ public class ClassMember implements Serializable {
             this.playStatus = playStatus;
         }
 
-        public ScheduleStudentMusicScoresBean(int accompanimentPlayStatus, int downStatus, String musicScoreAccompanimentId, int playStatus, int speed, String url, String mp3Url, String musicScoreName) {
+        public ScheduleStudentMusicScoresBean(int accompanimentPlayStatus, int downStatus, String musicScoreAccompanimentId, int playStatus, String speed, String url, String mp3Url, String musicScoreName) {
             this.accompanimentPlayStatus = accompanimentPlayStatus;
             this.downStatus = downStatus;
             this.musicScoreAccompanimentId = musicScoreAccompanimentId;
@@ -306,11 +306,11 @@ public class ClassMember implements Serializable {
             this.playStatus = playStatus;
         }
 
-        public int getSpeed() {
+        public String getSpeed() {
             return speed;
         }
 
-        public void setSpeed(int speed) {
+        public void setSpeed(String speed) {
             this.speed = speed;
         }
 

+ 6 - 6
live_teaching/src/main/java/com/daya/live_teaching/model/DownLoadSongStatus.java

@@ -12,7 +12,7 @@ public class DownLoadSongStatus implements Parcelable {
     private int downStatus;
     private int playStatus;
     private int accompanimentPlayStatus;
-    private int speed;
+    private String speed;
     private String url;
     private String mp3Url;
     private String musicScoreName;
@@ -20,7 +20,7 @@ public class DownLoadSongStatus implements Parcelable {
     public DownLoadSongStatus() {
     }
 
-    public DownLoadSongStatus(String musicScoreAccompanimentId, int downStatus, int playStatus, int accompanimentPlayStatus, int speed, String url, String mp3Url, String musicScoreName) {
+    public DownLoadSongStatus(String musicScoreAccompanimentId, int downStatus, int playStatus, int accompanimentPlayStatus, String speed, String url, String mp3Url, String musicScoreName) {
         this.musicScoreAccompanimentId = musicScoreAccompanimentId;
         this.downStatus = downStatus;
         this.playStatus = playStatus;
@@ -36,7 +36,7 @@ public class DownLoadSongStatus implements Parcelable {
         downStatus = in.readInt();
         playStatus = in.readInt();
         accompanimentPlayStatus = in.readInt();
-        speed = in.readInt();
+        speed = in.readString();
         url = in.readString();
         mp3Url = in.readString();
         musicScoreName = in.readString();
@@ -66,11 +66,11 @@ public class DownLoadSongStatus implements Parcelable {
         this.accompanimentPlayStatus = accompanimentPlayStatus;
     }
 
-    public int getSpeed() {
+    public String getSpeed() {
         return speed;
     }
 
-    public void setSpeed(int speed) {
+    public void setSpeed(String speed) {
         this.speed = speed;
     }
 
@@ -132,7 +132,7 @@ public class DownLoadSongStatus implements Parcelable {
             dest.writeInt(downStatus);
             dest.writeInt(playStatus);
             dest.writeInt(accompanimentPlayStatus);
-            dest.writeInt(speed);
+            dest.writeString(speed);
             dest.writeString(url);
             dest.writeString(mp3Url);
             dest.writeString(musicScoreName);

+ 1 - 1
live_teaching/src/main/java/com/daya/live_teaching/viewmodel/ClassViewModel.java

@@ -1276,7 +1276,7 @@ public class ClassViewModel extends ViewModel {
             musicScoresBean.setMp3Url(mp3Url);
             musicScoresBean.setDownStatus(0);
             musicScoresBean.setUrl(url);
-            musicScoresBean.setSpeed(Integer.valueOf(speed));
+            musicScoresBean.setSpeed(speed);
             musicScoresBean.setAccompanimentPlayStatus(0);
             musicScoresBean.setIsAccompaniment(TextUtils.isEmpty(url) ? 1 : 0);
             musicScoresBean.setPlayStatus(0);