Merge remote-tracking branch 'origin/dev-5.2.0' into dev-5.2.0

# Conflicts: # app/src/main/res/values/colors.xml
2021-08-23 15:39:20 +08:00
parent ce2c6bed0a 84a08493e3
commit a04219518b
105 changed files with 2755 additions and 425 deletions
--- a/app/src/main/java/com/gh/common/constant/Config.java
+++ b/app/src/main/java/com/gh/common/constant/Config.java
@ -300,7 +300,7 @@ public class Config {
    public static void getGhzsSettings() {
        String channel = HaloApp.getInstance().getChannel();
        RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
-                .getSensitiveApi().getSettings(PackageUtils.getVersionName(), channel)
+                .getSensitiveApi().getSettings(PackageUtils.getGhVersionName(), channel)
                .subscribeOn(Schedulers.io())
                .observeOn(AndroidSchedulers.mainThread())
                .subscribe(new Response<SettingsEntity>() {