diff --git a/common/src/main/java/com/yunbao/common/bean/MsgModel.java b/common/src/main/java/com/yunbao/common/bean/MsgModel.java index f75a7ceda..c6bea4ffc 100644 --- a/common/src/main/java/com/yunbao/common/bean/MsgModel.java +++ b/common/src/main/java/com/yunbao/common/bean/MsgModel.java @@ -68,7 +68,17 @@ public class MsgModel extends BaseModel { private String taskName1; @SerializedName("taskName2") private String taskName2; + @SerializedName("activityUrl") + private String activityUrl; + public String getActivityUrl() { + return activityUrl; + } + + public MsgModel setActivityUrl(String activityUrl) { + this.activityUrl = activityUrl; + return this; + } /** * 星级挑战成功IM消息 diff --git a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java index 1b8fb54f7..25c7a5639 100644 --- a/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java +++ b/live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java @@ -1127,7 +1127,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis htmlUrl.append(CommonAppConfig.HOST) .append("/") .append(bean.getModel().getActivityUrl()) - .append("&nickname=") + .append(bean.getModel().getActivityUrl().contains("?") ? "&nickname=" : "?nickname=") .append(userInfo.getUserNicename()) .append("&token=") .append(userInfo.getToken()) @@ -1186,7 +1186,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis htmlUrl.append(CommonAppConfig.HOST) .append("/") .append(bean.getModel().getActivityUrl()) - .append("&nickname=") + .append(bean.getModel().getActivityUrl().contains("?") ? "&nickname=" : "?nickname=") .append(userInfo.getUserNicename()) .append("&token=") .append(userInfo.getToken()) diff --git a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java index 97f534fd2..7314c1042 100644 --- a/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java +++ b/live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java @@ -179,7 +179,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe //公共參數 private OpenParametersModel openParametersModel = null; //星级活动地址 - private String activityUrl = ""; //标记是调用正常退出还是手动切后台 private boolean isQuitF = false; @@ -1596,7 +1595,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe mLiveRoomViewHolder .showStart( - new StarChallengeStatusModel(activityUrl) + new StarChallengeStatusModel(msgModel.getActivityUrl()) .setTaskNum(msgModel.getTaskNum()) .setTaskName1(msgModel.getTaskName1()) .setTaskName2(msgModel.getTaskName2())