|
|
e43fb5e479
|
Merge branch 'master' into dev_6.5.4_tmp
|
2023-08-04 16:13:14 +08:00 |
|
18401019693
|
545c69ff8b
|
6.5.4礼物冠名
|
2023-08-04 15:50:32 +08:00 |
|
|
|
bf8d88608d
|
Merge branch 'master' into dev_6.5.4_tmp
# 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/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
# common/src/main/res/values-en-rUS/string.xml
# 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
# live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
|
2023-08-04 15:41:11 +08:00 |
|
18401019693
|
fb1d6c0688
|
6.5.4礼物冠名
|
2023-08-04 14:58:26 +08:00 |
|
|
|
fe921e25bb
|
update 粉丝团
|
2023-08-04 14:25:49 +08:00 |
|
18401019693
|
d5ca010ec7
|
6.5.4礼物冠名
|
2023-08-04 13:57:36 +08:00 |
|
18401019693
|
04259472a1
|
Merge remote-tracking branch 'origin/dev_gift_6.5.4'
|
2023-08-04 10:19:18 +08:00 |
|
18401019693
|
4a7790d968
|
6.5.4礼物冠名
|
2023-08-04 10:11:03 +08:00 |
|
18401019693
|
49810407ce
|
6.5.4礼物冠名
|
2023-08-04 09:47:42 +08:00 |
|
18401019693
|
fa086dc5cb
|
6.5.4礼物冠名
|
2023-08-03 17:54:14 +08:00 |
|
18401019693
|
3f8d6ed4af
|
6.5.4礼物冠名
|
2023-08-03 16:08:43 +08:00 |
|
18401019693
|
986902886a
|
6.5.4礼物冠名
|
2023-08-03 14:29:04 +08:00 |
|
18401019693
|
8ed7595aec
|
6.5.4礼物冠名
|
2023-08-02 17:47:00 +08:00 |
|
18401019693
|
b78fef6adc
|
6.5.4礼物冠名
|
2023-08-02 16:55:36 +08:00 |
|
|
|
fae0d01dc2
|
update 粉丝团
|
2023-08-02 15:48:51 +08:00 |
|
|
|
9a8bc0505d
|
修复#248问题
|
2023-08-02 15:08:11 +08:00 |
|
|
|
e31fa0310c
|
修复#250问题
|
2023-08-02 14:43:20 +08:00 |
|
18401019693
|
5afa3bd30b
|
6.5.4礼物冠名
|
2023-08-02 13:23:37 +08:00 |
|
18401019693
|
54458bd0c0
|
6.5.4礼物冠名
|
2023-07-31 18:25:32 +08:00 |
|
|
|
c53b9a6064
|
update 粉丝团相关
|
2023-07-31 16:28:42 +08:00 |
|
18401019693
|
a353e51ba8
|
6.5.4礼物栏优化
|
2023-07-25 15:25:01 +08:00 |
|
18401019693
|
0646f245b6
|
6.5.4礼物栏优化
|
2023-07-25 14:08:52 +08:00 |
|
|
|
e32d450ca1
|
修复随机PK文案在英文模式下过长问题
|
2023-07-21 09:45:11 +08:00 |
|
|
|
736592b4e1
|
新增头像选择界面
|
2023-07-19 18:30:32 +08:00 |
|
|
|
3108c898c2
|
Merge branch 'dev_6.5.4_头像优化' into dev_6.5.4_联系方式
|
2023-07-19 15:35:48 +08:00 |
|
|
|
dd2f3db16a
|
新增头像选择界面
|
2023-07-19 15:35:30 +08:00 |
|
|
|
8af231e526
|
新增头像选择界面
|
2023-07-19 13:07:27 +08:00 |
|
|
|
4729f93515
|
新增获取联系方式的弹框新样式
|
2023-07-18 15:40:15 +08:00 |
|
18401019693
|
410fcb5895
|
修改json的版本号
|
2023-07-17 16:56:29 +08:00 |
|
18401019693
|
9b62ab6011
|
修改json的版本号
|
2023-07-17 16:42:51 +08:00 |
|
18401019693
|
62aa1d63df
|
修改json的版本号
|
2023-07-17 16:15:04 +08:00 |
|
|
|
9b01ae4d82
|
修改用户协议地址
|
2023-07-17 15:18:47 +08:00 |
|
|
|
16f23519b1
|
移除百度语言残留内容
|
2023-07-17 13:35:59 +08:00 |
|
|
|
9bfed0bc7b
|
移除腾讯地图残留配置和代码
|
2023-07-17 10:16:24 +08:00 |
|
18401019693
|
bc0ed26377
|
修复
|
2023-07-14 13:13:25 +08:00 |
|
18401019693
|
0d14ce5aee
|
修复
|
2023-07-14 11:14:10 +08:00 |
|
18142669586
|
4a7423a5b9
|
修改全服
|
2023-07-14 10:43:14 +08:00 |
|
18401019693
|
0a4425d705
|
修复
|
2023-07-14 10:18:50 +08:00 |
|
|
|
d4c2ef71cb
|
新增主播可导出日志功能
|
2023-07-13 10:39:33 +08:00 |
|
18401019693
|
7d7535935a
|
修复
|
2023-07-12 14:58:34 +08:00 |
|
18401019693
|
dd657e9918
|
修复
|
2023-07-12 13:50:00 +08:00 |
|
|
|
6cf68838f8
|
修改红包样式和文案
|
2023-07-11 17:25:51 +08:00 |
|
|
|
c3a08974d1
|
修改发红包样式
|
2023-07-11 14:14:33 +08:00 |
|
|
|
0a02b39c12
|
根据产品需求修改英文翻译
根据产品需求修改UI样式
|
2023-07-11 10:51:03 +08:00 |
|
18401019693
|
e786ae16c2
|
修复
|
2023-07-11 10:13:29 +08:00 |
|
18401019693
|
1d447b0a90
|
修复
|
2023-07-10 16:36:48 +08:00 |
|
18401019693
|
75e342975c
|
修复
|
2023-07-07 10:15:11 +08:00 |
|
18401019693
|
dd4172fc3d
|
修复
|
2023-07-07 09:51:29 +08:00 |
|
|
|
3e91068866
|
按测试反馈修改红包详情UI逻辑和新增礼物显示
|
2023-07-06 15:13:33 +08:00 |
|
|
|
6743ec3cf6
|
调整红包查看手气的UI
|
2023-07-06 10:02:04 +08:00 |
|
