|
|
e301e7bfce
|
Merge branch 'dev_share'
# Conflicts:
# main/src/main/java/com/yunbao/main/views/MainHomeViewHolder.java
|
2023-04-01 11:15:18 +08:00 |
|
|
|
97ad5c2d92
|
update 调整女神说布局大小
|
2023-04-01 11:14:24 +08:00 |
|
|
|
43e7713f6b
|
update 兼容女神说接口变动
|
2023-04-01 09:51:26 +08:00 |
|
18401019693
|
b2f35fdc16
|
修复豪气榜神秘人问题
|
2023-03-31 17:52:00 +08:00 |
|
|
|
87afe9297d
|
移除调试内容
|
2023-03-31 17:32:52 +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 |
|
|
|
ce2048b9a5
|
update 女神说主播端显示
update 联系方式改成svga
update PK时隐藏女神说和联系方式
|
2023-03-30 11:23:11 +08:00 |
|
|
|
c22da60b82
|
update 联系方式
|
2023-03-29 13:39:09 +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
|
9472ccf6c8
|
修改整蛊界面
|
2023-03-27 16:00:23 +08:00 |
|
18401019693
|
59d384a81c
|
修改右下角任务浮标，星级挑战修改
|
2023-03-27 15:30:30 +08:00 |
|
18401019693
|
c02f24fdcd
|
修改礼物图标
|
2023-03-27 15:29:43 +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
|
62e2b93bd5
|
修改特权页面背景
|
2023-03-23 17:43:44 +08:00 |
|
18401019693
|
d80bc3bd27
|
默认气泡的修改
|
2023-03-23 17:28:34 +08:00 |
|
18401019693
|
085f19c3ca
|
修改直播间聊天界面（横竖屏聊天框高度，关注消息修改）直播间头部布局样式修改
|
2023-03-23 16:36:16 +08:00 |
|
|
|
f4d23c57df
|
新增女神说相关UI
|
2023-03-23 14:26:52 +08:00 |
|
18401019693
|
95429402c7
|
修改礼物界面样式
|
2023-03-22 18:20:34 +08:00 |
|
18401019693
|
1da79d6f48
|
礼物界面，直播间下部按钮布局样式的更改
|
2023-03-22 18:16:40 +08:00 |
|
18401019693
|
926bd1a22e
|
直播间聊天内容等级样式更改
|
2023-03-22 16:57:50 +08:00 |
|
18401019693
|
554bfa137a
|
消息气泡位置，关注消息默认消息，样式更改
|
2023-03-22 16:55:51 +08:00 |
|
|
|
9e5a61f66c
|
update
|
2023-03-21 18:20:11 +08:00 |
|
18401019693
|
be608fd90b
|
修改直播间聊天字体背景样式
|
2023-03-21 17:42:34 +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 |
|
|
|
c2aba5da4b
|
优化：调整直播间聊天输入框点击发送后不隐藏软键盘和聊天框
|
2023-03-21 10:05:02 +08:00 |
|
18401019693
|
420118b652
|
修改界面的中英文
|
2023-03-17 15:12:18 +08:00 |
|
18401019693
|
076008ce89
|
修改界面的中英文
|
2023-03-17 14:52:55 +08:00 |
|
18401019693
|
8455d1253c
|
修改界面的中英文
|
2023-03-17 10:19:35 +08:00 |
|
|
|
07f8f46f1f
|
修复：部分用户无法上麦问题
优化：日志上报逻辑
|
2023-03-17 09:50:26 +08:00 |
|
18401019693
|
8b46c57482
|
修复推特登录问题
|
2023-03-15 18:12:01 +08:00 |
|
18401019693
|
db834caf00
|
Merge branch 'net_error'
|
2023-03-15 18:11:49 +08:00 |
|
|
|
5c1eef1419
|
移除一个toast
|
2023-03-15 18:11:07 +08:00 |
|
|
|
fe29d307a9
|
修复连麦时可能出现50007问题，出现该错误时尝试离开房间后重试加入
|
2023-03-15 15:49:56 +08:00 |
|
