Commit Graph

642 Commits

Author SHA1 Message Date
c1c8921f59 Merge branch 'dev_6.5.2'
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	common/src/main/res/values-en-rUS/string.xml
#	common/src/main/res/values-zh/strings.xml
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
2023-05-17 16:20:10 +08:00
82b3b23470 提交主播投票功能 2023-05-17 16:14:50 +08:00
df0f5f31e0 提交主播投票功能 2023-05-17 15:12:51 +08:00
18401019693
2a6af7c165 清晰度选择提示弹窗问题修复 2023-05-17 13:36:15 +08:00
18401019693
e4c48f948d 完善个人资料,修改getBaseInfos接口返回缓存问题 2023-05-13 17:30:19 +08:00
18401019693
96cbadac2c 完善个人资料,修改getBaseInfos接口返回缓存问题 2023-05-11 15:05:33 +08:00
18401019693
576d39461a 完善个人资料,离开修改页面提示弹窗,完成领取弹窗 2023-05-11 14:34:39 +08:00
18401019693
8410439a90 完善个人资料,选择性别弹窗构建 2023-05-11 10:26:05 +08:00
18401019693
73b075b2a7 完善个人资料,编辑页面调整,领取奖励页面构建 2023-05-10 15:30:36 +08:00
a6b5c102d2 新增【非贵族,守护,粉丝牌送礼交互优化】功能 2023-05-10 14:31:15 +08:00
18401019693
229c8e72cf 完善个人资料,我的页面修改,红点提示逻辑 2023-05-10 13:09:46 +08:00
18401019693
f99bef4ac8 完善个人资料, 2023-05-09 17:37:20 +08:00
18401019693
097528f97a 修改,中英文问题(默认加载系统语言) 2023-04-24 17:31:28 +08:00
18401019693
5a5164f72b 注销账号功能添加 2023-04-20 17:59:51 +08:00
18401019693
381ca84525 注销账号功能添加 2023-04-20 16:46:10 +08:00
79a709a76f update 开屏过度动画接口开关 2023-04-20 15:10:57 +08:00
18401019693
5dcdd3fc5f 多语言切换 2023-04-19 16:38:56 +08:00
59c19d996e Merge remote-tracking branch 'origin/master' 2023-04-19 14:08:07 +08:00
703bafa013 修复侧边栏UI在英文状态下显示不全的问题 2023-04-19 14:07:56 +08:00
18401019693
9e6e25fb9e 多语言切换 2023-04-19 14:02:45 +08:00
47c3282861 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	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
#	main/src/main/java/com/yunbao/main/views/MainHomeLiveViewHolder.java
2023-04-19 10:58:02 +08:00
181ff4274c 新增字号设置 2023-04-19 10:54:22 +08:00
18401019693
dc5633bcb9 多语言切换 2023-04-19 10:16:56 +08:00
18401019693
293c9dcf9e 多语言切换 2023-04-18 14:51:26 +08:00
18401019693
d0e2278df7 多语言切换 2023-04-18 13:45:21 +08:00
f913248fa1 暂存方案1 2023-04-18 11:03:07 +08:00
18401019693
098ef7aa36 多语言切换 2023-04-18 10:30:55 +08:00
18401019693
bfbbe54308 多语言切换 2023-04-17 16:30:12 +08:00
18401019693
32e3584fef 修改侧边栏跳转问题 2023-04-14 16:09:02 +08:00
18142669586
db8dc2a781 修改连麦样试 2023-04-13 15:57:11 +08:00
18401019693
06289b44d9 心愿单设置加限制 2023-04-13 13:08:58 +08:00
18142669586
9869a2376c 修改toat样试 2023-04-13 11:42:15 +08:00
af4176bcb7 移除ACache读取后最后一个换行符 2023-04-13 10:43:07 +08:00
58c988a83a 修复ACache读多行文本未换行问题 2023-04-12 13:15:33 +08:00
cfc72f7441 根据需求调整送过一次联系方式礼物后,以后点击联系方式都是直接打开信件详情 2023-04-11 14:37:39 +08:00
18401019693
b305ba925b 修改热度加成逻辑展示方式 2023-04-11 14:14:42 +08:00
18142669586
605f10d0ac 英文包 2023-04-10 15:37:19 +08:00
18142669586
f7480c6e43 修改中英文 2023-04-10 13:44:39 +08:00
18401019693
19c0c8c6e7 修改生成心愿单 2023-04-10 13:30:47 +08:00
18401019693
917d237b6d 关注消息修改 2023-04-10 10:45:07 +08:00
508f1a52ae 调整直播间UI 2023-04-10 10:22:32 +08:00
18142669586
9e7909ec70 Merge remote-tracking branch 'origin/master' 2023-04-08 17:29:36 +08:00
18142669586
8ae58e9c14 心愿单审核和贵族购买 2023-04-08 17:27:26 +08:00
18401019693
2ce527cee8 心愿单修改 2023-04-08 17:26:39 +08:00
18401019693
28ef982b74 心愿单修改 2023-04-08 16:42:43 +08:00
9707898af9 调整直播间UI
修复心愿单浮窗一堆问题
2023-04-08 15:45:47 +08:00
18401019693
9c3fbe0506 心愿单修改 2023-04-08 15:10:16 +08:00
18401019693
9d38ff7c8f 心愿单修改, 2023-04-07 15:28:19 +08:00
18401019693
3bf6518e25 心愿单修改, 2023-04-06 14:20:46 +08:00
18401019693
a5fd14cc0e 去除心愿单礼物贵族和守护的金额 2023-04-03 18:02:29 +08:00