Merge branch 'dev-5.17.0' into 'feature-GHZS-420'

# Conflicts: # app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java
2022-12-09 03:16:53 +00:00
parent faac45e719 17e4624909
commit 9a5e529eeb
99 changed files with 1155 additions and 900 deletions
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@ -207,7 +207,7 @@ public class Config {
        PackageHelper.initList();

        // 初始化畅玩相关的东西
-        VHelper.init(HaloApp.getInstance());
+        VHelper.init(HaloApp.getInstance(), false);
    }

    @Nullable