|
|
54693c0d37
|
修复【升级战令未刷新钻石余额】的问题
|
2024-01-15 13:33:53 +08:00 |
|
18401019693
|
0b15df41b8
|
Merge remote-tracking branch 'origin/语音房_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
|
2024-01-15 10:03:00 +08:00 |
|
hch
|
7627219e77
|
新增首页战令入口
|
2024-01-12 15:33:16 +08:00 |
|
18401019693
|
cf749d85c6
|
语音房bug修改
|
2024-01-12 15:16:40 +08:00 |
|
hch
|
ac6eb21e06
|
Merge remote-tracking branch 'origin/master' into 6.6.4_推送管理
# Conflicts:
# common/src/main/java/com/yunbao/common/utils/RouteUtil.java
# 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-12 13:52:03 +08:00 |
|
18401019693
|
5ca13b770c
|
语音房bug修改
|
2024-01-12 09:34:29 +08:00 |
|
18401019693
|
a036e5eff6
|
语音房接口添加
|
2024-01-11 15:15:21 +08:00 |
|
|
|
c6fb323c68
|
update
|
2024-01-11 13:23:20 +08:00 |
|
18401019693
|
926a1a3cb6
|
语音房添加
|
2024-01-10 15:48:10 +08:00 |
|
|
|
1759757176
|
调整客服页面返回键交给h5处理（含系统按键/手势）
统一客服页面为同一个WebView
调整短剧与社区使用原生分开加载
调整送礼-包裹接口为新接口
调整粉丝团礼物送礼为新接口
修复战令-兑换-列表页面在名字过长晴空下高度不统一
|
2024-01-09 16:37:43 +08:00 |
|
hch
|
661c2fd334
|
推送管理
|
2024-01-09 14:52:27 +08:00 |
|
|
|
0a6b210a76
|
修复合并重复问题
|
2024-01-05 14:09:08 +08:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
48dcfd4a04
|
新增战令系统
|
2023-12-22 14:32:18 +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
|
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
|
215a2f8927
|
战令等级
|
2023-12-18 15:18:42 +08:00 |
|
hch
|
a21352302b
|
三星内购调用
|
2023-12-15 18:29:12 +08:00 |
|
18401019693
|
0dc1009661
|
观看时长问题修改
|
2023-12-15 15:16:09 +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
|
280920d5f0
|
弹窗整合
|
2023-12-14 17:28:49 +08:00 |
|
18401019693
|
e25980cec8
|
開通精英戰令
|
2023-12-14 15:10:25 +08:00 |
|
18401019693
|
e353638ec1
|
開通精英戰令
|
2023-12-14 14:49:45 +08:00 |
|
18401019693
|
65a3a64d7d
|
战令规则页面弹窗
|
2023-12-14 10:52:44 +08:00 |
|
|
|
b10312118b
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-12 17:59:09 +08:00 |
|
18401019693
|
419b5d08b4
|
升級精英/尊享戰令弹窗
|
2023-12-12 17:43:12 +08:00 |
|
18401019693
|
b146f93029
|
添加弹窗，弹窗通用背景
|
2023-12-12 16:59:33 +08:00 |
|
18401019693
|
ef34a6cf4f
|
添加弹窗，弹窗通用背景
|
2023-12-12 16:36:31 +08:00 |
|
18401019693
|
8dbc0dad7a
|
修改 测试问题
|
2023-12-12 14:39:07 +08:00 |
|
|
|
cdf3c4e411
|
调整弹窗显示
|
2023-12-12 13:51:02 +08:00 |
|
18401019693
|
446dc271d6
|
Merge remote-tracking branch 'origin/master'
|
2023-12-12 10:51:41 +08:00 |
|
18401019693
|
ecca9b7b8b
|
修改 测试问题
|
2023-12-12 10:51:30 +08:00 |
|
hch
|
331b55a5ab
|
修复跳转到华为商店问题
|
2023-12-08 15:32:18 +08:00 |
|
hch
|
f8ac4617ed
|
新增判断 判断是否有google服务
|
2023-12-08 14:17:36 +08:00 |
|
|
|
53e6cb5a70
|
新增首页弹窗更多条件控制
|
2023-12-07 18:01:48 +08:00 |
|
hch
|
ad79190a61
|
三星内购
|
2023-12-07 17:46:22 +08:00 |
|
18401019693
|
32d0fe497d
|
修改 测试问题
|
2023-12-07 16:29:28 +08:00 |
|
|
|
6df819f3b1
|
Merge remote-tracking branch 'origin/master'
|
2023-12-07 13:20:24 +08:00 |
|
|
|
39fbe90e8b
|
Merge branch 'dev_6.6.3'
|
2023-12-07 13:19:53 +08:00 |
|
18401019693
|
3396ca63d0
|
修改 测试问题
|
2023-12-07 13:17:12 +08:00 |
|
|
|
8c5ae3b61a
|
新增首页弹窗更多条件控制
|
2023-12-07 13:04:41 +08:00 |
|
18401019693
|
484891cfe7
|
修改 测试问题
|
2023-12-06 17:13:14 +08:00 |
|
18401019693
|
5c00e065d2
|
Merge remote-tracking branch 'origin/dev_6.6.3'
# Conflicts:
# common/src/main/java/com/yunbao/common/bean/IMLoginModel.java
# config.gradle
|
2023-12-06 15:20:39 +08:00 |
|
18401019693
|
2857bb09a2
|
修改 测试问题
|
2023-12-06 15:18:42 +08:00 |
|
18401019693
|
79c1c01003
|
修改 测试问题
|
2023-12-06 13:45:37 +08:00 |
|
|
|
a2864187ed
|
update
|
2023-12-06 13:42:10 +08:00 |
|
|
|
ef76b2c7e4
|
修复主页classtab可能为空导致的闪退问题（报错平台反馈）
|
2023-12-06 13:17:13 +08:00 |
|
18401019693
|
05e7c4ffdd
|
修改 测试问题
|
2023-12-05 18:28:53 +08:00 |
|
18401019693
|
b4b1efe730
|
修改 测试问题
|
2023-12-05 09:27:47 +08:00 |
|
hch
|
b35d5d242e
|
修复支付弹窗问题
|
2023-12-01 13:33:49 +08:00 |
|
hch
|
9dba41c22f
|
修复支付问题
|
2023-11-30 16:15:23 +08:00 |
|
18401019693
|
f1645cf72c
|
修改 测试问题
|
2023-11-30 15:18:28 +08:00 |
|
18401019693
|
cd35b9e40f
|
短剧
|
2023-11-30 14:37:16 +08:00 |
|
18401019693
|
33bce43737
|
短剧
|
2023-11-30 14:34:45 +08:00 |
|
18401019693
|
1f8025599b
|
小礼物逻辑上传
|
2023-11-30 10:45:45 +08:00 |
|
hch
|
7c44f09803
|
修复支付问题
|
2023-11-29 18:26:59 +08:00 |
|
hch
|
0b89ac21e8
|
lib_google
lib_huawei
|
2023-11-28 18:28:47 +08:00 |
|
hch
|
238181deca
|
lib_google
lib_huawei
|
2023-11-27 17:12:27 +08:00 |
|
18401019693
|
71a7b47d42
|
修改语音连麦的逻辑
|
2023-11-27 17:00:30 +08:00 |
|
18401019693
|
59446d2518
|
小礼物逻辑第4次上传
|
2023-11-27 15:40:10 +08:00 |
|
18401019693
|
8a8a7a8326
|
小礼物逻辑第san次上传
|
2023-11-27 10:38:20 +08:00 |
|
18401019693
|
089b1881f1
|
小礼物逻辑第er次上传
|
2023-11-25 13:54:31 +08:00 |
|
18401019693
|
7b1f3ddd79
|
小礼物逻辑第一次上传
|
2023-11-24 13:41:21 +08:00 |
|
18401019693
|
f772a64507
|
修改中英文刷新数据问题
|
2023-11-16 13:05:56 +08:00 |
|
18401019693
|
8c75317ddc
|
修改测试问题
|
2023-11-15 14:27:56 +08:00 |
|
18401019693
|
256c19a09e
|
修改测试问题
|
2023-11-14 18:13:14 +08:00 |
|
18401019693
|
82c1d15ca5
|
修改测试问题
|
2023-11-14 16:05:43 +08:00 |
|
18401019693
|
04b1764f7b
|
修改测试问题
|
2023-11-13 15:57:24 +08:00 |
|
18401019693
|
076f7130c8
|
修改测试问题
|
2023-11-13 14:24:07 +08:00 |
|
