Commit Graph

2407 Commits

Author SHA1 Message Date
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
f65c698602 短剧 CookieManager cookieManager = CookieManager.getInstance(); if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)
{
    cookieManager.setAcceptThirdPartyCookies(mainWv, true);
    } else{
      cookieManager.setAcceptCookie(true);
    }
2023-12-18 15:30:29 +08:00
18401019693
215a2f8927 战令等级 2023-12-18 15:18:42 +08:00
hch
a21352302b 三星内购调用 2023-12-15 18:29:12 +08:00
18401019693
0b3ebdfc30 整蛊修改 2023-12-15 17:17:18 +08:00
18401019693
f10657f89c 弹窗整合 2023-12-15 17:01:35 +08:00
18401019693
0dc1009661 观看时长问题修改 2023-12-15 15:16:09 +08:00
18401019693
302b789970 多人Pk问题 2023-12-15 14:03:42 +08:00
18401019693
bd9c8c2265 直播间退出接口时机修改,免费礼物的修改 2023-12-15 10:17:47 +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
3982afb0d3 弹窗整合 2023-12-14 17:39:05 +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
213319d5d3 修改 测试问题 2023-12-12 15:17:09 +08:00
18401019693
ddb4e98afd 修改 测试问题 2023-12-12 14:40:48 +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
18401019693
d0b7b065b2 修改 测试问题 2023-12-07 18:18:27 +08:00
53e6cb5a70 新增首页弹窗更多条件控制 2023-12-07 18:01:48 +08:00
hch
ad79190a61 三星内购 2023-12-07 17:46:22 +08:00
18401019693
5895fa8d71 修改 测试问题 2023-12-07 17:38:38 +08:00
hch
48886374d5 修复支付弹窗问题 2023-12-07 17:31:08 +08:00
18401019693
32d0fe497d 修改 测试问题 2023-12-07 16:29:28 +08:00
18401019693
6347473d0c 修改 测试问题 2023-12-07 13:24:41 +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
18401019693
79c1c01003 修改 测试问题 2023-12-06 13:45:37 +08:00
a2864187ed update 2023-12-06 13:42:10 +08:00
ef76b2c7e4 修复主页classtab可能为空导致的闪退问题(报错平台反馈) 2023-12-06 13:17:13 +08:00
18401019693
05e7c4ffdd 修改 测试问题 2023-12-05 18:28:53 +08:00