Commit Graph

113 Commits

Author SHA1 Message Date
ac18150503 update 礼物墙 2024-07-16 11:15:12 +08:00
Martin
484069dac7 冠名礼物 2024-07-15 10:13:36 +08:00
9292e6f5c5 Merge remote-tracking branch 'origin/dev_680_礼物展馆' into dev_680_礼物展馆
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
2024-07-13 09:29:11 +08:00
845b217c4d 新增礼物墙相关内容 2024-07-13 09:28:02 +08:00
Martin
7edd75e223 礼物墙功能 2024-07-13 09:27:11 +08:00
8cae89e7cd 新增礼物墙弹窗主题 2024-07-04 13:41:37 +08:00
Martin
d5b60523a5 Merge remote-tracking branch 'origin/master' into dev_6.7.0
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/shayu/phonelive/AppContext.java
#	common/src/main/java/com/yunbao/common/CommonAppConfig.java
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/java/com/yunbao/common/manager/OpenAdManager.java
#	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
#	live/src/main/java/com/yunbao/live/utils/LiveTextRender.java
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
#	live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
2024-06-16 10:28:31 +08:00
Martin
f131fcf546 add[主播端,整蛊礼物,待完成项完成] 2024-06-12 16:44:46 +08:00
Martin
cbf517bed6 Merge branch 'master' into 声网升级
# Conflicts:
#	common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/java/com/yunbao/common/utils/DialogUitl.java
#	common/src/main/java/com/yunbao/common/utils/RouteUtil.java
#	live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
#	live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java
#	main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
2024-05-22 13:37:33 +08:00
Martin
93dbee14b3 add[声望升级-修复BUG] 2024-05-15 15:55:31 +08:00
d28d0dd3d7 修复测试反馈问题 2024-04-29 11:02:23 +08:00
hch
756cbb1ce1 add [首页新增短剧入口] 2024-04-07 10:05:40 +08:00
18401019693
de11b5123d ui修改 2024-03-26 15:03:08 +08:00
18401019693
f04a2865af 修改问题 2024-03-23 16:47:28 +08:00
18401019693
4fabf3aba3 修改测试问题 2024-03-20 13:40:30 +08:00
18401019693
859810f1f6 守护的全服通知,修改测试问题 2024-03-19 15:32:04 +08:00
18401019693
1981fb553a 神龙列表接口对接,神龙送财活动参加接口对接,ui更新 2024-03-14 16:39:04 +08:00
18401019693
50b6deaf01 對接開通接口神龍送財的im消息 2024-03-13 11:18:26 +08:00
hch
8af7f907eb 守护弹窗 2024-03-04 14:51:07 +08:00
hch
aa62dda844 短剧优化 2024-01-23 14:05:33 +08:00
hch
5b813aff88 修改UI 2024-01-17 11:12: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
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
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
hch
dcf3f5c308 推送管理 2024-01-03 18:28:49 +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
hch
f697e650a8 更新 2023-12-19 18:29:48 +08:00
18401019693
e25980cec8 開通精英戰令 2023-12-14 15:10:25 +08:00
18401019693
e353638ec1 開通精英戰令 2023-12-14 14:49:45 +08:00
18401019693
ecca9b7b8b 修改 测试问题 2023-12-12 10:51:30 +08:00
18401019693
3396ca63d0 修改 测试问题 2023-12-07 13:17:12 +08:00
18401019693
79c1c01003 修改 测试问题 2023-12-06 13:45:37 +08:00
18401019693
b4b1efe730 修改 测试问题 2023-12-05 09:27:47 +08:00
18401019693
f1645cf72c 修改 测试问题 2023-11-30 15:18:28 +08:00
18401019693
f772a64507 修改中英文刷新数据问题 2023-11-16 13:05:56 +08:00
18401019693
82c1d15ca5 修改测试问题 2023-11-14 16:05:43 +08:00
18401019693
eb5aebda51 修改bug 2023-11-11 14:17:16 +08:00
18401019693
68e6f5df1b 添加新接口扣款添加星币筛选 2023-11-10 17:49:59 +08:00
18401019693
e2ee742091 当用户设置语言为英语时,将会调整首页推送逻辑,【英语】标签将会提前到第一位并默认展示【英语】标签内容; 2023-11-09 18:07:21 +08:00
18401019693
54aa5fee67 游戏规则页面 2023-11-08 10:23:45 +08:00
18401019693
86d730cdf1 遊戲bug修復 2023-10-28 14:19:11 +08:00
18401019693
926de0463c 小遊戲修改 2023-10-24 15:46:47 +08:00
18401019693
e081f1e058 修改中英文 2023-10-12 14:26:10 +08:00
18401019693
7b62409bf1 中英文修改 2023-10-09 16:27:54 +08:00