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