yutou/pdlivexp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测试更改

Browse Source
This commit is contained in:
18401019693 2022-11-18 10:50:40 +08:00
parent 94a96ba91a
commit 9fa0109c2e
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/yunbao/common/bean/MsgModel.java
View File

@ -68,7 +68,17 @@ public class MsgModel extends BaseModel {
private String taskName1; private String taskName1;
@SerializedName("taskName2") @SerializedName("taskName2")
private String 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消息 * 星级挑战成功IM消息

4
live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
View File

@ -1127,7 +1127,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
htmlUrl.append(CommonAppConfig.HOST) htmlUrl.append(CommonAppConfig.HOST)
.append("/") .append("/")
.append(bean.getModel().getActivityUrl()) .append(bean.getModel().getActivityUrl())
.append("&nickname=") .append(bean.getModel().getActivityUrl().contains("?") ? "&nickname=" : "?nickname=")
.append(userInfo.getUserNicename()) .append(userInfo.getUserNicename())
.append("&token=") .append("&token=")
.append(userInfo.getToken()) .append(userInfo.getToken())
@ -1186,7 +1186,7 @@ public class LiveRoomViewHolder extends AbsViewHolder implements View.OnClickLis
htmlUrl.append(CommonAppConfig.HOST) htmlUrl.append(CommonAppConfig.HOST)
.append("/") .append("/")
.append(bean.getModel().getActivityUrl()) .append(bean.getModel().getActivityUrl())
.append("&nickname=") .append(bean.getModel().getActivityUrl().contains("?") ? "&nickname=" : "?nickname=")
.append(userInfo.getUserNicename()) .append(userInfo.getUserNicename())
.append("&token=") .append("&token=")
.append(userInfo.getToken()) .append(userInfo.getToken())

3
live/src/main/java/com/yunbao/live/views/PortraitLiveManager.java
View File

@ -179,7 +179,6 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
//公共參數 //公共參數
private OpenParametersModel openParametersModel = null; private OpenParametersModel openParametersModel = null;
//星级活动地址 //星级活动地址
private String activityUrl = "";
//标记是调用正常退出还是手动切后台 //标记是调用正常退出还是手动切后台
private boolean isQuitF = false; private boolean isQuitF = false;
@ -1596,7 +1595,7 @@ public class PortraitLiveManager implements LivePlayListener, SocketMessageListe
mLiveRoomViewHolder mLiveRoomViewHolder
.showStart( .showStart(
new StarChallengeStatusModel(activityUrl) new StarChallengeStatusModel(msgModel.getActivityUrl())
.setTaskNum(msgModel.getTaskNum()) .setTaskNum(msgModel.getTaskNum())
.setTaskName1(msgModel.getTaskName1()) .setTaskName1(msgModel.getTaskName1())
.setTaskName2(msgModel.getTaskName2()) .setTaskName2(msgModel.getTaskName2())