老用户回归,星级Im消息修改

common/src/main/java/com/yunbao/common/Constants.java

@@ -165,6 +165,7 @@ public class Constants {
     public static final String SOCKET_PRIZE_POOL_UP = "jackpotUp";//奖池升级
     public static final String SOCKET_HOUR = "SendHourChart";//小时榜更新
     public static final String RECOMMEND_CARD_NOTIFY = "recommendCardNotify";//推荐卡通知消息
+    public static final String STAR_CHALLENGE_UPDATE = "starChallengeUpdate";//星级助力
 
     //游戏socket
     public static final String SOCKET_GAME_ZJH = "startGame";//炸金花

common/src/main/java/com/yunbao/common/bean/MsgModel.java

@@ -2,6 +2,7 @@ package com.yunbao.common.bean;
 
 import android.text.TextUtils;
 
+import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
 import com.yunbao.common.views.weight.FullServiceNotificationView;
 
@@ -49,6 +50,110 @@ public class MsgModel extends BaseModel {
     private String anchorName = "";
     @SerializedName("systemBubble")
     private String systemBubble = "";
+    @SerializedName("taskNum")
+    private String taskNum;
+    @SerializedName("currentStarVal")
+    private String currentStarVal;
+    @SerializedName("targetStarVal")
+    private String targetStarVal;
+    @SerializedName("currentAssistNum")
+    private String currentAssistNum;
+    @SerializedName("targetAssistNum")
+    private String targetAssistNum;
+    @SerializedName("starSrc")
+    private String starSrc;
+    @SerializedName("assistSrc")
+    private String assistSrc;
+    @SerializedName("taskName1")
+    private String taskName1;
+    @SerializedName("taskName2")
+    private String taskName2;
+
+    public String getTaskNum() {
+        return taskNum;
+    }
+
+    public MsgModel setTaskNum(String taskNum) {
+        this.taskNum = taskNum;
+        return this;
+    }
+
+    public String getCurrentStarVal() {
+        return currentStarVal;
+    }
+
+    public MsgModel setCurrentStarVal(String currentStarVal) {
+        this.currentStarVal = currentStarVal;
+        return this;
+    }
+
+    public String getTargetStarVal() {
+        return targetStarVal;
+    }
+
+    public MsgModel setTargetStarVal(String targetStarVal) {
+        this.targetStarVal = targetStarVal;
+        return this;
+    }
+
+    public String getCurrentAssistNum() {
+        return currentAssistNum;
+    }
+
+    public MsgModel setCurrentAssistNum(String currentAssistNum) {
+        this.currentAssistNum = currentAssistNum;
+        return this;
+    }
+
+    public String getTargetAssistNum() {
+        return targetAssistNum;
+    }
+
+    public MsgModel setTargetAssistNum(String targetAssistNum) {
+        this.targetAssistNum = targetAssistNum;
+        return this;
+    }
+
+    public String getStarSrc() {
+        return starSrc;
+    }
+
+    public MsgModel setStarSrc(String starSrc) {
+        this.starSrc = starSrc;
+        return this;
+    }
+
+    public String getAssistSrc() {
+        return assistSrc;
+    }
+
+    public MsgModel setAssistSrc(String assistSrc) {
+        this.assistSrc = assistSrc;
+        return this;
+    }
+
+    public String getTaskName1() {
+        return taskName1;
+    }
+
+    public MsgModel setTaskName1(String taskName1) {
+        this.taskName1 = taskName1;
+        return this;
+    }
+
+    public String getTaskName2() {
+        return taskName2;
+    }
+
+    public MsgModel setTaskName2(String taskName2) {
+        this.taskName2 = taskName2;
+        return this;
+    }
+
+    public static MsgModel objectFromData(String str) {
+
+        return new Gson().fromJson(str, MsgModel.class);
+    }
 
     public String getAction() {
         return action;

common/src/main/java/com/yunbao/common/bean/StarChallengeStatusModel.java

@@ -80,7 +80,7 @@ public class StarChallengeStatusModel extends BaseModel {
         return taskNum;
     }
 
-    public BaseModel setTaskNum(String taskNum) {
+    public StarChallengeStatusModel setTaskNum(String taskNum) {
         this.taskNum = taskNum;
         return this;
     }
@@ -89,7 +89,7 @@ public class StarChallengeStatusModel extends BaseModel {
         return currentStarVal;
     }
 
-    public BaseModel setCurrentStarVal(String currentStarVal) {
+    public StarChallengeStatusModel setCurrentStarVal(String currentStarVal) {
         this.currentStarVal = currentStarVal;
         return this;
     }
@@ -98,7 +98,7 @@ public class StarChallengeStatusModel extends BaseModel {
         return targetStarVal;
     }
 
-    public BaseModel setTargetStarVal(String targetStarVal) {
+    public StarChallengeStatusModel setTargetStarVal(String targetStarVal) {
         this.targetStarVal = targetStarVal;
         return this;
     }
@@ -107,7 +107,7 @@ public class StarChallengeStatusModel extends BaseModel {
         return currentAssistNum;
     }
 
-    public BaseModel setCurrentAssistNum(String currentAssistNum) {
+    public StarChallengeStatusModel setCurrentAssistNum(String currentAssistNum) {
         this.currentAssistNum = currentAssistNum;
         return this;
     }
@@ -116,7 +116,7 @@ public class StarChallengeStatusModel extends BaseModel {
         return targetAssistNum;
     }
 
-    public BaseModel setTargetAssistNum(String targetAssistNum) {
+    public StarChallengeStatusModel setTargetAssistNum(String targetAssistNum) {
         this.targetAssistNum = targetAssistNum;
         return this;
     }
@@ -125,7 +125,7 @@ public class StarChallengeStatusModel extends BaseModel {
         return starSrc;
     }
 
-    public BaseModel setStarSrc(String starSrc) {
+    public StarChallengeStatusModel setStarSrc(String starSrc) {
         this.starSrc = starSrc;
         return this;
     }
@@ -134,7 +134,7 @@ public class StarChallengeStatusModel extends BaseModel {
         return assistSrc;
     }
 
-    public BaseModel setAssistSrc(String assistSrc) {
+    public StarChallengeStatusModel setAssistSrc(String assistSrc) {
         this.assistSrc = assistSrc;
         return this;
     }