Commit Graph

407 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
18401019693
8611817a6a 修改礼物界面的切换逻辑 2023-05-17 13:26:15 +08:00
46e37b14e4 修复从【我的】-【獎勵中心】進去无法唤起邀请对话框的问题 2023-05-13 15:35:08 +08:00
18401019693
f8356b1283 完善个人资料,修改getBaseInfos接口返回缓存问题 2023-05-11 14:57:36 +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
18401019693
229c8e72cf 完善个人资料,我的页面修改,红点提示逻辑 2023-05-10 13:09:46 +08:00
18401019693
f99bef4ac8 完善个人资料, 2023-05-09 17:37:20 +08:00
f0ddd98942 fix修复line支付无法唤起app的问题 2023-05-08 14:04:43 +08:00
611f1da9b8 fix banner顺序不对的问题 2023-04-25 16:45:01 +08:00
5a9535e81d update 调整登录页登录按钮的位置 2023-04-25 10:00:57 +08:00
18401019693
381ca84525 注销账号功能添加 2023-04-20 16:46:10 +08:00
18401019693
5dcdd3fc5f 多语言切换 2023-04-19 16:38:56 +08:00
840129651d update 2023-04-19 14:13:11 +08:00
18401019693
9e6e25fb9e 多语言切换 2023-04-19 14:02:45 +08:00
bddf8c71ae 移除调试代码 2023-04-19 13:55:18 +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
18401019693
dc5633bcb9 多语言切换 2023-04-19 10:16:56 +08:00
369f3f2cae 开屏图片转Banner特效 2023-04-18 16:31:31 +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
18142669586
db8dc2a781 修改连麦样试 2023-04-13 15:57:11 +08:00
18142669586
9869a2376c 修改toat样试 2023-04-13 11:42:15 +08:00
bec764a329 修复从直播间个人中心进去的分享按钮没反应问题 2023-04-12 15:26:57 +08:00
33034ce4d6 调整心愿单浮标大小
修复注册默认值没香港标识
调整小助手图片位置
2023-04-07 15:37:51 +08:00
18142669586
1c198a44cf 页面修改 2023-04-06 13:31:52 +08:00
18401019693
153d5ff159 修改心愿单生成 2023-04-03 15:29:21 +08:00
a86cf97d74 Merge remote-tracking branch 'origin/master' 2023-04-03 15:16:51 +08:00
192587f758 新增通过后端获取国家地区信息接口在注册时自动填写号码编号 2023-04-03 15:15:50 +08:00
18142669586
1fa1874241 分享邀请码注册绑定 2023-04-03 15:07:48 +08:00
73c8db8fb4 新增通过后端获取国家地区信息接口
调整送联系方式礼物时,不选择其他礼物
调整联系方式礼物接口
调整在模拟器超大分辨率模式下,信箱ui异常问题
2023-04-03 13:28:35 +08:00
18401019693
849677e50e 心愿单直播间轮播入口 2023-04-01 14:45:48 +08:00
4b6b477351 Merge remote-tracking branch 'origin/master' 2023-04-01 11:18:17 +08:00
d035018ada 移除调试代码 2023-04-01 11:18:04 +08:00
e301e7bfce Merge branch 'dev_share'
# Conflicts:
#	main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
2023-04-01 11:15:18 +08:00
18142669586
cfce501d45 分享邀请码注册绑定 2023-04-01 09:44:13 +08:00
18401019693
b2f35fdc16 修复豪气榜神秘人问题 2023-03-31 17:52:00 +08:00
87afe9297d 移除调试内容 2023-03-31 17:32:52 +08:00
ef757a8adc update 分享支持社区分享按钮 2023-03-31 15:09:18 +08:00
26cb58463a update 直播間分享 2023-03-31 13:34:57 +08:00
ef8f87d100 Merge branch 'master' into dev_share 2023-03-30 11:47:44 +08:00
6d83c6f8ae Merge branch 'dev_6.5.0_anchor_call_me'
# Conflicts:
#	common/src/main/java/com/yunbao/common/manager/IMLoginManager.java
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
2023-03-30 11:31:32 +08:00
3a980d22fd Merge branch 'dev_6.5.0_anchor_say' into dev_6.5.0_anchor_call_me
# Conflicts:
#	common/src/main/java/com/yunbao/common/http/PDLiveApi.java
#	common/src/main/java/com/yunbao/common/http/live/LiveNetManager.java
#	main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
2023-03-28 11:01:58 +08:00
6ef8c3778b update 女神说 2023-03-27 11:09:03 +08:00
0c6eac2936 新增设置联系方式相关UI 2023-03-24 10:52:44 +08:00
f4d23c57df 新增女神说相关UI 2023-03-23 14:26:52 +08:00