|
|
43d1abbae0
|
Merge branch 'dev_6.6.4_战令'
# Conflicts:
# common/src/main/res/values-en-rUS/string.xml
# common/src/main/res/values-zh-rHK/strings.xml
# common/src/main/res/values-zh-rTW/strings.xml
# common/src/main/res/values-zh/strings.xml
# common/src/main/res/values/strings.xml
# config.gradle
|
2024-01-05 14:00:39 +08:00 |
|
|
|
4a5e581978
|
新增战令购买经验对话框经验条上加入经验文本
|
2024-01-05 13:57:55 +08:00 |
|
|
|
8a7b65955c
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2024-01-05 13:57:16 +08:00 |
|
18401019693
|
3445ee2a56
|
修改信件未读消息请求方式
|
2024-01-05 13:29:01 +08:00 |
|
|
|
cf2274195f
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2024-01-04 18:19:23 +08:00 |
|
18401019693
|
aad607ace8
|
删除老的用户等级主播等级的图标
|
2024-01-04 15:07:12 +08:00 |
|
|
|
17506f6cbf
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2024-01-04 10:36:22 +08:00 |
|
18401019693
|
418073f07e
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2024-01-04 10:35:51 +08:00 |
|
18401019693
|
319295de57
|
接口 改造
|
2024-01-04 10:35:42 +08:00 |
|
hch
|
dcf3f5c308
|
推送管理
|
2024-01-03 18:28:49 +08:00 |
|
|
|
30bdf83724
|
调整PK天梯赛信息更新由接口转为IM推送
|
2024-01-02 15:42:55 +08:00 |
|
|
|
fbb801bf62
|
调整战令接口
调整战令购买等级最大值
新增战令统计直播间发送消息接口
|
2023-12-26 18:24:46 +08:00 |
|
18401019693
|
44601c74b4
|
隐藏测试按钮
|
2023-12-23 16:39:58 +08:00 |
|
|
|
2808e41288
|
修复测试反馈问题
|
2023-12-23 14:14:32 +08:00 |
|
|
|
05aea2448f
|
修复测试反馈问题
|
2023-12-23 11:01:28 +08:00 |
|
|
|
34986d6897
|
修复测试反馈问题
|
2023-12-23 09:59:30 +08:00 |
|
|
|
924afce81e
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-22 14:32:33 +08:00 |
|
|
|
48dcfd4a04
|
新增战令系统
|
2023-12-22 14:32:18 +08:00 |
|
18401019693
|
163ab1c80d
|
隐藏测试按钮
|
2023-12-22 13:36:09 +08:00 |
|
|
|
e06f944def
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-22 10:08:35 +08:00 |
|
18401019693
|
a5d546d1d1
|
兑换奖励接口
|
2023-12-22 10:07:47 +08:00 |
|
|
|
1304ec6cde
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-21 16:26:04 +08:00 |
|
18401019693
|
f46d14ce28
|
购买经验
|
2023-12-21 15:24:43 +08:00 |
|
|
|
e2005582fe
|
修复活动弹窗重影问题
|
2023-12-21 10:22:36 +08:00 |
|
|
|
a56a5849fe
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 17:49:30 +08:00 |
|
18401019693
|
1495bfee99
|
兌換詳情弹窗
|
2023-12-20 17:37:18 +08:00 |
|
|
|
19eecd7022
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 17:16:31 +08:00 |
|
18401019693
|
d415efde35
|
战令等级添加参数
|
2023-12-20 16:36:13 +08:00 |
|
|
|
61ee585ae9
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 16:27:44 +08:00 |
|
18401019693
|
7b103aaf7c
|
添加开通接口弹窗回调添加
|
2023-12-20 16:27:22 +08:00 |
|
18401019693
|
9eba98f709
|
添加开通接口弹窗回调添加
|
2023-12-20 16:26:24 +08:00 |
|
|
|
dea3264577
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 16:17:37 +08:00 |
|
18401019693
|
42cfcce1dc
|
添加开通接口弹窗回调添加
|
2023-12-20 15:28:41 +08:00 |
|
hch
|
f697e650a8
|
更新
|
2023-12-19 18:29:48 +08:00 |
|
18401019693
|
ac78268a85
|
活动结束弹窗
|
2023-12-19 15:59:55 +08:00 |
|
hch
|
9d543f2211
|
Merge remote-tracking branch 'origin/master' into pdlive_samsung
# Conflicts:
# config.gradle
# main/src/main/java/com/yunbao/main/activity/GoogleFragment.java
|
2023-12-19 09:41:04 +08:00 |
|
|
|
d001712067
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-18 16:54:05 +08:00 |
|
18401019693
|
dc28a3d81e
|
zhanling dengji
|
2023-12-18 16:53:37 +08:00 |
|
|
|
728dec9d97
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-18 16:34:19 +08:00 |
|
18401019693
|
f65c698602
|
短剧 CookieManager cookieManager = CookieManager.getInstance(); if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
{
cookieManager.setAcceptThirdPartyCookies(mainWv, true);
} else{
cookieManager.setAcceptCookie(true);
}
|
2023-12-18 15:30:29 +08:00 |
|
18401019693
|
215a2f8927
|
战令等级
|
2023-12-18 15:18:42 +08:00 |
|
hch
|
a21352302b
|
三星内购调用
|
2023-12-15 18:29:12 +08:00 |
|
18401019693
|
0b3ebdfc30
|
整蛊修改
|
2023-12-15 17:17:18 +08:00 |
|
18401019693
|
f10657f89c
|
弹窗整合
|
2023-12-15 17:01:35 +08:00 |
|
18401019693
|
0dc1009661
|
观看时长问题修改
|
2023-12-15 15:16:09 +08:00 |
|
18401019693
|
302b789970
|
多人Pk问题
|
2023-12-15 14:03:42 +08:00 |
|
18401019693
|
bd9c8c2265
|
直播间退出接口时机修改，免费礼物的修改
|
2023-12-15 10:17:47 +08:00 |
|
|
|
58ace7d613
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-15 09:49:17 +08:00 |
|
hch
|
c723e14182
|
三星内购调用
|
2023-12-14 18:28:39 +08:00 |
|
18401019693
|
3982afb0d3
|
弹窗整合
|
2023-12-14 17:39:05 +08:00 |
|
