|
b7ba717cb9
|
Merge branch 'dev_6.5.5'
# Conflicts:
# 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-09-06 10:42:05 +08:00 |
|
18401019693
|
84d4423069
|
埋点配置
|
2023-09-05 14:25:50 +08:00 |
|
18401019693
|
0721ff4f37
|
Merge branch 'master_umeng'
# Conflicts:
# app/proguard-rules.pro
# common/src/main/res/values/strings.xml
# live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java
|
2023-09-05 14:18:42 +08:00 |
|
18401019693
|
82fd35305a
|
埋点配置
|
2023-09-05 13:24:21 +08:00 |
|
|
57bda40a82
|
调整中英文
调整开播频道接口
|
2023-09-02 11:16:01 +08:00 |
|
18401019693
|
1a58311e26
|
埋点配置
|
2023-08-28 16:52:19 +08:00 |
|
|
52f1a78e36
|
update 红包优化
|
2023-08-23 16:37:53 +08:00 |
|
|
b443fdd683
|
调整页面英文UI
|
2023-08-14 14:58:13 +08:00 |
|
18401019693
|
92ed82ea2a
|
6.5.4礼物冠名
|
2023-08-11 13:59:54 +08:00 |
|
18401019693
|
fea46aab1f
|
6.5.4礼物冠名
|
2023-08-09 17:05:51 +08:00 |
|
18401019693
|
24ed313f60
|
6.5.4礼物冠名
|
2023-08-09 14:15:03 +08:00 |
|
18401019693
|
bad2b3689a
|
6.5.4礼物冠名
|
2023-08-09 11:01:28 +08:00 |
|
18401019693
|
44b95cb1c6
|
6.5.4礼物冠名
|
2023-08-08 14:50:13 +08:00 |
|
18401019693
|
82ccd2d89c
|
6.5.4礼物冠名
|
2023-08-08 11:37:19 +08:00 |
|
18401019693
|
a78d5b4aba
|
6.5.4礼物冠名
|
2023-08-07 14:50:29 +08:00 |
|
18401019693
|
97ad28ba62
|
6.5.4礼物冠名
|
2023-08-07 13:36:59 +08:00 |
|
|
e7daabe588
|
Merge branch 'dev_6.5.4'
|
2023-08-05 16:53:13 +08:00 |
|
18401019693
|
dfeb1c246b
|
6.5.4礼物冠名
|
2023-08-05 15:22:49 +08:00 |
|
|
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
|
49810407ce
|
6.5.4礼物冠名
|
2023-08-04 09:47:42 +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
|
b78fef6adc
|
6.5.4礼物冠名
|
2023-08-02 16:55:36 +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 |
|
|
736592b4e1
|
新增头像选择界面
|
2023-07-19 18:30:32 +08:00 |
|
18401019693
|
7d7535935a
|
修复
|
2023-07-12 14:58:34 +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 |
|
18401019693
|
9081ba4cd6
|
添加翻译
|
2023-07-05 17:47:50 +08:00 |
|
18401019693
|
9089e96856
|
修复问题
|
2023-07-05 13:29:46 +08:00 |
|
18401019693
|
c139b03417
|
修复问题
|
2023-07-04 17:02:05 +08:00 |
|
18401019693
|
cbe91c84e9
|
红包全服通知
|
2023-07-04 16:02:45 +08:00 |
|
18401019693
|
08bc6d554a
|
Merge remote-tracking branch 'origin/dev_red_packet'
# 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/res/values/strings.xml
|
2023-07-03 17:57:35 +08:00 |
|
18401019693
|
58508ca0ae
|
红包中奖列表
|
2023-07-03 13:05:29 +08:00 |
|
18401019693
|
5736265388
|
展示红包,领取红包接口逻辑对接
|
2023-06-30 16:03:37 +08:00 |
|
18401019693
|
e68d20252a
|
创建接口,红包展示接口
|
2023-06-30 10:17:33 +08:00 |
|
18401019693
|
40455fffc9
|
红包打开创建领取的样式逻辑构建
|
2023-06-29 10:15:24 +08:00 |
|