|
|
3d4ad99c99
|
Merge branch 'refs/heads/master' into v681小游戏
# Conflicts:
# live/src/main/java/com/yunbao/live/activity/SystemMessageActivity.java
# main/src/main/java/com/yunbao/main/activity/MainActivity.java
|
2024-08-16 14:36:44 +08:00 |
|
|
|
3aeabfa32b
|
修改更新版本：1、改成以服务形式下载。2、新增断点续传功能。3、新增下载后检查apk完整性。
修改主播设置联系方式接口地址
|
2024-08-16 14:22:58 +08:00 |
|
|
|
47da21351e
|
update 版本
|
2024-08-15 17:31:39 +08:00 |
|
|
|
d1512bc256
|
调整三星包
|
2024-07-31 13:45:41 +08:00 |
|
|
|
9ae6fedd8d
|
修复测试反馈内容
新增临时需求：banner点进礼物墙
新增临时需求：主播下播后显示违规内容(未接入接口）
合并潘多拉修复问题
|
2024-07-30 10:29:34 +08:00 |
|
|
|
c20a9804e9
|
修复测试反馈内容
|
2024-07-25 15:00:05 +08:00 |
|
Martin
|
152848a04f
|
Merge branch 'master' into dev_680_礼物展馆
# Conflicts:
# 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
# gradle.properties
# live/build.gradle
|
2024-07-17 09:53:22 +08:00 |
|
18142669586
|
4618c0a4f1
|
升级34 grd8.0
|
2024-07-13 10:37:37 +08:00 |
|
Martin
|
7edd75e223
|
礼物墙功能
|
2024-07-13 09:27:11 +08:00 |
|
|
|
e0669e98cf
|
新增上报日志功能
|
2024-06-29 10:11:42 +08:00 |
|
|
|
f1a1aae787
|
优化打包脚本，兼容低版本AndroidStudio使用
|
2024-06-27 14:28:33 +08:00 |
|
|
|
0451f518d5
|
移除调试权限
|
2024-06-20 14:02:42 +08:00 |
|
|
|
a154f480f6
|
增强配置化打包程序，可有效防止手动打包配置错误
|
2024-06-20 14:02:15 +08:00 |
|
Martin
|
d5b60523a5
|
Merge remote-tracking branch 'origin/master' into dev_6.7.0
# Conflicts:
# app/src/main/AndroidManifest.xml
# app/src/main/java/com/shayu/phonelive/AppContext.java
# common/src/main/java/com/yunbao/common/CommonAppConfig.java
# 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/manager/OpenAdManager.java
# 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/utils/LiveTextRender.java
# live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java
# live/src/main/java/com/yunbao/live/views/LiveRyAnchorViewHolder.java
|
2024-06-16 10:28:31 +08:00 |
|
|
|
73847c46a3
|
修复游戏房发言重复/不显示问题
修复贵族不显示英文问题
|
2024-06-07 14:50:39 +08:00 |
|
|
|
c91947ce71
|
配置化声网AppId
|
2024-06-05 16:37:24 +08:00 |
|
Martin
|
5baea0f156
|
fix[修复-游戏房消息问题]
|
2024-06-05 15:12:35 +08:00 |
|
Martin
|
419e3a7ab5
|
fix[修复BUG]
|
2024-06-05 13:27:22 +08:00 |
|
Martin
|
6132338c6c
|
fix[声望升级-同步弹窗功能]
|
2024-06-01 14:33:27 +08:00 |
|
|
|
949c0ab759
|
调整弹窗、签到弹窗、更新弹窗优先级
|
2024-05-31 10:31:14 +08:00 |
|
Martin
|
ff8e75768e
|
fix[声望升级-修复BUG]
|
2024-05-28 17:12:52 +08:00 |
|
|
|
c92e8dd8bc
|
调整弹窗逻辑
|
2024-05-28 17:12:38 +08:00 |
|
|
|
8d5990c25b
|
调整弹窗逻辑
|
2024-05-28 15:02:15 +08:00 |
|
Martin
|
cbf517bed6
|
Merge branch 'master' into 声网升级
# Conflicts:
# common/src/main/java/com/yunbao/common/event/SendBlindGiftEvent.java
# 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/DialogUitl.java
# common/src/main/java/com/yunbao/common/utils/RouteUtil.java
# live/src/main/java/com/yunbao/live/event/LiveAudienceEvent.java
# live/src/main/java/com/yunbao/live/socket/SocketRyLinkMicPkUtil.java
# main/src/main/java/com/yunbao/main/dialog/MainStartDialogFragment.java
|
2024-05-22 13:37:33 +08:00 |
|
Martin
|
dc0ae1124f
|
add[声望升级-游戏房判断声网或者融云]
|
2024-05-22 13:32:05 +08:00 |
|
Martin
|
3167ab0be8
|
add[声望升级-游戏房判断声网或者融云]
|
2024-05-20 16:18:16 +08:00 |
|
Martin
|
0b218157d2
|
add[声望升级-AB面]
|
2024-05-18 18:27:38 +08:00 |
|
Martin
|
6a4ac35203
|
add[声望升级-AB面]
|
2024-05-18 14:36:35 +08:00 |
|
|
|
e24805cf9b
|
移除友盟SDK
|
2024-05-08 11:34:56 +08:00 |
|
|
|
86bbf6a7f3
|
更新小游戏混淆列表
|
2024-05-08 10:49:07 +08:00 |
|
Martin
|
95ded2f77c
|
add[声望升级-多人PK]
|
2024-05-08 10:00:00 +08:00 |
|
|
|
599e88acc6
|
替换友盟为本地aar
调整小游戏为繁体中文
|
2024-05-08 09:52:35 +08:00 |
|
|
|
651fe12edd
|
新增小助手中英文图标判定
新增消息页图标中英文判定
|
2024-04-26 14:47:58 +08:00 |
|
Martin
|
583740e866
|
add[声望升级-接入美颜]
|
2024-04-18 09:47:38 +08:00 |
|
Martin
|
5922f4c08b
|
add[声望升级]
|
2024-04-10 18:31:00 +08:00 |
|
hch
|
08e009e5f9
|
修复bug上报问题
|
2024-02-16 10:34:10 +08:00 |
|
hch
|
6ff6cbbe6b
|
Merge branch 'master' into pdlive_samsung
# Conflicts:
# config.gradle
# live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java
|
2024-01-18 14:56:27 +08:00 |
|
hch
|
65d38de73c
|
修复 点击去支付无反应 问题
|
2024-01-18 14:48:49 +08:00 |
|
18401019693
|
926a1a3cb6
|
语音房添加
|
2024-01-10 15:48:10 +08:00 |
|
|
|
43d1abbae0
|
Merge branch 'dev_6.6.4_战令'
# 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
# config.gradle
|
2024-01-05 14:00:39 +08:00 |
|
|
|
34986d6897
|
修复测试反馈问题
|
2023-12-23 09:59:30 +08:00 |
|
hch
|
f697e650a8
|
更新
|
2023-12-19 18:29:48 +08:00 |
|
hch
|
7c44f09803
|
修复支付问题
|
2023-11-29 18:26:59 +08:00 |
|
hch
|
0b89ac21e8
|
lib_google
lib_huawei
|
2023-11-28 18:28:47 +08:00 |
|
hch
|
238181deca
|
lib_google
lib_huawei
|
2023-11-27 17:12:27 +08:00 |
|
18401019693
|
c18af48fbb
|
修改中英文
|
2023-11-11 09:59:01 +08:00 |
|
18401019693
|
07d3b190e2
|
啟動頁跳轉廣告點擊返回鍵退出應用問題修復
|
2023-10-26 16:42:34 +08:00 |
|
18401019693
|
c3d4cb8d62
|
Merge branch 'master' into master_sud
# 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-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
# config.gradle
|
2023-10-07 14:46:22 +08:00 |
|
18401019693
|
d541a4d506
|
游戏修改，粉丝团提示修改
|
2023-10-05 10:52:54 +08:00 |
|
|
|
6e8842d30d
|
update config加入网络失败提示
|
2023-09-16 14:23:43 +08:00 |
|
