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

新增首页战令入口

Browse Source
This commit is contained in:
hch
2024-01-12 15:33:16 +08:00
parent ac6eb21e06
commit 7627219e77
13 changed files with 121 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/src/main/java/com/yunbao/common/bean/AnchorRecommendModel.java
View File

@@ -20,6 +20,12 @@ public class AnchorRecommendModel extends BaseModel {
@SerializedName("red_packet_show")
private int showRedPacket = 0;//是否显示首页红包浮窗
//是否支持换一批0=不支持 1=支持
@SerializedName("live_battle_pass_show_status")
private int showWarOrder = 0;//是否显示首页戰令
//是否支持换一批0=不支持 1=支持
@SerializedName("up_show")
private int upShow = 0;
@SerializedName("list")
@@ -40,6 +46,14 @@ public class AnchorRecommendModel extends BaseModel {
return this;
}
public int getShowWarOrder() {
return showWarOrder;
}
public void setShowWarOrder(int showWarOrder) {
this.showWarOrder = showWarOrder;
}
public int getListShow() {
return listShow;
}

2
common/src/main/java/com/yunbao/common/pay/samsung/SamsungUtil.java
View File

@@ -41,7 +41,7 @@ public class SamsungUtil {
public void init() {
iapHelper = IapHelper.getInstance(mContext);
//设置支付模式 OPERATION_MODE_PRODUCTION 正式模式 OPERATION_MODE_TEST 测试模式
iapHelper.setOperationMode(HelperDefine.OperationMode.OPERATION_MODE_TEST);
iapHelper.setOperationMode(HelperDefine.OperationMode.OPERATION_MODE_PRODUCTION);
}
/**

19
common/src/main/java/com/yunbao/common/utils/RouteUtil.java
View File

@@ -31,6 +31,7 @@ public class RouteUtil {
public static final String PATH_LIVEREPORT = "/live/LiveReportActivity";
public static final String PATH_MYWEBVIEWACTIVTITY = "/main/MyWebViewActivity";
public static final String PATH_ZHUANGBANACTIVITY = "/main/ZhuangBanActivity";
public static final String PATH_COMPENSATE_ACTIVITY = "/live/CompensateActivity";
public static final String PATH_LiveZHUANGBANACTIVITY = "/live/ZhuangBanActivity";
public static final String PATH_FACEBOOKACTIVITY = "/baidu/FacebookLoginActivity";
public static final String PATH_MAIN = "/main/MainActivity";
@@ -46,6 +47,7 @@ public class RouteUtil {
public static final String PATH_RED_PACKET_INFO = "/main/RedPacketInfoActivity";
public static final String PATH_RED_PACKET_USER = "/main/RedPacketUsersActivity";
public static final String PATH_SELECT_AVATAR="/main/UserAvatarSelectActivity";
public static final String PATH_BattlePassActivity="/main/BattlePassActivity";
public static void forwardFansActivity(String uid) {
ARouter.getInstance().build(PATH_FANSACTIVITY)
@@ -128,6 +130,23 @@ public class RouteUtil {
.navigation();
}
/**
* 跳转到
*/
public static void forwardLiveCompensateActivity(Context context, String msgid, String banner, String title, String content, String time, String link, boolean receive) {
ARouter.getInstance().build(PATH_COMPENSATE_ACTIVITY)
.withString("msgid", msgid)
.withString("banner", banner)
.withString("title", title)
.withString("content", content)
.withString("time", time)
.withString("link", link)
.withBoolean("receive", receive)
.navigation();
}
/**
* 跳转到装扮
*/

2
common/src/main/res/values-en-rUS/string.xml
View File

@@ -1439,4 +1439,6 @@ Limited ride And limited avatar frame</string>
<string name="sys_msg_year">-</string>
<string name="sys_msg_month">-</string>
<string name="sys_msg_day"></string>
<string name="main_suspension_war_order">BattlePass</string>
</resources>

2
common/src/main/res/values-zh-rHK/strings.xml
View File

@@ -1438,4 +1438,6 @@
<string name="sys_msg_month">月</string>
<string name="sys_msg_day">日</string>
<string name="main_suspension_war_order">直播通行證</string>
</resources>

2
common/src/main/res/values-zh-rTW/strings.xml
View File

@@ -1437,4 +1437,6 @@
<string name="sys_msg_month">月</string>
<string name="sys_msg_day">日</string>
<string name="main_suspension_war_order">直播通行證</string>
</resources>

2
common/src/main/res/values-zh/strings.xml
View File

@@ -1434,4 +1434,6 @@
<string name="sys_msg_month">月</string>
<string name="sys_msg_day">日</string>
<string name="main_suspension_war_order">直播通行證</string>
</resources>

2
common/src/main/res/values/strings.xml
View File

@@ -1443,4 +1443,6 @@ Limited ride And limited avatar frame</string>
<string name="sys_msg_month">-</string>
<string name="sys_msg_day"></string>
<string name="main_suspension_war_order">BattlePass</string>
</resources>