|
|
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 |
|
18401019693
|
3c7a2d3964
|
心愿单增加礼物金额
|
2023-04-03 17:57:47 +08:00 |
|
18401019693
|
325d7254f0
|
视图资源文件修改，心愿单上传数据修改
|
2023-04-03 15:39:12 +08:00 |
|
18401019693
|
153d5ff159
|
修改心愿单生成
|
2023-04-03 15:29:21 +08:00 |
|
|
|
73c8db8fb4
|
新增通过后端获取国家地区信息接口
调整送联系方式礼物时，不选择其他礼物
调整联系方式礼物接口
调整在模拟器超大分辨率模式下，信箱ui异常问题
|
2023-04-03 13:28:35 +08:00 |
|
|
|
ed46eb30a8
|
更新功能翻译资源
|
2023-04-02 17:22:05 +08:00 |
|
18401019693
|
329bd63229
|
新增功能翻译资源
|
2023-04-02 16:31:11 +08:00 |
|
18401019693
|
d320373b07
|
侧边栏修改，新增播放设置
|
2023-04-02 14:22:30 +08:00 |
|
|
|
326bb5ae7f
|
修复PK倒计时偶尔会提前结束问题（设置倒计时默认值为100解决）
修复PK【开始/结束】不会【隐藏/显示】女神说和联系方式浮窗
|
2023-04-01 18:29:12 +08:00 |
|
18401019693
|
95c39cca9d
|
心愿单直播间轮播入口(没有设置就隐藏)
|
2023-04-01 15:51:52 +08:00 |
|
18401019693
|
849677e50e
|
心愿单直播间轮播入口
|
2023-04-01 14:45:48 +08:00 |
|
|
|
5657d5a00b
|
修正侧边栏【分享】按钮的文字
|
2023-04-01 11:22:51 +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 |
|
|
|
48f1d42739
|
Merge branch 'dev_use_discounts'
# Conflicts:
# common/src/main/res/values/strings.xml
|
2023-03-31 17:27:24 +08:00 |
|
|
|
9eed92302d
|
add 购买守护使用优惠卷
|
2023-03-31 17:26:28 +08:00 |
|
18401019693
|
f12f6a9130
|
心愿单完成
|
2023-03-31 16:44:22 +08:00 |
|
|
|
ef757a8adc
|
update 分享支持社区分享按钮
|
2023-03-31 15:09:18 +08:00 |
|
|
|
0177a1314d
|
update 购买守护优惠卷
|
2023-03-31 14:40:43 +08:00 |
|
|
|
26cb58463a
|
update 直播間分享
|
2023-03-31 13:34:57 +08:00 |
|
18401019693
|
d1d8054c01
|
心愿单的重置提示
|
2023-03-30 17:43:42 +08:00 |
|
18401019693
|
2db89365bb
|
季心愿单的设置与展示
|
2023-03-30 16:46:02 +08:00 |
|
18401019693
|
87ba382e81
|
月心愿单的设置与展示
|
2023-03-30 16:36:53 +08:00 |
|
18401019693
|
55290a71aa
|
周心愿单的设置与展示
|
2023-03-30 16:28:06 +08:00 |
|
18401019693
|
5095de3c43
|
日心愿单重置
|
2023-03-30 16:17:25 +08:00 |
|
18401019693
|
70a91fedf3
|
心愿单添加部分功能实现
|
2023-03-30 14:16:50 +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 |
|
|
|
c78bb79633
|
update 联系方式
update 女神说
|
2023-03-29 13:32:15 +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 |
|
|
|
2b56eff39a
|
update 联系方式
|
2023-03-27 16:16:23 +08:00 |
|
18401019693
|
86c5334ab4
|
高等级入场提示
|
2023-03-27 14:22:29 +08:00 |
|
|
|
6ef8c3778b
|
update 女神说
|
2023-03-27 11:09:03 +08:00 |
|
|
|
0c6eac2936
|
新增设置联系方式相关UI
|
2023-03-24 10:52:44 +08:00 |
|
18401019693
|
d80bc3bd27
|
默认气泡的修改
|
2023-03-23 17:28:34 +08:00 |
|
|
|
f4d23c57df
|
新增女神说相关UI
|
2023-03-23 14:26:52 +08:00 |
|
18401019693
|
1da79d6f48
|
礼物界面，直播间下部按钮布局样式的更改
|
2023-03-22 18:16:40 +08:00 |
|
18401019693
|
554bfa137a
|
消息气泡位置，关注消息默认消息，样式更改
|
2023-03-22 16:55:51 +08:00 |
|
|
|
c9e53b4dfd
|
Merge branch 'master' into dev_share
# Conflicts:
# app/src/main/java/com/shayu/phonelive/NeverCrashUtils.java
# config.gradle
# main/src/main/java/com/yunbao/main/activity/TestActivity.java
|
2023-03-21 15:00:53 +08:00 |
|
18401019693
|
420118b652
|
修改界面的中英文
|
2023-03-17 15:12:18 +08:00 |
|
18401019693
|
8455d1253c
|
修改界面的中英文
|
2023-03-17 10:19:35 +08:00 |
|
|
|
07f8f46f1f
|
修复：部分用户无法上麦问题
优化：日志上报逻辑
|
2023-03-17 09:50:26 +08:00 |
|
18401019693
|
db834caf00
|
Merge branch 'net_error'
|
2023-03-15 18:11:49 +08:00 |
|
18401019693
|
077cc7fd80
|
修改网络报错提示
|
2023-03-10 16:00:06 +08:00 |
|
|
|
92c38dc0dc
|
Merge remote-tracking branch 'origin/master'
|
2023-03-10 11:24:10 +08:00 |
|
18401019693
|
342b2e9139
|
多人PK问题修复
|
2023-03-10 11:05:19 +08:00 |
|
|
|
88ea48b6ca
|
新增debug日志控制，方便调出日志用于分析问题
|
2023-03-09 10:26:10 +08:00 |
|
|
|
a89c441555
|
修复密码登录界面按物理返回按钮时会回到桌面的问题
|
2023-03-04 13:56:50 +08:00 |
|
18142669586
|
d7d24904bf
|
單人PK卡0分 優化計算中
|
2023-02-28 16:54:20 +08:00 |
|
18142669586
|
abbc2fc4ee
|
單人PK卡0分 優化計算中
|
2023-02-28 16:46:52 +08:00 |
|
|
|
07f0f39978
|
Merge remote-tracking branch 'origin/master'
|
2023-02-28 15:50:33 +08:00 |
|
|
|
8d932a09e1
|
修复与苹果端PK结束后，对方头像依旧存在的问题
|
2023-02-28 15:50:20 +08:00 |
|
18401019693
|
34c855fc8f
|
di ban ben
|
2023-02-28 15:19:22 +08:00 |
|
18401019693
|
824d431a63
|
添加主播消息空页面
|
2023-02-28 13:06:48 +08:00 |
|
18401019693
|
16ba71493e
|
Android7及7以下默认关闭动画特效
|
2023-02-27 18:14:44 +08:00 |
|
18401019693
|
ea9807dcdc
|
主播协议，
|
2023-02-24 14:22:49 +08:00 |
|
|
|
bf4710470f
|
直播数据对接接口
|
2023-02-21 16:29:50 +08:00 |
|
|
|
5d2a246916
|
直播任务对接接口
|
2023-02-21 13:46:08 +08:00 |
|
|
|
cca8f43f61
|
直播任务对接接口
|
2023-02-20 17:16:37 +08:00 |
|
18401019693
|
1d66a9b7fb
|
主播用户协议
|
2023-02-20 16:43:36 +08:00 |
|
18401019693
|
c1c4a7a38b
|
添加直播任务和直播数据入口
|
2023-02-18 15:01:16 +08:00 |
|
18401019693
|
b8a91a85e4
|
Merge remote-tracking branch 'origin/dev_6.4.9' into live_anchor_6.4.8
|
2023-02-18 14:34:48 +08:00 |
|
18401019693
|
7cb7258210
|
直播计时功能添加
|
2023-02-18 13:57:37 +08:00 |
|
18401019693
|
8d823f7a07
|
主播消息中心功能构建
|
2023-02-18 13:21:59 +08:00 |
|
|
|
b2f779f58a
|
新增主播数据弹窗
|
2023-02-18 11:03:49 +08:00 |
|
|
|
79ded6bff4
|
新增主播任务对话框模块
|
2023-02-17 17:14:01 +08:00 |
|
18401019693
|
d86e16c9f5
|
修改注册页面选择国家区号功能，添加国家名称
|
2023-02-15 15:57:53 +08:00 |
|
|
|
4d86317ec8
|
修复发生闪退时会回到社区且连不上IM的问题
|
2023-02-14 14:42:58 +08:00 |
|
|
|
15b232f52a
|
update Share
|
2023-02-09 10:04:13 +08:00 |
|
|
|
ce8088059a
|
暂存测试几个用intent打开分享的平台
|
2023-02-07 15:45:42 +08:00 |
|
18401019693
|
cd0067d77b
|
修改多人PK结束PK送礼仍然展示PK结束画面问题
|
2023-02-07 14:19:10 +08:00 |
|
|
|
d14939c893
|
create ShareUtil
|
2023-02-06 15:57:56 +08:00 |
|
