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 |
|
