|
|
5ae55f87fa
|
修复声网直播间会白屏问题
调整模块间的引用
|
2024-06-11 14:08:45 +08:00 |
|
余前卫
|
c20147bf8f
|
Merge branch 'yuqianwei' into dev_6.7.0
# Conflicts:
# live/src/main/res/values/strings.xml
|
2024-06-07 15:46:53 +08:00 |
|
余前卫
|
b8b43c1ef2
|
6.7.0用户端更新
|
2024-06-07 15:35:34 +08:00 |
|
|
|
73847c46a3
|
修复游戏房发言重复/不显示问题
修复贵族不显示英文问题
|
2024-06-07 14:50:39 +08:00 |
|
Martin
|
b7c53a3b21
|
add[整蛊礼物接口调用、整蛊说明]
|
2024-06-06 18:29:31 +08:00 |
|
|
|
c91947ce71
|
配置化声网AppId
|
2024-06-05 16:37:24 +08:00 |
|
Martin
|
62e50ae310
|
fix[声网APPId]
|
2024-06-05 16:06:04 +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
|
1b57d8bc8f
|
fix[修复BUG]
|
2024-06-03 15:41:29 +08:00 |
|
|
|
b5417f90b4
|
调整弹窗
|
2024-06-03 09:41:51 +08:00 |
|
Martin
|
4bd1e4bc91
|
fix[修复融云直播间，多人PK主播信息问题]
|
2024-06-02 16:57:48 +08:00 |
|
Martin
|
6132338c6c
|
fix[声望升级-同步弹窗功能]
|
2024-06-01 14:33:27 +08:00 |
|
Martin
|
a061637492
|
fix[声望升级-去掉多人PK，展示主播信息延迟代码]
|
2024-06-01 14:24:10 +08:00 |
|
|
|
98095e07ee
|
调整弹窗
|
2024-06-01 14:00:48 +08:00 |
|
|
|
9764b3370e
|
调整弹窗
|
2024-06-01 13:13:33 +08:00 |
|
18142669586
|
ce9336737f
|
新增声网正式服环境
|
2024-06-01 11:07:00 +08:00 |
|
|
|
0396e2d06d
|
调整弹窗
|
2024-06-01 11:06:40 +08:00 |
|
Martin
|
39cf76439f
|
fix[声望升级-APPID 更换存储位置]
|
2024-06-01 10:32:32 +08:00 |
|
Martin
|
c4d378daba
|
fix[声望升级-修复BUG]
|
2024-05-31 20:59:16 +08:00 |
|
18142669586
|
d3de01666c
|
修改上下滑动黑
|
2024-05-31 19:01:41 +08:00 |
|
|
|
186b9d61ee
|
調整主播端設置整蠱UI
|
2024-05-31 15:06:35 +08:00 |
|
|
|
b7c0f5d3ec
|
调整战令图标改为通过接口获取
|
2024-05-31 10:31:14 +08:00 |
|
|
|
949c0ab759
|
调整弹窗、签到弹窗、更新弹窗优先级
|
2024-05-31 10:31:14 +08:00 |
|
|
|
ab24348f72
|
调整弹窗展示逻辑
|
2024-05-30 15:14:52 +08:00 |
|
Martin
|
0252963b2e
|
Merge remote-tracking branch 'origin/声网升级' into 声网升级
# Conflicts:
# live/src/main/java/com/yunbao/live/presenter/LiveSwLinkMicPkPresenter.java
|
2024-05-28 17:13:59 +08:00 |
|
Martin
|
ff8e75768e
|
fix[声望升级-修复BUG]
|
2024-05-28 17:12:52 +08:00 |
|
|
|
c92e8dd8bc
|
调整弹窗逻辑
|
2024-05-28 17:12:38 +08:00 |
|
18142669586
|
01dfb81a46
|
点击【邀请】加上防抖的功能
|
2024-05-28 16:58:39 +08:00 |
|
|
|
8d5990c25b
|
调整弹窗逻辑
|
2024-05-28 15:02:15 +08:00 |
|
Martin
|
cf48be7d15
|
fix[声望升级-修复BUG]
|
2024-05-28 13:44:44 +08:00 |
|
|
|
bc63a3e601
|
新增【全服公告优化】
|
2024-05-27 13:48:52 +08:00 |
|
|
|
c33975fe67
|
优化首页右下角悬浮层隐藏显示问题
调整直播间购买推荐的UI显示不合设计问题
|
2024-05-24 15:45:06 +08:00 |
|
Martin
|
b6d0ea1fba
|
fix[声望升级-合并]
|
2024-05-22 13:46:52 +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
|
6a4ac35203
|
add[声望升级-AB面]
|
2024-05-18 14:36:35 +08:00 |
|
Martin
|
93dbee14b3
|
add[声望升级-修复BUG]
|
2024-05-15 15:55:31 +08:00 |
|
Martin
|
abfd15f751
|
add[声望升级-小游戏多人连麦]
|
2024-05-09 16:01:39 +08:00 |
|
|
|
8d87dda691
|
修复33000问题
|
2024-05-09 14:07:37 +08:00 |
|
|
|
e24805cf9b
|
移除友盟SDK
|
2024-05-08 11:34:56 +08:00 |
|
|
|
599e88acc6
|
替换友盟为本地aar
调整小游戏为繁体中文
|
2024-05-08 09:52:35 +08:00 |
|
|
|
2093306d36
|
修复测试反馈问题
调整小助手、机器人图标
调整PD一号的IM消息
调整PD一号的红包UI
调整翻译
|
2024-05-05 16:13:28 +08:00 |
|
Martin
|
b4adf4c77c
|
add[声望升级-多人PK]
|
2024-04-30 18:29:09 +08:00 |
|
|
|
d28d0dd3d7
|
修复测试反馈问题
|
2024-04-29 11:02:23 +08:00 |
|
|
|
150bdba795
|
完成小游戏直播间半屏内容
|
2024-04-26 18:04:16 +08:00 |
|
|
|
651fe12edd
|
新增小助手中英文图标判定
新增消息页图标中英文判定
|
2024-04-26 14:47:58 +08:00 |
|
|
|
d0c0f8f82e
|
新增戰令一鍵領取按鈕
|
2024-04-26 11:11:48 +08:00 |
|
|
|
1f12187766
|
根据测试反馈修改帮助反馈问题
新增小游戏跳一跳回血和必中的回调
新增关闭发红包页面后自动打开礼物栏的功能
调整小游戏跳一跳回调防抖
|
2024-04-26 10:08:19 +08:00 |
|
|
|
34e4765e13
|
修改帮助反馈的UI
|
2024-04-24 17:48:21 +08:00 |
|
|
|
d4d191fad6
|
新增帮助与反馈功能
|
2024-04-24 16:26:47 +08:00 |
|
Martin
|
583740e866
|
add[声望升级-接入美颜]
|
2024-04-18 09:47:38 +08:00 |
|
Martin
|
0db8eefbe6
|
add[声望升级]
|
2024-04-13 18:19:14 +08:00 |
|
Martin
|
3f68e2a3aa
|
add[声望升级]
|
2024-04-12 18:29:26 +08:00 |
|
18401019693
|
320584769d
|
修改问题
|
2024-04-11 16:32:21 +08:00 |
|
Martin
|
5922f4c08b
|
add[声望升级]
|
2024-04-10 18:31:00 +08:00 |
|
18401019693
|
f88356cea2
|
修改问题
|
2024-04-10 10:31:21 +08:00 |
|
18401019693
|
a100ab1a4a
|
修改问题
|
2024-04-09 13:04:42 +08:00 |
|
18401019693
|
69b45f1d21
|
修改问题
|
2024-04-08 14:43:27 +08:00 |
|
18401019693
|
88b96267ef
|
修改守护购买页过期用户购买逻辑
|
2024-04-08 10:01:42 +08:00 |
|
18401019693
|
490c558e03
|
自测修复，全服添加主播端
|
2024-04-07 14:39:48 +08:00 |
|
hch
|
a0294a8405
|
Merge remote-tracking branch 'origin/master'
|
2024-04-07 10:05:51 +08:00 |
|
hch
|
756cbb1ce1
|
add [首页新增短剧入口]
|
2024-04-07 10:05:40 +08:00 |
|
|
|
9e5427bd35
|
update 登录接口加中英文标识
|
2024-04-07 09:54:45 +08:00 |
|
18401019693
|
f626ab03d4
|
添加短剧签到
|
2024-04-07 09:40:32 +08:00 |
|
18401019693
|
0d7bdce4f0
|
修改守护问题，添加全服通知功能
|
2024-04-03 16:05:53 +08:00 |
|
18401019693
|
cd3feebb94
|
修改问题
|
2024-04-01 14:32:46 +08:00 |
|
18401019693
|
0b7b959151
|
修改问题
|
2024-04-01 11:10:54 +08:00 |
|
18401019693
|
4a4a52aa61
|
修改守护列表页标签展示
|
2024-03-29 15:16:27 +08:00 |
|
18401019693
|
1e466ac13d
|
Merge branch 'dev_6.6.6_开通守护'
|
2024-03-27 16:19:31 +08:00 |
|
18401019693
|
d37b490088
|
修改测试问题，添加代理和vpn检测的开播检测
|
2024-03-27 16:19:08 +08:00 |
|
18401019693
|
a61bc8fbb8
|
Merge branch 'dev_6.6.6_开通守护'
|
2024-03-27 09:44:56 +08:00 |
|
|
|
9db23a32d1
|
fix [修复直播数量不足且战令关闭情况下，显示角标Banner白屏问题]
update [替换战令角标]
add [从首页Banner进入战令入口]
add [从弹窗进入战令入口]
|
2024-03-26 17:37:26 +08:00 |
|
18401019693
|
de11b5123d
|
ui修改
|
2024-03-26 15:03:08 +08:00 |
|
18401019693
|
5b0f5f03ab
|
新增主播端 获取活动悬浮窗状态的接口：Live.getAnchorActiveImgStatus，替换原有的接口：Rank.isActivity，
|
2024-03-25 11:10:46 +08:00 |
|
18401019693
|
6095d2d04a
|
修改等级领取
|
2024-03-25 10:34:10 +08:00 |
|
18401019693
|
3953e146a5
|
修改问题
|
2024-03-23 17:33:09 +08:00 |
|
18401019693
|
f04a2865af
|
修改问题
|
2024-03-23 16:47:28 +08:00 |
|
18401019693
|
f94b3f27e3
|
守护团新增红点
|
2024-03-22 14:53:33 +08:00 |
|
18401019693
|
cad8236e5c
|
修改测试问题
|
2024-03-21 17:36:07 +08:00 |
|
18401019693
|
0317b339f8
|
修改测试问题,新增直播列表页面的神龙送财的图标
|
2024-03-20 15:19:53 +08:00 |
|
18401019693
|
4fabf3aba3
|
修改测试问题
|
2024-03-20 13:40:30 +08:00 |
|
18401019693
|
4693954a72
|
神龙送财，逻辑修改，由开通接口触发
|
2024-03-20 10:02:14 +08:00 |
|
18401019693
|
859810f1f6
|
守护的全服通知，修改测试问题
|
2024-03-19 15:32:04 +08:00 |
|
18401019693
|
53f389ddc8
|
守護等級的檢查接口，領取接口。相關頁面的請求添加。h5方法新鄭
|
2024-03-18 14:52:24 +08:00 |
|
18401019693
|
ddc9bc344e
|
神龙送财结束Im结束调用接口，神龙列表倒计时修改
|
2024-03-18 10:24:05 +08:00 |
|
18401019693
|
cf34e73d32
|
神龙列表接口对接，神龙送财活动参加接口对接，ui更新
|
2024-03-14 18:21:55 +08:00 |
|
18401019693
|
1981fb553a
|
神龙列表接口对接，神龙送财活动参加接口对接，ui更新
|
2024-03-14 16:39:04 +08:00 |
|
18401019693
|
3b6d586b58
|
神龙送财开启接口。展示直播间神龙送财点击参与的图标
|
2024-03-14 10:44:40 +08:00 |
|
18401019693
|
50b6deaf01
|
對接開通接口神龍送財的im消息
|
2024-03-13 11:18:26 +08:00 |
|
18401019693
|
bc8d916445
|
神龍送財彈窗頁面。神龍送財規則頁面
|
2024-03-06 17:18:54 +08:00 |
|
18401019693
|
6870037683
|
新版守护，空页面，列表页面。守护类型开通页面。开通时间页面
|
2024-03-06 14:24:04 +08:00 |
|
hch
|
8af7f907eb
|
守护弹窗
|
2024-03-04 14:51:07 +08:00 |
|
hch
|
8184cf6c7f
|
文字漸變色庫
|
2024-02-22 15:26:21 +08:00 |
|
hch
|
08e009e5f9
|
修复bug上报问题
|
2024-02-16 10:34:10 +08:00 |
|
hch
|
85b4facfe8
|
调整UI
|
2024-01-26 17:04:11 +08:00 |
|
|
|
f99641ed35
|
战令相关UI调整
|
2024-01-26 13:42:38 +08:00 |
|
18401019693
|
7ab4081f0b
|
優化頁面
|
2024-01-26 10:45:15 +08:00 |
|
hch
|
e7ef492015
|
调整UI
|
2024-01-26 10:18:58 +08:00 |
|
|
|
1aa6cb8f55
|
修复测试反馈问题
|
2024-01-25 16:38:44 +08:00 |
|
18401019693
|
04b70d910a
|
修复游戏房和ios不一样的数据
|
2024-01-25 13:07:17 +08:00 |
|
|
|
5a32047c6d
|
调整客服WebView
新增客服url判断链接
|
2024-01-24 14:43:31 +08:00 |
|
hch
|
30b2884c46
|
去掉短剧页面的顶部状态栏，修复闪退bug
|
2024-01-24 11:41:18 +08:00 |
|
18401019693
|
dfca615735
|
优化
|
2024-01-23 17:50:31 +08:00 |
|
|
|
0e596e9be9
|
修复测试反馈BUG
|
2024-01-23 17:33:55 +08:00 |
|
|
|
47077a465a
|
修复PK显示问题：【是用户先进 主播后挂断会显示对方信息角标】
调整直播间游戏半屏UI
调整战令UI
|
2024-01-23 15:28:13 +08:00 |
|
hch
|
aa62dda844
|
短剧优化
|
2024-01-23 14:05:33 +08:00 |
|
18401019693
|
004a5b2a53
|
优化
|
2024-01-23 11:14:58 +08:00 |
|
18401019693
|
64f9cee3af
|
优化
|
2024-01-23 09:50:34 +08:00 |
|
|
|
e185eb8612
|
调整webView
调整客服页面
|
2024-01-19 11:10:06 +08:00 |
|
|
|
299add0575
|
调整webView
调整客服页面
|
2024-01-19 11:06:35 +08:00 |
|
|
|
16755a9c8c
|
调整webView
调整客服页面
|
2024-01-19 10:43:40 +08:00 |
|
|
|
45f471055e
|
調整戰令相關UI
|
2024-01-18 16:20:55 +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 |
|
|
|
a8a1aa2e71
|
调整战令奖励列表的渲染
更改战令获取金币接口
|
2024-01-18 10:57:21 +08:00 |
|
|
|
2857127285
|
调整战令页面间距
修复【战令余额不足未跳转充值页面】问题
修复【战令开通等级时弹框金额偶尔不显示问题】
调整战令获取金额接口
调整战令item名字显示模式
调整战令购买经验弹框显示
|
2024-01-17 16:21:25 +08:00 |
|
hch
|
5b813aff88
|
修改UI
|
2024-01-17 11:12:53 +08:00 |
|
|
|
a4e98f3703
|
调整弹幕统计接口字段
|
2024-01-15 17:52:53 +08:00 |
|
hch
|
a307e6f864
|
修复 点击去支付无反应 问题
|
2024-01-15 17:24:07 +08:00 |
|
18401019693
|
29c2334ee0
|
添加了接口控制文字消息和语音的展示
|
2024-01-15 16:22:29 +08:00 |
|
18401019693
|
2aa50ecfc7
|
添加了接口控制文字消息和语音的展示
|
2024-01-15 16:15:00 +08:00 |
|
18401019693
|
e061e61088
|
Merge remote-tracking branch 'origin/master'
|
2024-01-15 13:59:52 +08:00 |
|
18401019693
|
24788d7e21
|
添加了接口控制文字消息和语音的展示
|
2024-01-15 13:59:46 +08:00 |
|
|
|
54693c0d37
|
修复【升级战令未刷新钻石余额】的问题
|
2024-01-15 13:33:53 +08:00 |
|
18401019693
|
0b15df41b8
|
Merge remote-tracking branch 'origin/语音房_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
|
2024-01-15 10:03:00 +08:00 |
|
hch
|
7627219e77
|
新增首页战令入口
|
2024-01-12 15:33:16 +08:00 |
|
18401019693
|
cf749d85c6
|
语音房bug修改
|
2024-01-12 15:16:40 +08:00 |
|
hch
|
ac6eb21e06
|
Merge remote-tracking branch 'origin/master' into 6.6.4_推送管理
# Conflicts:
# common/src/main/java/com/yunbao/common/utils/RouteUtil.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
|
2024-01-12 13:52:03 +08:00 |
|
18401019693
|
5ca13b770c
|
语音房bug修改
|
2024-01-12 09:34:29 +08:00 |
|
18401019693
|
a036e5eff6
|
语音房接口添加
|
2024-01-11 15:15:21 +08:00 |
|
|
|
c6fb323c68
|
update
|
2024-01-11 13:23:20 +08:00 |
|
18401019693
|
926a1a3cb6
|
语音房添加
|
2024-01-10 15:48:10 +08:00 |
|
|
|
1759757176
|
调整客服页面返回键交给h5处理（含系统按键/手势）
统一客服页面为同一个WebView
调整短剧与社区使用原生分开加载
调整送礼-包裹接口为新接口
调整粉丝团礼物送礼为新接口
修复战令-兑换-列表页面在名字过长晴空下高度不统一
|
2024-01-09 16:37:43 +08:00 |
|
hch
|
661c2fd334
|
推送管理
|
2024-01-09 14:52:27 +08:00 |
|
|
|
0a6b210a76
|
修复合并重复问题
|
2024-01-05 14:09:08 +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 |
|
|
|
4a5e581978
|
新增战令购买经验对话框经验条上加入经验文本
|
2024-01-05 13:57:55 +08:00 |
|
|
|
cf2274195f
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2024-01-04 18:19:23 +08:00 |
|
18401019693
|
aad607ace8
|
删除老的用户等级主播等级的图标
|
2024-01-04 15:07:12 +08:00 |
|
|
|
17506f6cbf
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2024-01-04 10:36:22 +08:00 |
|
18401019693
|
418073f07e
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2024-01-04 10:35:51 +08:00 |
|
18401019693
|
319295de57
|
接口 改造
|
2024-01-04 10:35:42 +08:00 |
|
hch
|
dcf3f5c308
|
推送管理
|
2024-01-03 18:28:49 +08:00 |
|
|
|
30bdf83724
|
调整PK天梯赛信息更新由接口转为IM推送
|
2024-01-02 15:42:55 +08:00 |
|
|
|
fbb801bf62
|
调整战令接口
调整战令购买等级最大值
新增战令统计直播间发送消息接口
|
2023-12-26 18:24:46 +08:00 |
|
18401019693
|
44601c74b4
|
隐藏测试按钮
|
2023-12-23 16:39:58 +08:00 |
|
|
|
2808e41288
|
修复测试反馈问题
|
2023-12-23 14:14:32 +08:00 |
|
|
|
05aea2448f
|
修复测试反馈问题
|
2023-12-23 11:01:28 +08:00 |
|
|
|
34986d6897
|
修复测试反馈问题
|
2023-12-23 09:59:30 +08:00 |
|
|
|
48dcfd4a04
|
新增战令系统
|
2023-12-22 14:32:18 +08:00 |
|
|
|
e06f944def
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-22 10:08:35 +08:00 |
|
18401019693
|
a5d546d1d1
|
兑换奖励接口
|
2023-12-22 10:07:47 +08:00 |
|
|
|
1304ec6cde
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-21 16:26:04 +08:00 |
|
18401019693
|
f46d14ce28
|
购买经验
|
2023-12-21 15:24:43 +08:00 |
|
|
|
e2005582fe
|
修复活动弹窗重影问题
|
2023-12-21 10:22:36 +08:00 |
|
|
|
a56a5849fe
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 17:49:30 +08:00 |
|
18401019693
|
1495bfee99
|
兌換詳情弹窗
|
2023-12-20 17:37:18 +08:00 |
|
|
|
19eecd7022
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 17:16:31 +08:00 |
|
18401019693
|
d415efde35
|
战令等级添加参数
|
2023-12-20 16:36:13 +08:00 |
|
|
|
61ee585ae9
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 16:27:44 +08:00 |
|
18401019693
|
9eba98f709
|
添加开通接口弹窗回调添加
|
2023-12-20 16:26:24 +08:00 |
|
|
|
dea3264577
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-20 16:17:37 +08:00 |
|
18401019693
|
42cfcce1dc
|
添加开通接口弹窗回调添加
|
2023-12-20 15:28:41 +08:00 |
|
hch
|
f697e650a8
|
更新
|
2023-12-19 18:29:48 +08:00 |
|
18401019693
|
ac78268a85
|
活动结束弹窗
|
2023-12-19 15:59:55 +08:00 |
|
hch
|
9d543f2211
|
Merge remote-tracking branch 'origin/master' into pdlive_samsung
# Conflicts:
# config.gradle
# main/src/main/java/com/yunbao/main/activity/GoogleFragment.java
|
2023-12-19 09:41:04 +08:00 |
|
|
|
d001712067
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-18 16:54:05 +08:00 |
|
18401019693
|
dc28a3d81e
|
zhanling dengji
|
2023-12-18 16:53:37 +08:00 |
|
|
|
728dec9d97
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-18 16:34:19 +08:00 |
|
18401019693
|
215a2f8927
|
战令等级
|
2023-12-18 15:18:42 +08:00 |
|
hch
|
a21352302b
|
三星内购调用
|
2023-12-15 18:29:12 +08:00 |
|
18401019693
|
0dc1009661
|
观看时长问题修改
|
2023-12-15 15:16:09 +08:00 |
|
|
|
58ace7d613
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-15 09:49:17 +08:00 |
|
hch
|
c723e14182
|
三星内购调用
|
2023-12-14 18:28:39 +08:00 |
|
18401019693
|
280920d5f0
|
弹窗整合
|
2023-12-14 17:28:49 +08:00 |
|
18401019693
|
e25980cec8
|
開通精英戰令
|
2023-12-14 15:10:25 +08:00 |
|
18401019693
|
e353638ec1
|
開通精英戰令
|
2023-12-14 14:49:45 +08:00 |
|
18401019693
|
65a3a64d7d
|
战令规则页面弹窗
|
2023-12-14 10:52:44 +08:00 |
|
|
|
b10312118b
|
Merge remote-tracking branch 'origin/dev_6.6.4_战令' into dev_6.6.4_战令
|
2023-12-12 17:59:09 +08:00 |
|
18401019693
|
419b5d08b4
|
升級精英/尊享戰令弹窗
|
2023-12-12 17:43:12 +08:00 |
|
18401019693
|
b146f93029
|
添加弹窗，弹窗通用背景
|
2023-12-12 16:59:33 +08:00 |
|
18401019693
|
ef34a6cf4f
|
添加弹窗，弹窗通用背景
|
2023-12-12 16:36:31 +08:00 |
|
18401019693
|
8dbc0dad7a
|
修改 测试问题
|
2023-12-12 14:39:07 +08:00 |
|
|
|
cdf3c4e411
|
调整弹窗显示
|
2023-12-12 13:51:02 +08:00 |
|
18401019693
|
446dc271d6
|
Merge remote-tracking branch 'origin/master'
|
2023-12-12 10:51:41 +08:00 |
|
18401019693
|
ecca9b7b8b
|
修改 测试问题
|
2023-12-12 10:51:30 +08:00 |
|
hch
|
331b55a5ab
|
修复跳转到华为商店问题
|
2023-12-08 15:32:18 +08:00 |
|
hch
|
f8ac4617ed
|
新增判断 判断是否有google服务
|
2023-12-08 14:17:36 +08:00 |
|
|
|
53e6cb5a70
|
新增首页弹窗更多条件控制
|
2023-12-07 18:01:48 +08:00 |
|
hch
|
ad79190a61
|
三星内购
|
2023-12-07 17:46:22 +08:00 |
|
18401019693
|
32d0fe497d
|
修改 测试问题
|
2023-12-07 16:29:28 +08:00 |
|
|
|
6df819f3b1
|
Merge remote-tracking branch 'origin/master'
|
2023-12-07 13:20:24 +08:00 |
|
|
|
39fbe90e8b
|
Merge branch 'dev_6.6.3'
|
2023-12-07 13:19:53 +08:00 |
|
18401019693
|
3396ca63d0
|
修改 测试问题
|
2023-12-07 13:17:12 +08:00 |
|
|
|
8c5ae3b61a
|
新增首页弹窗更多条件控制
|
2023-12-07 13:04:41 +08:00 |
|
18401019693
|
484891cfe7
|
修改 测试问题
|
2023-12-06 17:13:14 +08:00 |
|
18401019693
|
5c00e065d2
|
Merge remote-tracking branch 'origin/dev_6.6.3'
# Conflicts:
# common/src/main/java/com/yunbao/common/bean/IMLoginModel.java
# config.gradle
|
2023-12-06 15:20:39 +08:00 |
|
18401019693
|
2857bb09a2
|
修改 测试问题
|
2023-12-06 15:18:42 +08:00 |
|
