fix:去除SettingEntity的是否同步认证弹窗的字段

【单机插件】实名认证功能第二期(https://git.shanqu.cc/pm/halo-plugin-issues/-/issues/221)

README.md

@@ -12,13 +12,12 @@
 2. 尽量使 View 在被销毁之后仍能恢复状态，处理方式可参考 [保存界面状态](https://developer.android.com/topic/libraries/architecture/saving-states)
 3. 尽量参考原有文件结构及命名规范，即以 大模块 - 小模块 的形式生成包关系
 4. 遵循最小改动原则，在提交代码前务必先检查变动的代码，尽量以可控的变动规模来构成一个 commit ，以便日后追踪问题
-5. Commit message 提交规范可参考 [Conventional Commits](https://www.conventionalcommits.org/zh-hans/v1.0.0/)
-6. 代码规范可参考 [AOSP Java 风格](https://source.android.com/setup/contribute/code-style)
-7. 尽量使用 Kotlin 来写新文件
-8. 不要使用 DataBinding
-9. Commit 前请确保不带入非项目必须文件，可手动修改 [.gitignore](https://stackoverflow.com/questions/8527597/how-do-i-ignore-files-in-a-directory-in-git) 文件忽略
-10. 优先使用 ViewBinding 获取 View 对象
-11. No AsyncTask!
+5. 代码规范可参考 [AOSP Java 风格](https://source.android.com/setup/contribute/code-style)
+6. 尽量使用 Kotlin 来写新文件
+7. 尽量不要使用 DataBinding
+8. Commit 前请确保不带入非项目必须文件，可手动修改 [.gitignore](https://stackoverflow.com/questions/8527597/how-do-i-ignore-files-in-a-directory-in-git) 文件忽略
+9. 优先使用 ViewBinding 获取 View 对象
+10. No AsyncTask!
 
 ### 公用部分
 

app/build.gradle

@@ -43,8 +43,14 @@ android {
     }
 
     defaultConfig {
+
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = [eventBusIndex: 'com.gh.EventBusIndex']
+            }
+        }
 
         ndk {
             // 如果不添加 `arm64` 调用系统的 PackageManager 的方法读取安装包信息的时候会出现 native 层闪退，草
@@ -80,6 +86,13 @@ android {
         buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\""
         buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\""
         buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\""
+
+        /**
+         * Build Time 供区分 jenkins 打包时间用
+         * IS_NIGHT_MODE_ON 供区分夜间模式功能是否启用
+         */
+        buildConfigField "long", "BUILD_TIME", "0"
+        buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"
     }
 
     // gradle 2.2以上默认同时启用v1和v2（优先用于Android N）
@@ -94,12 +107,6 @@ android {
         }
     }
 
-    kapt {
-        arguments {
-            arg("AROUTER_MODULE_NAME", project.name)
-        }
-    }
-
     buildTypes {
         debug {
             debuggable true
@@ -139,10 +146,10 @@ android {
 
     sourceSets {
         publish {
-            java.srcDirs = ['src/main/java', "src/default/java"]
+            java.srcDirs = ['src/main/java']
         }
         internal {
-            java.srcDirs = ['src/main/java', "src/default/java"]
+            java.srcDirs = ['src/main/java']
         }
         tea {
             java.srcDirs = ['src/main/java', 'src/tea/java']
@@ -193,44 +200,86 @@ dependencies {
 
     implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
 
-    teaImplementation fileTree(include: ['*.jar', '*.aar'], dir: 'src/tea/libs')
     testImplementation 'junit:junit:4.12'
 
     debugImplementation "com.squareup.leakcanary:leakcanary-android:${leakcanary}"
-
+    debugImplementation "com.squareup.okhttp3:logging-interceptor:${okHttp}"
 //    debugImplementation "com.gu.android:toolargetool:${toolargetool}" // 需要使用调试时才启用
     debugImplementation "com.github.nichbar:WhatTheStack:${whatTheStack}"
     debugImplementation "io.github.didi.dokit:dokitx:${dokit}"
 
-
-    implementation "androidx.multidex:multidex:${multiDex}"
+    implementation "androidx.core:core-ktx:${core}"
     implementation "androidx.fragment:fragment-ktx:${fragment}"
-
+    implementation "androidx.multidex:multidex:${multiDex}"
+    implementation "androidx.appcompat:appcompat:${appCompat}"
+    implementation "androidx.cardview:cardview:${cardView}"
     implementation "androidx.annotation:annotation:${annotation}"
-
+    implementation "androidx.constraintlayout:constraintlayout:${constraintLayout}"
+    implementation "androidx.recyclerview:recyclerview:${recyclerView}"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifeCycle"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifeCycle"
+    implementation "androidx.lifecycle:lifecycle-common-java8:$lifeCycle"
+    implementation "androidx.lifecycle:lifecycle-extensions:$lifeCycleExtensions"
+    implementation "androidx.room:room-runtime:${room}"
+    implementation "androidx.room:room-rxjava2:${room}"
+    implementation "androidx.core:core-ktx:${ktx}"
     implementation "androidx.viewpager2:viewpager2:${viewpager2}"
+    implementation "androidx.webkit:webkit:${webkit}"
     kapt "androidx.room:room-compiler:${room}"
 
+    implementation "com.google.android.material:material:${material}"
+
     implementation "com.kyleduo.switchbutton:library:${switchButton}"
 
+    implementation "com.facebook.fresco:fresco:${fresco}"
+    implementation "com.facebook.fresco:animated-gif-lite:${fresco}"
+    implementation "com.facebook.fresco:animated-drawable:${fresco}"
+    implementation "com.facebook.fresco:animated-webp:${fresco}"
+    implementation "com.facebook.fresco:webpsupport:${fresco}"
+
+    implementation "com.squareup.okhttp3:okhttp:${okHttp}"
+
     implementation "com.leon.channel:helper:${apkChannelPackage}"
 
+    implementation "com.squareup.retrofit2:retrofit:${retrofit}"
+    implementation "com.squareup.retrofit2:converter-gson:${retrofit}"   // include gson 2.7
+    implementation "com.squareup.retrofit2:adapter-rxjava2:${retrofit}"
+
     implementation "com.j256.ormlite:ormlite-android:${ormlite}"
     implementation "com.j256.ormlite:ormlite-core:${ormlite}"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
 
+    implementation "org.greenrobot:eventbus:${eventbus}"
+    kapt "org.greenrobot:eventbus-annotation-processor:${eventbusApt}"
+
+    implementation "io.reactivex.rxjava2:rxjava:${rxJava2}"
+    implementation "io.reactivex.rxjava2:rxandroid:${rxAndroid2}"
+    implementation "com.jakewharton.rxbinding2:rxbinding:${rxBinding2}"
+
+    implementation "com.google.zxing:core:${zxing}"
+    implementation "com.google.zxing:android-core:${zxing}"
+
+    implementation "com.daimajia.swipelayout:library:${swipeLayout}"
+
     implementation "com.google.android:flexbox:${flexbox}"
 
+    implementation "pub.devrel:easypermissions:${easypermissions}"
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
     implementation "com.contrarywind:Android-PickerView:${pickerView}"
 
+    implementation "com.scwang.smartrefresh:SmartRefreshLayout:${smartRefreshLayout}"
     implementation "net.cachapa.expandablelayout:expandablelayout:${expandableLayout}"
 
     // 用于比较 versionName 是大于小于或等于
     implementation "com.g00fy2:versioncompare:${versioncompare}"
 
+    implementation "top.zibin:Luban:${luban}"
+
+    implementation "com.squareup.picasso:picasso:${picasso}"
+
     // for video streaming
     implementation("com.github.CarGuo.GSYVideoPlayer:gsyVideoPlayer-java:$gsyVideo", {
         exclude module: "gsyvideoplayer-androidvideocache"
@@ -242,15 +291,38 @@ dependencies {
 
     implementation "com.llew.huawei:verifier:${verifier}"
 
-    implementation "com.lg:skeleton:${skeleton}"
+    implementation "com.github.tbruyelle:rxpermissions:${rxPermissions}"
 
+    implementation "com.lg:skeleton:${skeleton}"
+    implementation "com.tencent.mm.opensdk:wechat-sdk-android-without-mta:${mta}"
+    implementation "com.github.nichbar:AndroidRomChecker:${romChecker}"
+
+    debugImplementation "com.github.nichbar.chucker:library:${chucker}"
+    releaseImplementation "com.github.nichbar.chucker:library-no-op:${chucker}"
     teaImplementation "com.bytedance.applog:RangersAppLog-Lite-cn:${bytedanceApplog}"
 
+    implementation "com.aliyun.dpa:oss-android-sdk:${oss}"
+
+    implementation "com.airbnb.android:lottie:${lottie}"
+
     implementation "net.lingala.zip4j:zip4j:${zip4j}"
 
+    implementation "io.sentry:sentry-android:4.3.0"
+
+    implementation("com.github.piasy:BigImageViewer:${bigImageViewer}", {
+        exclude group: 'com.squareup.okhttp3'
+        exclude group: 'androidx.swiperefreshlayout'
+        exclude group: 'com.github.bumptech.glide'
+        exclude group: 'com.facebook.fresco'
+    })
+    implementation "com.github.PhilJay:MPAndroidChart:${chart}"
+
+    implementation "com.lahm.library:easy-protector-release:${easyProtector}"
+
     implementation "com.github.hsiafan:apk-parser:${apkParser}"
     implementation "org.nanohttpd:nanohttpd:${nanohttpd}"
 
+    implementation "com.aliyun.openservices:aliyun-log-android-sdk:${aliyunLog}"
     implementation "com.lg:easyfloat:${easyFloat}"
 
     implementation "io.github.florent37:shapeofview:${shapeOfView}"
@@ -261,12 +333,13 @@ dependencies {
 
     implementation "com.lg:gid:${gid}"
 
-    compileOnly "com.github.axen1314.lancet:lancet-base:${lancet_version}"
-    kapt "com.alibaba:arouter-compiler:$arouterVersion"
+    implementation "com.louiscad.splitties:splitties-fun-pack-android-base-with-views-dsl:${splitties}"
 
-    implementation(project(':module_common')) {
-        exclude group: 'androidx.swiperefreshlayout'
-    }
+    compileOnly "com.github.axen1314.lancet:lancet-base:${lancet_version}"
+
+    implementation project(':libraries:LGLibrary')
+    implementation project(':libraries:QQShare')
+    implementation project(':libraries:Matisse')
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {
@@ -522,4 +595,4 @@ project.afterEvaluate {
             }
         }
     }
-}
+}

app/proguard-rules.txt

@@ -14,11 +14,8 @@
 }
 #--------- remove logs end  ----------------
 
-# inline getter method
--allowaccessmodification
-
 #--------- remove useless mtahelper class --------
--assumenosideeffects class com.gh.gamecenter.core.utils.MtaHelper {
+-assumenosideeffects class com.gh.common.util.MtaHelper {
     public static void onEvent(...);
     public static void onEventWithTime(...);
     public static void onEventWithBasicDeviceInfo(...);
@@ -68,7 +65,6 @@
 -keep class com.gh.common.view.* {*;}
 -keep class com.gh.gamecenter.db.info.* {*;}
 -keep class com.gh.gamecenter.entity.* {*;}
--keep class com.gh.gamecenter.common.entity.* {*;}
 -keep class com.gh.gamecenter.qa.entity.* {*;}
 -keep class com.gh.gamecenter.retrofit.* {*;}
 -keep class com.gh.gamecenter.eventbus.* {*;}
@@ -159,12 +155,3 @@
     public static void directToSuggestion(...);
 }
 
-# ARouter
--keep public class com.alibaba.android.arouter.routes.**{*;}
--keep public class com.alibaba.android.arouter.facade.**{*;}
--keep class * implements com.alibaba.android.arouter.facade.template.ISyringe{*;}
-# 如果使用了 byType 的方式获取 Service，需添加下面规则，保护接口
--keep interface * implements com.alibaba.android.arouter.facade.template.IProvider
-# 如果使用了 单类注入，即不定义接口实现 IProvider，需添加下面规则，保护实现
--keep class * implements com.alibaba.android.arouter.facade.template.IProvider
-

app/src/default/java/com/gh/gamecenter/provider/ChannelProviderImp.kt

@@ -1,26 +0,0 @@
-package com.gh.gamecenter.provider
-
-import android.app.Application
-import android.text.TextUtils
-import com.gh.gamecenter.common.constant.Config
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.core.utils.SPUtils
-import com.leon.channel.helper.ChannelReaderUtil
-
-class ChannelProviderImp : ChannelProvider {
-    override fun getChannelStr(application: Application): String {
-        var channel = ChannelReaderUtil.getChannel(application)
-        if (channel == null || TextUtils.isEmpty(channel.trim())) {
-            channel = if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-                Config.DEFAULT_CHANNEL
-            } else {
-                Config.DEFAULT_CHANNEL_FOR_RELEASE
-            }
-        }
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            channel = SPUtils.getString(Constants.SP_TEST_FLAVOR_CHANNEL, channel)
-        }
-        return channel
-    }
-}

app/src/main/AndroidManifest.xml

@@ -25,9 +25,6 @@
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <!-- 允许应用程序快捷方式 -->
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-    <!-- 应用安装相关 -->
-    <uses-permission android:name="com.android.permission.GET_INSTALLED_APPS" />
-
     <!-- 前台服务权限-->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
 
@@ -739,10 +736,6 @@
             android:name="com.gh.gamecenter.qa.subject.CommunitySubjectActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".qa.comment.NewCommentDetailActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name="${applicationId}.wxapi.WXEntryActivity"
             android:exported="true"

app/src/main/java/com/gh/base/AppUncaughtHandler.java

@@ -0,0 +1,134 @@
+package com.gh.base;
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Looper;
+import android.preference.PreferenceManager;
+import android.util.Log;
+
+import com.gh.common.constant.Config;
+import com.gh.common.util.DataCollectionUtils;
+import com.gh.common.util.DataUtils;
+import com.gh.gamecenter.SplashScreenActivity;
+import com.lightgame.config.CommonDebug;
+import com.lightgame.download.FileUtils;
+import com.lightgame.utils.AppManager;
+import com.lightgame.utils.Utils;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.Thread.UncaughtExceptionHandler;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.concurrent.TimeoutException;
+
+import io.sentry.Sentry;
+
+public class AppUncaughtHandler implements UncaughtExceptionHandler {
+
+    private Context mContext;
+
+    public AppUncaughtHandler(Context context) {
+        // 获取系统默认的UncaughtException处理器
+        mContext = context;
+    }
+
+    @Override
+    public void uncaughtException(Thread t, Throwable e) {
+        if (("FinalizerWatchdogDaemon").equals(t.getName())
+            && e instanceof TimeoutException) {
+            // ignore timeoutException
+            // detail can be found in this didi tech blog post https://mp.weixin.qq.com/s?__biz=MzU1ODEzNjI2NA==&mid=2247487185&idx=2&sn=cf2d9e10053f625bde0f61d246f14870&source=41#wechat_redirect
+        } else {
+            new Thread(() -> {
+                Looper.prepare();
+                Utils.toast(mContext.getApplicationContext(), "\"光环助手\"发生错误");
+                Looper.loop();
+            });
+            saveLocalLog(mContext, e);
+            restart(mContext);
+            Sentry.captureException(e);
+        }
+    }
+
+    public static void restart(final Context context) {
+        // S450 这机器会无限重启循环 : (
+        if ("S450".equals(Build.MODEL)) return;
+
+        // 防止重复奔溃，导致助手一直重启，20秒内不做处理
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
+        long curTime = System.currentTimeMillis();
+        long time = sp.getLong("last_restart_time", 0);
+        if (curTime - time > 20 * 1000) {
+            sp.edit().putLong("last_restart_time", curTime).apply();
+            Intent intent = new Intent(context, SplashScreenActivity.class);
+            intent.setAction(Intent.ACTION_MAIN);
+            intent.addCategory(Intent.CATEGORY_LAUNCHER);
+            PendingIntent restartIntent = PendingIntent.getActivity(context, 0, intent,
+                    PendingIntent.FLAG_UPDATE_CURRENT);
+            // 退出程序并重启
+            AlarmManager mgr = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+            mgr.set(AlarmManager.RTC, curTime + 3000, restartIntent); // 1秒钟后重启应用
+        }
+
+        //error restart
+//        System.exit(2);
+        AppManager.getInstance().finishAllActivity();
+    }
+
+    // 保存log到本地
+    public static void saveLocalLog(Context context, Throwable ex) {
+        String errorMsg = Log.getStackTraceString(ex);
+        Config.setExceptionMsg(errorMsg);
+
+        // 保存到本地
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.getDefault());
+        File file = new File(FileUtils.getLogPath(context.getApplicationContext(),
+                format.format(new Date()) + "_gh_assist" + ".log"));
+        FileWriter writer = null;
+        try {
+            file.createNewFile();
+            writer = new FileWriter(file);
+            writer.write(errorMsg);
+            writer.flush();
+        } catch (IOException e1) {
+            e1.printStackTrace();
+        } finally {
+            if (writer != null) {
+                try {
+                    writer.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+    }
+
+    /**
+     * 下次应用启动再上报
+     *
+     * @param context
+     * @param throwable
+     */
+    public static void reportException(Context context, Throwable throwable) {
+
+        CommonDebug.logMethodWithParams(context, "ERRMSG", throwable);
+
+        // 上传错误数据
+        try {
+            DataCollectionUtils.uploadError(context, Log.getStackTraceString(throwable));
+        } catch (Exception e) {
+        }
+
+        DataUtils.onError(context, throwable);
+
+    }
+
+}

app/src/main/java/com/gh/base/BaseActivity.java

@@ -1,14 +1,12 @@
-package com.gh.gamecenter.common.base.activity;
+package com.gh.base;
 
-import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_ENTRANCE;
+import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
 
-import android.content.Context;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
-import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
@@ -22,53 +20,46 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.core.content.ContextCompat;
 import androidx.core.view.LayoutInflaterCompat;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Lifecycle;
 
-import com.alibaba.android.arouter.core.LogisticsCenter;
-import com.alibaba.android.arouter.facade.Postcard;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.gh.gamecenter.common.BuildConfig;
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.base.CustomLayoutInflaterFactory;
-import com.gh.gamecenter.common.base.fragment.BaseFragment;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.common.constant.EntranceConsts;
-import com.gh.gamecenter.common.constant.RouteConsts;
-import com.gh.gamecenter.common.eventbus.EBShowDialog;
-import com.gh.gamecenter.common.tracker.IBusiness;
-import com.gh.gamecenter.common.utils.DialogHelper;
-import com.gh.gamecenter.common.utils.DialogUtils;
-import com.gh.gamecenter.common.utils.EnvHelper;
-import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.common.utils.NetworkUtils;
-import com.gh.gamecenter.common.utils.NightModeUtils;
-import com.gh.gamecenter.common.utils.PackageFlavorHelper;
-import com.gh.gamecenter.common.utils.ShareUtils;
-import com.gh.gamecenter.core.provider.IDownloadManagerProvider;
-import com.gh.gamecenter.core.provider.IEntranceUtilsProvider;
-import com.gh.gamecenter.core.provider.IPackageInstallerProvider;
-import com.gh.gamecenter.core.provider.IQuickLoginProvider;
-import com.gh.gamecenter.core.utils.DisplayUtils;
-import com.gh.gamecenter.core.utils.MtaHelper;
-import com.gh.gamecenter.core.utils.RunningUtils;
-import com.gh.gamecenter.core.utils.SPUtils;
-import com.gh.gamecenter.core.utils.StringUtils;
+import com.gh.base.fragment.BaseFragment;
+import com.gh.common.constant.Constants;
+import com.gh.common.tracker.IBusiness;
+import com.gh.common.util.DialogHelper;
+import com.gh.common.util.DialogUtils;
+import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.EntranceUtils;
+import com.gh.common.util.EnvHelper;
+import com.gh.common.util.ExtensionsKt;
+import com.gh.common.util.MtaHelper;
+import com.gh.common.util.NetworkUtils;
+import com.gh.common.util.NightModeUtils;
+import com.gh.common.util.PackageFlavorHelper;
+import com.gh.common.util.PackageInstaller;
+import com.gh.common.util.QuickLoginHelper;
+import com.gh.common.util.RunningUtils;
+import com.gh.common.util.SPUtils;
+import com.gh.common.util.ShareUtils;
+import com.gh.common.util.StringUtils;
+import com.gh.download.DownloadManager;
+import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.LoginActivity;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.SplashScreenActivity;
+import com.gh.gamecenter.eventbus.EBShowDialog;
 import com.lightgame.BaseAppCompatActivity;
 import com.lightgame.download.DownloadEntity;
 import com.lightgame.download.FileUtils;
 import com.lightgame.utils.Utils;
-import com.lightgame.view.CheckableImageView;
 import com.tencent.tauth.Tencent;
 
 import org.greenrobot.eventbus.EventBus;
@@ -77,7 +68,6 @@ import org.greenrobot.eventbus.ThreadMode;
 import org.json.JSONObject;
 
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
 import java.util.List;
 
 import kotlin.Pair;
@@ -166,20 +156,15 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
             String xapkUnzipActivity = SPUtils.getString(Constants.SP_XAPK_UNZIP_ACTIVITY);
             String xapkUrl = SPUtils.getString(Constants.SP_XAPK_URL);
             Utils.log("页面重建了--" + xapkUnzipActivity + "--" + xapkUrl);
-            final Postcard postcard = ARouter.getInstance().build(RouteConsts.activity.splashActivity);
-            LogisticsCenter.completion(postcard);
-            final Class<?> destination = postcard.getDestination();
-            if (this.getClass().isAssignableFrom(destination)) {
+            if (this.getClass().isAssignableFrom(SplashScreenActivity.class)) {
                 SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, "");
                 SPUtils.setString(Constants.SP_XAPK_URL, "");
                 return;
             }
             if (this.getClass().getName().equals(xapkUnzipActivity) && !TextUtils.isEmpty(xapkUrl)) {
-                IDownloadManagerProvider downloadManagerConfig = (IDownloadManagerProvider) ARouter.getInstance().build(RouteConsts.provider.downloadManager).navigation();
-                IPackageInstallerProvider packageInstallerConfig = (IPackageInstallerProvider) ARouter.getInstance().build(RouteConsts.provider.packageInstaller).navigation();
-                DownloadEntity downloadEntity = downloadManagerConfig.getDownloadEntityByUrl(xapkUrl);
+                DownloadEntity downloadEntity = DownloadManager.getInstance().getDownloadEntityByUrl(xapkUrl);
                 if (downloadEntity != null) {
-                    packageInstallerConfig.install(this, downloadEntity, false);
+                    PackageInstaller.install(this, downloadEntity, false);
                     SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, "");
                     SPUtils.setString(Constants.SP_XAPK_URL, "");
                 }
@@ -204,13 +189,8 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
     @SuppressWarnings("ConstantConditions")
     @Override
     public void setContentView(View view) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            final Postcard postcard = ARouter.getInstance().build(RouteConsts.activity.splashActivity);
-            LogisticsCenter.completion(postcard);
-            final Class<?> destination = postcard.getDestination();
-            if (!(this.getClass().isAssignableFrom(destination))) {
-                view = getRootViewWithEnvIndicator(view);
-            }
+        if (!(this instanceof SplashScreenActivity) && PackageFlavorHelper.IS_TEST_FLAVOR) {
+            view = getRootViewWithEnvIndicator(view);
         }
         super.setContentView(view);
     }
@@ -258,89 +238,130 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
         }
     }
 
-    @Nullable
     private View getRootViewWithEnvIndicator(View view) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            RelativeLayout screenRootView = new RelativeLayout(this);
-            screenRootView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));
-    
-            LinearLayout ll = new LinearLayout(this);
-            TextView tv = new TextView(this);
-            String envText = "正式环境";
-            tv.setBackground(ContextCompat.getDrawable(this, R.color.theme));
-            if (EnvHelper.isDevEnv()) {
-                envText = "测试环境";
-                tv.setBackground(ContextCompat.getDrawable(this, R.color.theme_red));
-            }
-            tv.setText(envText);
-            tv.setGravity(Gravity.CENTER);
-            tv.setTextColor(Color.WHITE);
-            tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13);
-            tv.measure(0, 0);
-            tv.setAlpha(0.15F);
-            tv.setId(ID_ROOT_INDICATOR);
-            int height = tv.getMeasuredHeight();
-            int width = tv.getMeasuredWidth();
-            tv.setPadding(DisplayUtils.dip2px(20), 0, DisplayUtils.dip2px(20), 0);
-            ll.setTranslationX(DisplayUtils.dip2px(20));
-            ll.setRotation(45);
-            ll.addView(tv);
-            ll.setPadding(0, (width - height) / 2, 0, (width - height) / 2);
-    
-            if (BuildConfig.DEBUG) {
-                tv.setOnLongClickListener(v -> {
-                    IEntranceUtilsProvider entranceUtilsProvider = (IEntranceUtilsProvider) ARouter.getInstance()
-                        .build(RouteConsts.provider.entranceUtils)
-                        .navigation();
-                    entranceUtilsProvider.saveShortcut(this.getClass().getName(), getIntent().getExtras());
-                    return true;
-                });
-            }
-    
-            screenRootView.addView(view);
-            screenRootView.addView(ll);
-            screenRootView.addView(getNightModeIndicatorView());
-    
-            RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) ll.getLayoutParams();
-            lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
-            view.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));
-            return screenRootView;
-        } else {
-            return null;
+        RelativeLayout screenRootView = new RelativeLayout(this);
+        screenRootView.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));
+
+        LinearLayout ll = new LinearLayout(this);
+        TextView tv = new TextView(this);
+        String envText = "正式环境";
+        tv.setBackground(ContextCompat.getDrawable(this, R.color.theme));
+        if (EnvHelper.isDevEnv()) {
+            envText = "测试环境";
+            tv.setBackground(ContextCompat.getDrawable(this, R.color.theme_red));
         }
+        tv.setText(envText);
+        tv.setGravity(Gravity.CENTER);
+        tv.setTextColor(Color.WHITE);
+        tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13);
+        tv.measure(0, 0);
+        tv.setAlpha(0.15F);
+        tv.setId(ID_ROOT_INDICATOR);
+        int height = tv.getMeasuredHeight();
+        int width = tv.getMeasuredWidth();
+        tv.setPadding(DisplayUtils.dip2px(20), 0, DisplayUtils.dip2px(20), 0);
+        ll.setTranslationX(DisplayUtils.dip2px(20));
+        ll.setRotation(45);
+        ll.addView(tv);
+        ll.setPadding(0, (width - height) / 2, 0, (width - height) / 2);
+
+        if (BuildConfig.DEBUG) {
+            tv.setOnLongClickListener(v -> {
+                EntranceUtils.saveShortcut(this.getClass().getName(), getIntent().getExtras());
+                return true;
+            });
+        }
+
+        screenRootView.addView(view);
+        screenRootView.addView(ll);
+        if (BuildConfig.IS_NIGHT_MODE_ON) {
+            screenRootView.addView(getNightModeIndicatorView());
+        }
+
+        RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) ll.getLayoutParams();
+        lp.addRule(RelativeLayout.ALIGN_PARENT_RIGHT);
+        view.setLayoutParams(new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT, RelativeLayout.LayoutParams.MATCH_PARENT));
+        return screenRootView;
     }
 
-    @Nullable
     private View getNightModeIndicatorView() {
+        LinearLayout ll = new LinearLayout(this);
+        TextView tv = new TextView(this);
+        String envText = NightModeUtils.INSTANCE.isNightMode(this) ? "夜间模式" : "日间模式";
+        tv.setBackground(ContextCompat.getDrawable(this, R.color.theme));
+        tv.setText(envText);
+        tv.setGravity(Gravity.CENTER);
+        tv.setTextColor(Color.WHITE);
+        tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13);
+        tv.measure(0, 0);
+        tv.setAlpha(NightModeUtils.INSTANCE.isNightMode(this) ? 0.8F : 0.15F);
+        tv.setId(ID_NIGHT_INDICATOR);
+        int height = tv.getMeasuredHeight();
+        int width = tv.getMeasuredWidth();
+        tv.setPadding(DisplayUtils.dip2px(20), 0, DisplayUtils.dip2px(20), 0);
+        ll.setTranslationX(DisplayUtils.dip2px(-20));
+        ll.setRotation(-45);
+        ll.addView(tv);
+        ll.setPadding(0, (width - height) / 2, 0, (width - height) / 2);
+
         if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            LinearLayout ll = new LinearLayout(this);
-            TextView tv = new TextView(this);
-            String envText = NightModeUtils.INSTANCE.isNightMode(this) ? "夜间模式" : "日间模式";
-            tv.setBackground(ContextCompat.getDrawable(this, R.color.theme));
-            tv.setText(envText);
-            tv.setGravity(Gravity.CENTER);
-            tv.setTextColor(Color.WHITE);
-            tv.setTextSize(TypedValue.COMPLEX_UNIT_SP, 13);
-            tv.measure(0, 0);
-            tv.setAlpha(NightModeUtils.INSTANCE.isNightMode(this) ? 0.8F : 0.15F);
-            tv.setId(ID_NIGHT_INDICATOR);
-            int height = tv.getMeasuredHeight();
-            int width = tv.getMeasuredWidth();
-            tv.setPadding(DisplayUtils.dip2px(20), 0, DisplayUtils.dip2px(20), 0);
-            ll.setTranslationX(DisplayUtils.dip2px(-20));
-            ll.setRotation(-45);
-            ll.addView(tv);
-            ll.setPadding(0, (width - height) / 2, 0, (width - height) / 2);
-            return ll;
+            tv.setOnClickListener(v -> {
+                //切换深色模式
+                String mode;
+                String positive;
+                String negative;
+                if (NightModeUtils.INSTANCE.getSystemMode()) {
+                    mode = "跟随系统模式";
+                    positive = "普通模式";
+                    negative = "深色模式";
+                } else if (NightModeUtils.INSTANCE.getNightMode()) {
+                    mode = "深色模式";
+                    positive = "跟随系统模式";
+                    negative = "普通模式";
+                } else {
+                    mode = "普通模式";
+                    positive = "跟随系统模式";
+                    negative = "深色模式";
+                }
+                DialogHelper.showCenterDialog(this, "选择模式", "当前为 " + mode, positive, negative, () -> {
+                    if (NightModeUtils.INSTANCE.getSystemMode()) {
+                        NightModeUtils.INSTANCE.setNightMode(false);
+                        NightModeUtils.INSTANCE.setSystemMode(false);
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                            getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                        }
+                    } else {
+                        NightModeUtils.INSTANCE.setSystemMode(true);
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                            getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+                        }
+                    }
+                    NightModeUtils.INSTANCE.initNightMode();
+                }, () -> {
+                    if (NightModeUtils.INSTANCE.getSystemMode()) {
+                        NightModeUtils.INSTANCE.setNightMode(true);
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                            getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                        }
+                    } else {
+                        boolean nightMode = NightModeUtils.INSTANCE.getNightMode();
+                        NightModeUtils.INSTANCE.setNightMode(!NightModeUtils.INSTANCE.getNightMode());
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                            getDelegate().setLocalNightMode(nightMode ? AppCompatDelegate.MODE_NIGHT_NO : AppCompatDelegate.MODE_NIGHT_YES);
+                        }
+                    }
+                    NightModeUtils.INSTANCE.setSystemMode(false);
+                    NightModeUtils.INSTANCE.initNightMode();
+                });
+            });
         }
-        return null;
+        return ll;
     }
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     public void onEventMainThread(final EBShowDialog showDialog) {
         if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED)
                 && this.getClass().getName().equals(RunningUtils.getTopActivity(this))) {
-            IPackageInstallerProvider packageInstallerConfig = (IPackageInstallerProvider) ARouter.getInstance().build(RouteConsts.provider.packageInstaller).navigation();
             if (DOWNLOAD_HIJACK.equals(showDialog.getType())) {
                 DialogUtils.showQqSessionDialog(this);// 建议用户联系客服
             } else if (PLUGGABLE.equals(showDialog.getType())) {
@@ -348,13 +369,13 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
                     if (FileUtils.isEmptyFile(showDialog.getPath())) {
                         toast(R.string.install_failure_hint);
                     } else {
-                        packageInstallerConfig.uninstall(BaseActivity.this, showDialog.getPath());
+                        PackageInstaller.uninstall(BaseActivity.this, showDialog.getPath());
                     }
                     return null;
                 });
             } else if (SIGNATURE_CONFLICT.equals(showDialog.getType())) {
                 DialogHelper.showSignatureConflictDialog(this, () -> {
-                    packageInstallerConfig.uninstall(BaseActivity.this, showDialog.getPath());
+                    PackageInstaller.uninstall(BaseActivity.this, showDialog.getPath());
                     return null;
                 });
             } else if (LOGIN_EXCEPTION.equals(showDialog.getType())) {
@@ -371,12 +392,10 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
                             }
                             , () -> {
                                 if (SPUtils.getBoolean(Constants.SP_HAS_GET_PHONE_INFO) || NetworkUtils.isOpenMobileData(BaseActivity.this)) {
-                                    IQuickLoginProvider quickLoginConfig = (IQuickLoginProvider) ARouter.getInstance().build(RouteConsts.provider.quickLogin).navigation();
-                                    quickLoginConfig.startLogin(BaseActivity.this, "你的账号已在另外一台设备登录多设备-重新登录");
+                                    QuickLoginHelper.startLogin(BaseActivity.this, "你的账号已在另外一台设备登录多设备-重新登录");
                                 } else {
-                                    ARouter.getInstance().build(RouteConsts.activity.loginActivity)
-                                            .withString(EntranceConsts.KEY_ENTRANCE, "你的账号已在另外一台设备登录多设备-重新登录")
-                                            .navigation();
+                                    startActivity(LoginActivity.getIntent(BaseActivity.this,
+                                            "你的账号已在另外一台设备登录多设备-重新登录"));
                                 }
                             }
                     );
@@ -521,15 +540,13 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
 
     @Override
     public Pair<String, String> getBusinessId() {
-        return new Pair("", "");
+        return null;
     }
 
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        if (BuildConfig.IS_NIGHT_MODE_ON && mNightMode != NightModeUtils.INSTANCE.isNightMode(this)) {
-            onNightModeChange();
-        }
+        onNightModeChange();
     }
 
     protected void onNightModeChange() {
@@ -555,32 +572,16 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
      *
      * @param view 父 view
      */
-    protected void updateStaticViewBackground(View view) {
-        BaseActivity.updateStaticView(view, new ArrayList<>());
-    }
-
-    public static void updateStaticView(View view, List<Integer> blackList) {
-        for (Integer viewId : blackList) {
-            if (viewId == view.getId()) return;
-        }
-
-        Context context = view.getContext();
+    private void updateStaticViewBackground(View view) {
         if (view instanceof ViewGroup) {
             for (int i = 0; i < ((ViewGroup) view).getChildCount(); i++) {
                 View child = ((ViewGroup) view).getChildAt(i);
-                updateStaticView(child, blackList);
+                updateStaticViewBackground(child);
             }
         }
 
-        String backgroundString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_BACKGROUND_ID());
-        String textColorString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_TEXT_COLOR_ID());
-        String textColorHintString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_TEXT_COLOR_HINT_ID());
-        String srcString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_SRC_ID());
-        String drawableLeftString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_DRAWABLE_LEFT_ID());
-        String drawableTopString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_DRAWABLE_TOP_ID());
-        String drawableRightString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_DRAWABLE_RIGHT_ID());
-        String drawableBottomString = (String) view.getTag(CustomLayoutInflaterFactory.Companion.getTAG_DRAWABLE_BOTTOM_ID());
-
+        String backgroundString = (String) view.getTag(CustomLayoutInflaterFactory.TAG_BACKGROUND_ID);
+        String textColorString = (String) view.getTag(CustomLayoutInflaterFactory.TAG_TEXT_COLOR_ID);
         if (backgroundString != null) {
             if (backgroundString.startsWith("#")) return;
             int backgroundId = Integer.parseInt(
@@ -592,12 +593,12 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
             if (backgroundId != 0) {
                 try {
                     TypedValue value = new TypedValue();
-                    context.getResources().getValue(backgroundId, value, true);
+                    getResources().getValue(backgroundId, value, true);
 
                     if (value.type >= TypedValue.TYPE_FIRST_COLOR_INT && value.type <= TypedValue.TYPE_LAST_COLOR_INT) {
-                        view.setBackgroundColor(ExtensionsKt.toColor(backgroundId, context));
+                        view.setBackgroundColor(ExtensionsKt.toColor(backgroundId, this));
                     } else {
-                        view.setBackground(ExtensionsKt.toDrawable(backgroundId, context));
+                        view.setBackground(ExtensionsKt.toDrawable(backgroundId, this));
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -615,7 +616,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
 
             if (textColorId != 0) {
                 try {
-                    final ColorStateList colorStateList = ContextCompat.getColorStateList(context, textColorId);
+                    final ColorStateList colorStateList = ContextCompat.getColorStateList(this, textColorId);
                     ((TextView) view).setTextColor(colorStateList);
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -623,89 +624,6 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
 
             }
         }
-
-        if (textColorHintString != null && view instanceof EditText) {
-            if (textColorHintString.startsWith("#")) return;
-            int textColorHintId = Integer.parseInt(
-                    textColorHintString
-                            .replace("@", "")
-                            .replace("?", "")
-            );
-
-            if (textColorHintId != 0) {
-                try {
-                    final ColorStateList colorStateList = ContextCompat.getColorStateList(context, textColorHintId);
-                    ((EditText) view).setHintTextColor(colorStateList);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        if (view instanceof ImageView && srcString != null) {
-            if (srcString.startsWith("#")) return;
-            int srcId = Integer.parseInt(
-                    srcString
-                            .replace("@", "")
-                            .replace("?", "")
-            );
-            if (srcId != 0) {
-                ((ImageView) view).setImageResource(srcId);
-            }
-        }
-
-        if (view instanceof TextView) {
-            Drawable drawableLeft = null;
-            Drawable drawableTop = null;
-            Drawable drawableRight = null;
-            Drawable drawableBottom = null;
-            if (drawableLeftString != null) {
-                if (drawableLeftString.startsWith("#")) return;
-                int drawableLeftId = Integer.parseInt(
-                        drawableLeftString
-                                .replace("@", "")
-                                .replace("?", "")
-                );
-                if (drawableLeftId != 0) {
-                    drawableLeft = ExtensionsKt.toDrawable(drawableLeftId, context);
-                }
-            }
-            if (drawableTopString != null) {
-                if (drawableTopString.startsWith("#")) return;
-                int drawableTopId = Integer.parseInt(
-                        drawableTopString
-                                .replace("@", "")
-                                .replace("?", "")
-                );
-                if (drawableTopId != 0) {
-                    drawableTop = ExtensionsKt.toDrawable(drawableTopId, context);
-                }
-            }
-            if (drawableRightString != null) {
-                if (drawableRightString.startsWith("#")) return;
-                int drawableRightId = Integer.parseInt(
-                        drawableRightString
-                                .replace("@", "")
-                                .replace("?", "")
-                );
-                if (drawableRightId != 0) {
-                    drawableRight = ExtensionsKt.toDrawable(drawableRightId, context);
-                }
-            }
-            if (drawableBottomString != null) {
-                if (drawableBottomString.startsWith("#")) return;
-                int drawableBottomId = Integer.parseInt(
-                        drawableBottomString
-                                .replace("@", "")
-                                .replace("?", "")
-                );
-                if (drawableBottomId != 0) {
-                    drawableBottom = ExtensionsKt.toDrawable(drawableBottomId, context);
-                }
-            }
-            if (drawableLeft != null || drawableTop != null || drawableRight != null || drawableBottom != null) {
-                ((TextView) view).setCompoundDrawablesWithIntrinsicBounds(drawableLeft, drawableTop, drawableRight, drawableBottom);
-            }
-        }
     }
+
 }

app/src/main/java/com/gh/base/BaseActivity_TabLayout.java

@@ -1,24 +1,24 @@
-package com.gh.gamecenter.common.base.activity;
+package com.gh.base;
 
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
-import androidx.viewpager.widget.ViewPager;
-
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.base.adapter.FragmentAdapter;
-import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout;
-import com.gh.gamecenter.common.view.TabIndicatorView;
+import com.gh.base.adapter.FragmentAdapter;
+import com.gh.base.fragment.BaseFragment_TabLayout;
+import com.gh.common.view.TabIndicatorView;
+import com.gh.gamecenter.R;
 import com.google.android.material.tabs.TabLayout;
 import com.lightgame.view.NoScrollableViewPager;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+
 /**
  * Created by khy on 15/03/18.
  */

app/src/main/java/com/gh/base/BaseRecyclerViewHolder.java

@@ -1,10 +1,7 @@
-package com.gh.gamecenter.common.base;
-
-import android.view.View;
+package com.gh.base;
 
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.gh.gamecenter.common.callback.OnListClickListener;
+import android.view.View;
 
 /**
  * 目前仅提供butterknife bind方法

app/src/main/java/com/gh/base/BaseRichEditorActivity.kt

@@ -14,16 +14,12 @@ import android.widget.CheckBox
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.lifecycle.Observer
-import com.gh.common.util.DialogUtils
-import com.gh.common.util.NewLogUtils
+import com.gh.common.AppExecutor
+import com.gh.common.runOnIoThread
+import com.gh.common.util.*
 import com.gh.common.view.RichEditor
 import com.gh.gamecenter.CropImageActivity
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.runOnIoThread
-import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.qa.editor.*
 import com.gh.gamecenter.qa.entity.AnswerEntity
@@ -41,7 +37,6 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.io.File
 
-// TODO: 移动到module_bbs模块
 abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarActivity(),
     KeyboardHeightObserver, UploadVideoListener {
 
@@ -210,7 +205,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
         mViewModel.setUploadVideoListener(this)
         mKeyboardHeightProvider = KeyboardHeightProvider(this)
         mRichEditor.post { mKeyboardHeightProvider?.start() }
-        mRichEditor.enableForceDark(NightModeUtils.isNightMode(this))
         // 防止个别手机在Js里无法获取粘贴内容
         mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener")
         mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener")
@@ -741,14 +735,6 @@ abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarAct
     abstract fun provideViewModel(): VM
     abstract fun getVideoGuideKey(): String
 
-    override fun isAutoResetViewBackgroundEnabled(): Boolean =true
-
-    override fun onNightModeChange() {
-        super.onNightModeChange()
-        updateStatusBarColor(R.color.background_white, R.color.background_white)
-        mRichEditor.enableForceDark(NightModeUtils.isNightMode(this))
-    }
-
     companion object {
         const val ELEMENT_NAME_BOLD = " b "
         const val ELEMENT_NAME_ITALIC = " i "

app/src/main/java/com/gh/base/BaseRichEditorViewModel.kt

@@ -9,16 +9,15 @@ import android.text.TextUtils
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
-import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
-import com.gh.gamecenter.core.runOnUiThread
+import com.gh.base.fragment.WaitingDialogFragment
+import com.gh.common.runOnUiThread
+import com.gh.common.util.*
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.ErrorEntity
 import com.gh.gamecenter.entity.LocalVideoEntity
 import com.gh.gamecenter.entity.QuoteCountEntity
 import com.gh.gamecenter.qa.BbsType
-import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.retrofit.service.ApiService
 import com.gh.gamecenter.video.upload.OnUploadListener
@@ -41,7 +40,6 @@ import kotlin.collections.find
 import kotlin.collections.forEach
 import kotlin.collections.set
 
-// TODO: 移动到module_bbs模块
 abstract class BaseRichEditorViewModel(application: Application) : AndroidViewModel(application) {
     val mApi: ApiService = RetrofitManager.getInstance().api
     val processDialog = MediatorLiveData<WaitingDialogFragment.WaitingDialogData>()
@@ -191,8 +189,7 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
     fun uploadPoster(picturePath: String) {
         processDialog.postValue(WaitingDialogFragment.WaitingDialogData("封面上传中...", true))
         uploadImageSubscription =
-            UploadImageUtils.compressAndUploadImage(
-                UploadImageUtils.UploadType.poster,
+            UploadImageUtils.compressAndUploadImage(UploadImageUtils.UploadType.poster,
                 picturePath,
                 false,
                 object : UploadImageUtils.OnUploadImageListener {
@@ -311,8 +308,7 @@ abstract class BaseRichEditorViewModel(application: Application) : AndroidViewMo
             return
         }
         uploadImageSubscription =
-            UploadImageUtils.compressAndUploadImage(
-                UploadImageUtils.UploadType.poster,
+            UploadImageUtils.compressAndUploadImage(UploadImageUtils.UploadType.poster,
                 localVideoPoster,
                 false,
                 object : UploadImageUtils.OnUploadImageListener {

app/src/main/java/com/gh/base/BaseSimpleDao.kt

@@ -1,9 +1,9 @@
-package com.gh.gamecenter.common.base
+package com.gh.base
 
 import android.content.Context
 import android.content.SharedPreferences
-import com.gh.gamecenter.common.HaloApp
-import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.common.util.SPUtils
+import com.halo.assistant.HaloApp
 
 /**
  * 用 SP 实现的简单列表持久化结构
@@ -12,7 +12,7 @@ abstract class BaseSimpleDao {
 
     // 使用独有的 SP 文件
     private val mSp: SharedPreferences by lazy {
-        HaloApp.getInstance().getSharedPreferences("SimpleDao", Context.MODE_PRIVATE)
+        HaloApp.getInstance().application.getSharedPreferences("SimpleDao", Context.MODE_PRIVATE)
     }
 
     fun add(key: String) {

app/src/main/java/com/gh/base/CurrentActivityHolder.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.core.utils
+package com.gh.base
 
 import android.app.Activity
 

app/src/main/java/com/gh/base/CustomLayoutInflaterFactory.kt

@@ -0,0 +1,53 @@
+package com.gh.base
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import com.gh.gamecenter.R
+
+class CustomLayoutInflaterFactory(
+    private val mAppCompatActivity: AppCompatActivity
+) : LayoutInflater.Factory2 {
+
+    override fun onCreateView(
+        parent: View?,
+        name: String,
+        context: Context,
+        attrs: AttributeSet
+    ): View? {
+
+        val view: View?
+
+        try {
+            view = mAppCompatActivity.delegate.createView(parent, name, context, attrs)
+                ?: mAppCompatActivity.onCreateView(parent, name, context, attrs)
+                ?: mAppCompatActivity.layoutInflater.createView(name, null, attrs)
+        } catch (e: Exception) {
+            return null
+        }
+
+        val n = attrs.attributeCount
+        for (i in 0 until n) {
+            val attributeName = attrs.getAttributeName(i).toString()
+            if (attributeName.contains("background")) {
+                view?.setTag(TAG_BACKGROUND_ID, attrs.getAttributeValue(i))
+            } else if (attributeName.contains("textColor")) {
+                view?.setTag(TAG_TEXT_COLOR_ID, attrs.getAttributeValue(i))
+            }
+        }
+
+        return view
+    }
+
+    override fun onCreateView(name: String, context: Context, attrs: AttributeSet): View? {
+        return mAppCompatActivity.onCreateView(name, context, attrs)
+    }
+
+    companion object {
+        const val TAG_BACKGROUND_ID = R.string.background_id
+        const val TAG_TEXT_COLOR_ID = R.string.text_color_id
+    }
+
+}

app/src/main/java/com/gh/base/DownloadToolbarActivity.kt

@@ -1,111 +0,0 @@
-package com.gh.base
-
-import android.os.Bundle
-import android.text.TextUtils
-import android.view.MenuItem
-import android.view.View
-import android.widget.ImageView
-import android.widget.TextView
-import androidx.core.content.ContextCompat
-import com.gh.download.DownloadManager
-import com.gh.gamecenter.DownloadManagerActivity
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.activity.ToolBarActivity
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.viewModelProvider
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.SPUtils.getBoolean
-import com.gh.gamecenter.entity.GameUpdateEntity
-import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.packagehelper.PackageViewModel
-import org.greenrobot.eventbus.Subscribe
-import org.greenrobot.eventbus.ThreadMode
-
-// TODO:移动到module_download模块中
-abstract class DownloadToolbarActivity : ToolBarActivity() {
-
-    private var mDownloadCountHint: TextView? = null
-    private var mPackageViewModel: PackageViewModel? = null
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (!getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu()) {
-            mPackageViewModel = viewModelProvider(PackageViewModel.Factory())
-            mPackageViewModel?.filterSameUpdateLiveData?.observe(this) { updateList: List<GameUpdateEntity> ->
-                updateDownloadCountHint(updateList)
-            }
-        }
-    }
-
-    override fun setToolbarMenu(res: Int) {
-        // 青少年模式下要隐藏下载按钮
-        if (getBoolean(Constants.SP_TEENAGER_MODE) && res == R.menu.menu_download) return
-        super.setToolbarMenu(res)
-    }
-
-    override fun inflateMenu(res: Int) {
-        super.inflateMenu(res)
-        if (showDownloadMenu()) {
-            createDownloadMenu(res)
-        }
-    }
-
-    private fun createDownloadMenu(res: Int) {
-        if (res != R.menu.menu_download) {
-            menuInflater.inflate(R.menu.menu_download, mActionMenuView.menu)
-        }
-        if (mPackageViewModel != null) {
-            updateDownloadCountHint(mPackageViewModel?.filterSameUpdateLiveData?.value)
-        }
-        val downloadMenuView = mActionMenuView.menu.findItem(R.id.menu_download).actionView
-        mDownloadCountHint = downloadMenuView.findViewById(R.id.menu_download_count_hint)
-    }
-
-    override fun onMenuItemClick(item: MenuItem?): Boolean {
-        if (item!!.itemId == R.id.menu_download) {
-//            MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese());
-            val intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance)
-            startActivity(intent)
-            return true
-        }
-        return super.onMenuItemClick(item)
-    }
-
-    private fun updateDownloadCountHint(updateList: List<GameUpdateEntity>?) {
-        if (mDownloadCountHint == null || updateList.isNullOrEmpty()) return
-        val count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList)
-        if (count != null) {
-            mDownloadCountHint!!.visibility = View.VISIBLE
-            mDownloadCountHint!!.text = count
-            val params = mDownloadCountHint!!.layoutParams
-            if (TextUtils.isEmpty(count)) {
-                params.width = DisplayUtils.dip2px(6f)
-                params.height = DisplayUtils.dip2px(6f)
-            } else {
-                params.width = DisplayUtils.dip2px(12f)
-                params.height = DisplayUtils.dip2px(12f)
-            }
-            mDownloadCountHint!!.layoutParams = params
-        } else {
-            mDownloadCountHint!!.visibility = View.GONE
-        }
-    }
-
-    protected open fun showDownloadMenu(): Boolean {
-        return false
-    }
-
-    @Subscribe(threadMode = ThreadMode.MAIN)
-    fun onEventMainThread(status: EBDownloadStatus?) {
-        if (!getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu() && mPackageViewModel != null) {
-            updateDownloadCountHint(mPackageViewModel?.filterSameUpdateLiveData?.value)
-        }
-    }
-
-    override fun onNightModeChange() {
-        super.onNightModeChange()
-        if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) {
-            (getMenuItem(R.id.menu_download).actionView.findViewById(R.id.menu_download_iv) as ImageView).setImageResource(R.drawable.toolbar_download)
-        }
-    }
-}

app/src/main/java/com/gh/base/GHThreadFactory.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.core
+package com.gh.base
 
 import java.util.concurrent.ThreadFactory
 import java.util.concurrent.atomic.AtomicInteger

app/src/main/java/com/gh/base/GHUmengNotificationService.kt

@@ -0,0 +1,229 @@
+//package com.gh.base
+//
+//import android.app.Notification
+//import android.app.NotificationChannel
+//import android.app.NotificationManager
+//import android.app.PendingIntent
+//import android.content.Context
+//import android.content.Intent
+//import android.os.Build
+//import android.os.Bundle
+//import android.preference.PreferenceManager
+//import android.text.TextUtils
+//import android.view.View
+//import androidx.core.app.NotificationCompat
+//import androidx.core.text.htmlEncode
+//import com.gh.common.notifier.Notifier
+//import com.gh.common.util.*
+//import com.gh.gamecenter.R
+//import com.gh.gamecenter.entity.PushEntity
+//import com.gh.gamecenter.entity.PushMessageEntity
+//import com.gh.gamecenter.entity.PushMessageUnreadEntity
+//import com.gh.gamecenter.entity.PushNotificationEntity
+//import com.gh.gamecenter.manager.UserManager
+//import com.gh.gamecenter.message.MessageUnreadRepository
+//import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
+//import com.gh.gamecenter.receiver.UmengMessageReceiver
+//import com.gh.gamecenter.receiver.UmengMessageReceiver.Companion.TYPE_CLICK
+//import com.gh.gamecenter.receiver.UmengMessageReceiver.Companion.TYPE_REMOVE
+//import com.gh.gamecenter.retrofit.Response
+//import com.gh.gamecenter.retrofit.RetrofitManager
+//import com.google.gson.Gson
+//import com.umeng.message.UmengMessageService
+//import io.reactivex.android.schedulers.AndroidSchedulers
+//import io.reactivex.schedulers.Schedulers
+//import okhttp3.MediaType
+//import okhttp3.RequestBody
+//import okhttp3.ResponseBody
+//import org.android.agoo.common.AgooConstants
+//import org.json.JSONObject
+//import retrofit2.HttpException
+//import java.util.*
+//
+//class GHUmengNotificationService : UmengMessageService() {
+//
+//    companion object {
+//        const val ACTION_UMENG = "com.gh.gamecenter.UMENG"
+//        const val MESSAGE_FROM_SYSTEM = "message_from_system"
+//        const val HALO_MESSAGE_DIALOG = "HALO_MESSAGE_DIALOG"
+//        const val HALO_MESSAGE_CENTER = "HALO_MESSAGE_CENTER"
+//        const val ANSWER = "answer"
+//        const val FOLLOW_QUESTION = "follow_question"
+//        const val NOTIFICATION_ID = 2015
+//        const val DISPLAY_TYPE_NOTIFICATION = "notification"
+//        const val DISPLAY_TYPE_CUSTOM = "custom"
+//        const val MESSAGE_ID = "message_id"
+//        const val NOTIFICATION_MESSAGE_ID = "notification_message_id" // 通知中心消息 ID
+//        const val PUSH_ID = "push_id"
+//    }
+//
+//    val notificationTags = arrayOf("GH_UMENG_TAG_1", "GH_UMENG_TAG_2", "GH_UMENG_TAG_3")
+//    val gson = Gson()
+//
+//    override fun onMessage(context: Context, intent: Intent) {
+//        val message = intent.getStringExtra(AgooConstants.MESSAGE_BODY)
+//        val isMessageFromSystem = intent.getBooleanExtra(MESSAGE_FROM_SYSTEM, false)
+//
+//        try {
+//            val pushData = message.toObject<PushEntity>()
+//            pushData?.let { handlePushData(context, it, message, isMessageFromSystem) }
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//        }
+//    }
+//
+//    private fun handlePushData(context: Context, pushData: PushEntity, message: String, isMessageFromSystem: Boolean) {
+//        val notificationManager = context.applicationContext.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+//
+//        if (pushData.displayType == DISPLAY_TYPE_NOTIFICATION) {
+//            // 其它类型的透传信息
+//            // 显示到通知栏
+//            val msg = message.toObject<PushNotificationEntity>()
+//            val data = msg?.extra?.data
+//
+//            // 系统推送(非自定义信息)，直接处理跳转
+//            if (isMessageFromSystem) {
+//                val intent = Intent()
+//                intent.setClass(context, UmengMessageReceiver::class.java)
+//                intent.putExtra(EntranceUtils.KEY_DATA, data?.link)
+//                intent.putExtra(EntranceUtils.KEY_TYPE, UmengMessageReceiver.DIRECT_ONLY)
+//                intent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+//                intent.putExtra(NOTIFICATION_MESSAGE_ID, data?.messageId)
+//                context.sendBroadcast(intent)
+//                return
+//            }
+//
+//            // 用户未登录的情况下不生成消息中心通知，避免用户掉登录了还收到跳转至消息中心的通知
+//            if (data != null
+//                    && data.link?.link == "system"
+//                    && !UserManager.getInstance().isLoggedIn) {
+//                return
+//            }
+//
+//            val clickIntent = Intent()
+//            val removeIntent = Intent()
+//
+//            clickIntent.setClass(context, UmengMessageReceiver::class.java)
+//            clickIntent.putExtra(EntranceUtils.KEY_DATA, data?.link)
+//            clickIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+//            clickIntent.putExtra(MESSAGE_ID, msg?.msgId)
+//            clickIntent.putExtra(PUSH_ID, data?.pushId)
+//            clickIntent.putExtra(NOTIFICATION_MESSAGE_ID, data?.messageId)
+//            clickIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_CLICK)
+//
+//            removeIntent.setClass(context, UmengMessageReceiver::class.java)
+//            removeIntent.putExtra(EntranceUtils.KEY_TYPE, TYPE_REMOVE)
+//            removeIntent.putExtra(EntranceUtils.KEY_MESSAGE, message)
+//
+//            val clickPendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt(),
+//                    clickIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+//
+//            val deletePendingIntent = PendingIntent.getBroadcast(context, System.currentTimeMillis().toInt() + 1,
+//                    removeIntent, PendingIntent.FLAG_UPDATE_CURRENT)
+//
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//                val channel = NotificationChannel("Halo_Push", "Halo_Push", NotificationManager.IMPORTANCE_DEFAULT)
+//                notificationManager.createNotificationChannel(channel)
+//            }
+//
+//            val notification = NotificationCompat.Builder(context, "Halo_Push")
+//                    .setSmallIcon(R.drawable.ic_notification)
+//                    .setTicker(pushData.body?.ticker)
+//                    .setContentTitle(pushData.body?.title)
+//                    .setContentText(pushData.body?.text?.fromHtml())
+//                    .setContentIntent(clickPendingIntent)
+//                    .setDeleteIntent(deletePendingIntent)
+//                    .build()
+//            notification.flags = notification.flags or Notification.FLAG_AUTO_CANCEL
+//
+//            notificationManager.notify(getNotificationTag(context), NOTIFICATION_ID, notification)
+//        } else {
+//            if (UserManager.getInstance().isLoggedIn &&
+//                    HALO_MESSAGE_DIALOG == pushData.body?.custom &&
+//                    MessageUnreadRepository.unreadLiveData.value != null) {
+//                // 回答了问题或者关注了问题的消息
+//                val msg = gson.fromJson(message, PushMessageEntity::class.java)
+//                val data = msg?.extra?.data
+//
+//                val type = if (ANSWER == data?.type) {
+//                    "回答了你的问题"
+//                } else {
+//                    "回答了你关注的问题"
+//                }
+//
+//                val userName = StringUtils.shrinkStringWithDot(data?.userEntity?.name, 8)
+//                val displayText = userName + type
+//
+//                if (Notifier.isActivityValid(CurrentActivityHolder.getCurrentActivity()) &&
+//                        Notifier.shouldShowNotifier(data?.answer?.id + displayText)) {
+//                    Notifier.create(CurrentActivityHolder.getCurrentActivity())
+//                            .setText(displayText)
+//                            .setDuration(5000)
+//                            .setIcon(data?.userEntity?.icon)
+//                            .setOnClickListener(View.OnClickListener {
+//                                val bundle = Bundle()
+//                                bundle.putString(EntranceUtils.KEY_ANSWER_ID, data?.answer?.id)
+//                                bundle.putString(EntranceUtils.KEY_ENTRANCE, EntranceUtils.ENTRANCE_UMENG)
+//                                bundle.putString(EntranceUtils.KEY_TO, AnswerDetailActivity::class.java.name)
+//                                EntranceUtils.jumpActivity(context, bundle)
+//
+//                                MtaHelper.onEvent("消息弹窗", type, "Does not contains any parameter.")
+//
+//                                // 标记已读
+//                                val jsonObject = JSONObject()
+//                                jsonObject.put("type", type)
+//                                val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+//
+//                                RetrofitManager.getInstance().api.postMessageRead(UserManager.getInstance().userId, data?.id, body)
+//                                        .subscribeOn(Schedulers.io())
+//                                        .observeOn(AndroidSchedulers.mainThread())
+//                                        .subscribe(object : Response<ResponseBody>() {
+//                                            override fun onResponse(response: ResponseBody?) {
+//                                                super.onResponse(response)
+//                                                MessageUnreadRepository.loadMessageUnreadData()
+//                                            }
+//
+//                                            override fun onFailure(e: HttpException?) {
+//                                                e?.printStackTrace()
+//                                            }
+//                                        })
+//                                Notifier.hide()
+//                            })
+//                            .show(false)
+//                    Notifier.tagNotifierAsShowed(data?.answer?.id + displayText)
+//                }
+//            } else if (HALO_MESSAGE_CENTER == pushData.body?.custom) {
+//                // 消息中心逻辑
+//                val msg = gson.fromJson(message, PushMessageUnreadEntity::class.java)
+//                val data = msg?.extra?.data
+//                data?.let { MessageUnreadRepository.loadMessageUnreadData() }
+//            }
+//        }
+//    }
+//
+//    /**
+//     * 规则:最多三条消息,以旧换新
+//     *
+//     * @return NotificationTag
+//     */
+//    private fun getNotificationTag(context: Context): String {
+//        val sp = PreferenceManager.getDefaultSharedPreferences(context)
+//        val edit = sp.edit()
+//
+//        val timeTagMap = HashMap<Long, String>()
+//        for (tag in notificationTags) {
+//            val time = sp.getLong(tag, 0)
+//            if (time == 0L) {
+//                edit.putLong(tag, System.currentTimeMillis()).apply()
+//                return tag
+//            } else {
+//                timeTagMap[time] = tag
+//            }
+//        }
+//
+//        val minTime = Collections.min(timeTagMap.keys)
+//        val tag = timeTagMap[minTime]
+//        edit.putLong(tag, System.currentTimeMillis()).apply()
+//        return if (TextUtils.isEmpty(tag)) notificationTags[0] else tag!!
+//    }
+//}

app/src/main/java/com/gh/base/GlobalActivityLifecycleObserver.kt

@@ -3,12 +3,12 @@ package com.gh.base
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import com.gh.common.notifier.Notifier
+import com.gh.common.util.DataUtils
 import com.gh.common.util.FloatingBackViewManager
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.SplashScreenActivity
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
 import com.gh.gamecenter.energy.EnergyCenterActivity
 import com.gh.gamecenter.forum.detail.ForumDetailActivity
 import com.gh.gamecenter.forum.list.ForumListActivity
@@ -16,19 +16,21 @@ import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
 import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
 import com.halo.assistant.HaloApp
+import com.lightgame.utils.AppManager
 
-// TODO：移动到对应的模块
 class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
 
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {
-        // do nothing
+        AppManager.getInstance().addActivity(activity)
     }
 
     override fun onActivityStarted(activity: Activity) {
-        GlobalActivityManager.currentActivity = activity
+
     }
 
     override fun onActivityResumed(activity: Activity) {
+        CurrentActivityHolder.activitySet.add(activity)
+
         // 判断是否需要显示或隐藏返回小浮窗
         if (FloatingBackViewManager.getType().isNotEmpty()) {
             if (activity is EnergyCenterActivity
@@ -45,6 +47,7 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         }
 
         if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
+            DataUtils.onResume(activity)
             // FIXME 这里应该只是部分Activity需要
             try {
                 // 初始化gameMap
@@ -55,10 +58,6 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
                 e.printStackTrace()
             }
         }
-
-        if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
-            NightModeSwitchHelper.showNightModeSwitchFloatingView(activity)
-        }
     }
 
     private fun shouldShowActivityBackView(activity: Activity): Boolean {
@@ -71,22 +70,28 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityPaused(activity: Activity) {
+        CurrentActivityHolder.activitySet.remove(activity)
         FloatingBackViewManager.dismissBackView()
-        if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
-            NightModeSwitchHelper.dismissNightModeSwitchFloatingView()
+
+        if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
+            DataUtils.onPause(activity)
+        }
+
+        if (activity.isFinishing) {
+            AppManager.getInstance().finishActivity(activity)
         }
     }
 
     override fun onActivityStopped(activity: Activity) {
-        // do nothing
+        Notifier.hide()
     }
 
     override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-        // do nothing
+
     }
 
     override fun onActivityDestroyed(activity: Activity) {
-        // do nothing
+        AppManager.getInstance().finishActivity(activity)
     }
 
 }

app/src/main/java/com/gh/base/GlobalActivityManager.kt

@@ -1,14 +0,0 @@
-package com.gh.base
-
-import android.app.Activity
-import java.lang.ref.WeakReference
-
-object GlobalActivityManager {
-    private var mCurrentActivityWeakRef: WeakReference<Activity>? = null
-
-    var currentActivity: Activity?
-        get() = mCurrentActivityWeakRef?.get()
-        set(activity) {
-            mCurrentActivityWeakRef = WeakReference<Activity>(activity)
-        }
-}

app/src/main/java/com/gh/base/NightModeSwitchHelper.kt

@@ -1,107 +0,0 @@
-package com.gh.base
-
-import android.os.Build
-import android.view.Gravity
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import com.gh.gamecenter.R
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.NightModeUtils
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
-import com.gh.gamecenter.common.utils.dip2px
-import com.lzf.easyfloat.EasyFloat
-import com.lzf.easyfloat.enums.ShowPattern
-import com.lzf.easyfloat.enums.SidePattern
-
-object NightModeSwitchHelper {
-
-    fun showNightModeSwitchFloatingView(activity: AppCompatActivity) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            EasyFloat.with(activity)
-                .setLayout(R.layout.layout_day_mode_night_mode_switch)
-                .setTag("night_mode_switch_floating_view")
-                .setAnimator(null)
-                .setGravity(Gravity.TOP.xor(Gravity.END), 0, 114F.dip2px())
-                .setSidePattern(SidePattern.RESULT_SIDE)
-                .setDragEnable(true)
-                .setShowPattern(ShowPattern.CURRENT_ACTIVITY)
-                .registerCallback {
-                    createResult { _, _, view ->
-//                        val url = "https://ps.w.org/dark-mode-for-wp-dashboard/assets/icon-128x128.png"
-//                        view?.findViewById<ImageView>(R.id.iconIv)?.let {
-//                            Picasso.with(activity).load(url).into(it)
-//                        }
-                        view?.setOnClickListener {
-                            showNightModeSwitchDialog(activity)
-                        }
-                    }
-                }
-                .show()
-        }
-    }
-
-    fun dismissNightModeSwitchFloatingView() {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            EasyFloat.dismiss("night_mode_switch_floating_view")
-        }
-    }
-
-    private fun showNightModeSwitchDialog(activity: AppCompatActivity) {
-        if (PackageFlavorHelper.IS_TEST_FLAVOR) {
-            //切换深色模式
-            var mode = "普通模式"
-            var positive = "跟随系统模式"
-            var negative ="深色模式"
-            if (NightModeUtils.getSystemMode()) {
-                mode = "跟随系统模式"
-                positive = "普通模式"
-                negative = "深色模式"
-            } else if (NightModeUtils.getNightMode()) {
-                mode = "深色模式"
-                positive = "跟随系统模式"
-                negative = "普通模式"
-            }
-            DialogHelper.showDialog(
-                context = activity,
-                title = "选择模式",
-                content = "当前为 $mode",
-                confirmText = positive,
-                cancelText = negative,
-                confirmClickCallback = {
-                    if (NightModeUtils.getSystemMode()) {
-                        NightModeUtils.setNightMode(false)
-                        NightModeUtils.setSystemMode(false)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_NO
-                        }
-                    } else {
-                        NightModeUtils.setSystemMode(true)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode =
-                                AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-                        }
-                    }
-                    NightModeUtils.initNightMode()
-                },
-                cancelClickCallback = {
-                    if (NightModeUtils.getSystemMode()) {
-                        NightModeUtils.setNightMode(true)
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode = AppCompatDelegate.MODE_NIGHT_YES
-                        }
-                    } else {
-                        val nightMode = NightModeUtils.getNightMode()
-                        NightModeUtils.setNightMode(!NightModeUtils.getNightMode())
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                            activity.delegate.localNightMode =
-                                if (nightMode) AppCompatDelegate.MODE_NIGHT_NO else AppCompatDelegate.MODE_NIGHT_YES
-                        }
-                    }
-                    NightModeUtils.setSystemMode(false)
-                    NightModeUtils.initNightMode()
-                },
-                extraConfig = DialogHelper.Config(centerTitle = true, centerContent = true)
-            )
-        }
-    }
-}

app/src/main/java/com/gh/base/OnDoubleTapListener.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.callback;
+package com.gh.base;
 
 import android.content.Context;
 import android.view.GestureDetector;

app/src/main/java/com/gh/base/OnListClickListener.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.callback;
+package com.gh.base;
 
 import android.view.View;
 

app/src/main/java/com/gh/base/OnRequestCallBackListener.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.callback;
+package com.gh.base;
 
 /**
  * Created by Administrator on 2016/9/8.

app/src/main/java/com/gh/base/OnViewClickListener.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.callback;
+package com.gh.base;
 
 import android.view.View;
 

app/src/main/java/com/gh/base/SearchBarHint.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.core.iinterface;
+package com.gh.base;
 
 import java.util.ArrayList;
 

app/src/main/java/com/gh/base/ToolBarActivity.java

@@ -1,16 +1,16 @@
-package com.gh.gamecenter.common.base.activity;
+package com.gh.base;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
-import android.view.MotionEvent;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
@@ -18,19 +18,32 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.widget.ActionMenuView;
 import androidx.appcompat.widget.Toolbar;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import androidx.lifecycle.ViewModelProviders;
 
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.base.fragment.ToolbarController;
-import com.gh.gamecenter.common.base.fragment.ToolbarFragment;
-import com.gh.gamecenter.common.utils.ImageUtils;
+import com.gh.common.constant.Constants;
+import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.ImageUtils;
+import com.gh.common.util.SPUtils;
+import com.gh.common.view.GameIconView;
+import com.gh.download.DownloadManager;
+import com.gh.gamecenter.DownloadManagerActivity;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.entity.GameUpdateEntity;
+import com.gh.gamecenter.eventbus.EBDownloadStatus;
+import com.gh.gamecenter.normal.ToolbarController;
+import com.gh.gamecenter.packagehelper.PackageViewModel;
 import com.lightgame.OnTitleClickListener;
 
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
+
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.List;
@@ -43,10 +56,8 @@ import java.util.List;
 
 public abstract class ToolBarActivity extends BaseActivity implements ToolbarController, ActionMenuView.OnMenuItemClickListener {
 
-    public static final String NORMAL_FRAGMENT_NAME = "normalFragmentName";
-    public static final String NORMAL_FRAGMENT_BUNDLE = "normalFragmentBundle";
-
-    private Fragment mTargetFragment;
+    @Nullable
+    private PackageViewModel mPackageViewModel;
 
     protected View mToolbarContainer;
 
@@ -64,14 +75,14 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
 
     protected View mBackBtn;
 
+    protected GameIconView mGameIconView;
+
     protected SimpleDraweeView mUserAvatarIv;
 
     protected TextView mIconTitle;
 
-    @Override
-    protected int getLayoutId() {
-        return R.layout.activity_normal;
-    }
+    @Nullable
+    private TextView mDownloadCountHint;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -79,41 +90,12 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         setStatusBarDarkMode(true, this);
         initToolbar();
 
-        if (getIntent() != null) {
-            if (savedInstanceState == null) {
-                handleIntent(getIntent());
-            } else {
-                for (Fragment fragment : getSupportFragmentManager().getFragments()) {
-                    if (fragment instanceof ToolbarFragment) mTargetFragment = fragment;
-                }
-            }
+        if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu()) {
+            mPackageViewModel = ViewModelProviders.of(this, new PackageViewModel.Factory()).get(PackageViewModel.class);
+            mPackageViewModel.getFilterSameUpdateLiveData().observe(this, this::updateDownloadCountHint);
         }
     }
 
-    @Override
-    protected void onNewIntent(Intent intent) {
-        super.onNewIntent(intent);
-        if (getIntent() != null) handleIntent(intent);
-    }
-
-    private void handleIntent(Intent intent) {
-        String fraName = intent.getStringExtra(NORMAL_FRAGMENT_NAME);
-        Bundle bundle = intent.getBundleExtra(NORMAL_FRAGMENT_BUNDLE);
-        if (TextUtils.isEmpty(fraName)) {
-            if (provideNormalIntent() == null) {
-                return;
-            }
-            fraName = provideNormalIntent().getStringExtra(NORMAL_FRAGMENT_NAME);
-            if (bundle == null) bundle = getIntent().getExtras();
-            if (TextUtils.isEmpty(fraName)) return;
-        }
-        mTargetFragment = getSupportFragmentManager().findFragmentByTag(fraName);
-        if (mTargetFragment == null) {
-            mTargetFragment = Fragment.instantiate(this, fraName, bundle);
-        }
-        getSupportFragmentManager().beginTransaction().replace(getFragmentPlaceholderId(), mTargetFragment, fraName).commitNowAllowingStateLoss();
-    }
-
     // 小米沉浸式黑色字体
     @SuppressLint("PrivateApi")
     public void setStatusBarDarkMode(boolean darkmode, Activity activity) {
@@ -138,10 +120,13 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         mIconTitleContainer = findViewById(R.id.iconTitleContainer);
         mBackContainer = findViewById(R.id.backContainer);
         mBackBtn = findViewById(R.id.backBtn);
+        mGameIconView = findViewById(R.id.gameIv);
         mUserAvatarIv = findViewById(R.id.userAvatar);
         mIconTitle = findViewById(R.id.iconTitle);
         if (mToolbar != null) {
 //            setSupportActionBar(mToolbar); // 替换actionBar后 toolBar无法控制
+//            mToolbar.setNavigationIcon(provideNavigationIcon());
+//            mToolbar.setNavigationOnClickListener(provideNavigationItemClickListener());
             if (mBackBtn != null) mBackBtn.setOnClickListener(provideNavigationItemClickListener());
             if (mBackContainer != null) mBackContainer.setOnClickListener(provideNavigationItemClickListener());
             if (mTitleTv != null) {
@@ -183,8 +168,18 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
     @Override
     public void setToolbarMenu(int res) {
         if (mActionMenuView == null) return;
-        inflateMenu(res);
+        // 青少年模式下要隐藏下载按钮
+        if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && res == R.menu.menu_download) return;
+//        mToolbar.inflateMenu(res);
+//        mToolbar.setOnMenuItemClickListener(this);
+
+        getMenuInflater().inflate(res, mActionMenuView.getMenu());
         mActionMenuView.setOnMenuItemClickListener(this);
+
+        if (showDownloadMenu()) {
+            createDownloadMenu(res);
+        }
+
         Menu menu = mActionMenuView.getMenu();
         for (int i = 0; i < menu.size(); i++) {
             MenuItem menuItem = menu.getItem(i);
@@ -202,10 +197,6 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         setTitleCenter();
     }
 
-    public void inflateMenu(int res) {
-        getMenuInflater().inflate(res, mActionMenuView.getMenu());
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
@@ -223,6 +214,13 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         }
     }
 
+    public void setGameIconToolbar(String icon, String iconSubscript) {
+        mTitleContainer.setVisibility(View.GONE);
+        mGameIconView.displayGameIcon(icon, iconSubscript);
+        mGameIconView.setVisibility(View.VISIBLE);
+        mIconTitleContainer.setVisibility(View.VISIBLE);
+    }
+
     public void setUserAvatarIconToolbar(String icon) {
         mTitleContainer.setVisibility(View.GONE);
         ImageUtils.display(mUserAvatarIv, icon);
@@ -230,6 +228,49 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         mIconTitleContainer.setVisibility(View.VISIBLE);
     }
 
+    private void createDownloadMenu(int res) {
+        if (res != R.menu.menu_download) {
+            MenuInflater inflater = getMenuInflater();
+            inflater.inflate(R.menu.menu_download, mActionMenuView.getMenu());
+        }
+
+        if (mPackageViewModel != null) {
+            updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue());
+        }
+
+        View downloadMenuView = mActionMenuView.getMenu().findItem(R.id.menu_download).getActionView();
+        mDownloadCountHint = downloadMenuView.findViewById(R.id.menu_download_count_hint);
+    }
+
+    private void updateDownloadCountHint(List<GameUpdateEntity> updateList) {
+        if (mDownloadCountHint == null) return;
+
+        String count = DownloadManager.getInstance().getDownloadOrUpdateCount(updateList);
+        if (count != null) {
+            mDownloadCountHint.setVisibility(View.VISIBLE);
+            mDownloadCountHint.setText(count);
+
+            ViewGroup.LayoutParams params = mDownloadCountHint.getLayoutParams();
+            if (TextUtils.isEmpty(count)) {
+                params.width = DisplayUtils.dip2px(6);
+                params.height = DisplayUtils.dip2px(6);
+            } else {
+                params.width = DisplayUtils.dip2px(12);
+                params.height = DisplayUtils.dip2px(12);
+            }
+            mDownloadCountHint.setLayoutParams(params);
+        } else {
+            mDownloadCountHint.setVisibility(View.GONE);
+        }
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(EBDownloadStatus status) {
+        if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) && showDownloadMenu() && mPackageViewModel != null) {
+            updateDownloadCountHint(mPackageViewModel.getFilterSameUpdateLiveData().getValue());
+        }
+    }
+
     @Override
     public MenuItem getMenuItem(int res) {
         if (mToolbar == null) return null; //后续页面做好判断
@@ -247,14 +288,12 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         return mActionMenuView.getMenu();
     }
 
-    public ActionMenuView getActionMenuView() {
-        return mActionMenuView;
-    }
-
     @Override
     public boolean onMenuItemClick(MenuItem item) {
-        if (mTargetFragment instanceof ToolbarFragment) {
-            ((ToolbarFragment) mTargetFragment).onMenuItemClick(item);
+        if (item.getItemId() == R.id.menu_download) {
+//            MtaHelper.onEvent("下载管理", "下载管理入口", getActivityNameInChinese());
+            Intent intent = DownloadManagerActivity.getDownloadMangerIntent(this, mEntrance);
+            startActivity(intent);
         }
         return false;
     }
@@ -263,33 +302,8 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         return view -> onBackPressed();
     }
 
-    @Override
-    public void onBackPressed() {
-        if (mTargetFragment != null) {
-            if (mTargetFragment instanceof ToolbarFragment
-                    && mTargetFragment.isAdded()
-                    && !((ToolbarFragment) mTargetFragment).onBackPressed()) {
-                super.onBackPressed();
-            }
-        } else {
-            super.onBackPressed();
-        }
-    }
-
-    @Override
-    public boolean dispatchTouchEvent(MotionEvent ev) {
-        if (mTargetFragment instanceof ToolbarFragment) {
-            ((ToolbarFragment) mTargetFragment).onTouchEvent(ev);
-        }
-        return super.dispatchTouchEvent(ev);
-    }
-
-    public Fragment getTargetFragment() {
-        return mTargetFragment;
-    }
-
-    public int getFragmentPlaceholderId() {
-        return R.id.normal_content;
+    protected boolean showDownloadMenu() {
+        return false;
     }
 
     @Override
@@ -299,40 +313,6 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         }
     }
 
-    // 针对部分跳转不符合ToolbarActivity规则的额外处理，主要绑定ToolbarFragment
-    protected Intent provideNormalIntent() {
-        return null;
-    }
-
-    protected static Intent getTargetIntent(Context context, Class<? extends ToolBarActivity> cls, Class<? extends ToolbarFragment> t, Bundle bundle) {
-        Intent intent = new Intent(context, cls);
-        intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName());
-        intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle);
-        return intent;
-    }
-
-    protected static Intent getTargetIntent(Context context, Class<? extends ToolBarActivity> cls, Class<? extends ToolbarFragment> t) {
-        Intent intent = new Intent(context, cls);
-        intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName());
-        return intent;
-    }
-
-
-    public static void startFragmentNewTask(Context context, Class<? extends ToolbarFragment> t, Bundle bundle) {
-        Intent intent = new Intent(context, ToolBarActivity.class);
-        intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName());
-        intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle);
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        context.startActivity(intent);
-    }
-
-    public static void startFragment(Context context, Class<? extends ToolbarFragment> t, Bundle bundle) {
-        Intent intent = new Intent(context, ToolBarActivity.class);
-        intent.putExtra(NORMAL_FRAGMENT_NAME, t.getCanonicalName());
-        intent.putExtra(NORMAL_FRAGMENT_BUNDLE, bundle);
-        context.startActivity(intent);
-    }
-
     @Override
     protected void onNightModeChange() {
         super.onNightModeChange();
@@ -349,5 +329,8 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon
         if (mTitleTv != null) {
             mTitleTv.setTextColor(ContextCompat.getColor(this, R.color.text_black));
         }
+        if (showDownloadMenu() && getMenuItem(R.id.menu_download) != null) {
+            ((ImageView) getMenuItem(R.id.menu_download).getActionView().findViewById(R.id.menu_download_iv)).setImageDrawable(ContextCompat.getDrawable(this, R.drawable.toolbar_download));
+        }
     }
 }

app/src/main/java/com/gh/base/adapter/FragmentAdapter.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.adapter;
+package com.gh.base.adapter;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;

app/src/main/java/com/gh/base/adapter/FragmentStateAdapter.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.adapter;
+package com.gh.base.adapter;
 
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;

app/src/main/java/com/gh/base/fragment/BaseDialogFragment.java

@@ -1,10 +1,18 @@
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.app.Dialog;
 import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.KeyEvent;
 
+import com.gh.common.util.ClickUtils;
+import com.gh.common.util.NightModeUtils;
+import com.gh.gamecenter.R;
+import com.lightgame.utils.RuntimeUtils;
+import com.lightgame.utils.Utils;
+
+import java.lang.reflect.Field;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
@@ -14,14 +22,6 @@ import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Lifecycle;
 
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.utils.NightModeUtils;
-import com.gh.gamecenter.core.utils.ClickUtils;
-import com.lightgame.utils.RuntimeUtils;
-import com.lightgame.utils.Utils;
-
-import java.lang.reflect.Field;
-
 /**
  * @author CsHeng
  * @Date 17/05/2017

app/src/main/java/com/gh/base/fragment/BaseDialogWrapperFragment.java

@@ -1,18 +1,16 @@
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.app.Dialog;
 import android.os.Bundle;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-
-import com.gh.gamecenter.common.R;
-
+import com.gh.gamecenter.R;
 
 /**
  * Wrap another fragment with dialog fragment.

app/src/main/java/com/gh/base/fragment/BaseFragment.java

@@ -1,6 +1,4 @@
-package com.gh.gamecenter.common.base.fragment;
-
-import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_ENTRANCE;
+package com.gh.base.fragment;
 
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -11,6 +9,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
@@ -20,16 +19,16 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.gh.gamecenter.common.BuildConfig;
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.callback.OnListClickListener;
-import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.common.eventbus.EBMiPush;
-import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler;
-import com.gh.gamecenter.common.syncpage.SyncDataEntity;
-import com.gh.gamecenter.common.syncpage.SyncPageRepository;
-import com.gh.gamecenter.common.utils.NightModeUtils;
+import com.gh.base.OnListClickListener;
+import com.gh.base.OnRequestCallBackListener;
+import com.gh.common.constant.Constants;
+import com.gh.common.syncpage.ISyncAdapterHandler;
+import com.gh.common.syncpage.SyncDataEntity;
+import com.gh.common.syncpage.SyncPageRepository;
+import com.gh.common.util.NightModeUtils;
+import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.eventbus.EBMiPush;
 import com.lightgame.OnTitleClickListener;
 import com.lightgame.utils.RuntimeUtils;
 import com.lightgame.utils.Utils;
@@ -47,6 +46,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import kotlin.Pair;
 
+import static com.gh.common.util.EntranceUtils.KEY_ENTRANCE;
+
 /**
  * Created by LGT on 2016/9/4.
  * Fragment 基类
@@ -162,6 +163,7 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
         if (addSyncPageObserver()) {
             initSyncPageObserver();
         }
+
         if (BuildConfig.IS_NIGHT_MODE_ON) {
             mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext());
         } else {
@@ -352,8 +354,7 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
     @Override
     public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-
-        if (BuildConfig.IS_NIGHT_MODE_ON && mNightMode != NightModeUtils.INSTANCE.isNightMode(requireContext())) {
+        if (BuildConfig.IS_NIGHT_MODE_ON) {
             onNightModeChange();
         }
     }

app/src/main/java/com/gh/base/fragment/BaseFragment_TabLayout.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.content.Context;
 import android.content.Intent;
@@ -15,10 +15,12 @@ import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.ViewPager;
 
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.base.adapter.FragmentAdapter;
-import com.gh.gamecenter.common.view.TabIndicatorView;
+import com.gh.base.adapter.FragmentAdapter;
+import com.gh.common.view.TabIndicatorView;
+import com.gh.gamecenter.R;
+import com.gh.gamecenter.normal.NormalFragment;
 import com.google.android.material.tabs.TabLayout;
+import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 import com.lightgame.view.NoScrollableViewPager;
 
@@ -29,7 +31,7 @@ import java.util.List;
  * Created by khy on 15/03/18.
  */
 
-public abstract class BaseFragment_TabLayout extends ToolbarFragment implements ViewPager.OnPageChangeListener {
+public abstract class BaseFragment_TabLayout extends NormalFragment implements ViewPager.OnPageChangeListener {
 
     public static final String PAGE_INDEX = "PAGE_INDEX";
 

app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager.java

@@ -7,11 +7,10 @@
  * 2013-3-6			    CsHeng
  */
 
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
 
 import androidx.annotation.IdRes;
 import androidx.annotation.LayoutRes;
@@ -20,6 +19,9 @@ import androidx.fragment.app.Fragment;
 import androidx.viewpager.widget.PagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import android.view.View;
+
+import com.gh.gamecenter.normal.NormalFragment;
 import com.lightgame.adapter.BaseFragmentPagerAdapter;
 import com.lightgame.config.CommonDebug;
 import com.lightgame.view.DoubleTapTextView;
@@ -34,7 +36,7 @@ import java.util.List;
  * @author CsHeng
  * @date 2013-3-6
  */
-public abstract class BaseFragment_ViewPager extends ToolbarFragment implements DoubleTapTextView.OnDoubleTapListener {
+public abstract class BaseFragment_ViewPager extends NormalFragment implements DoubleTapTextView.OnDoubleTapListener {
 
     public static final String ARGS_INDEX = "index";
     protected int mCheckedIndex = 0;

app/src/main/java/com/gh/base/fragment/BaseFragment_ViewPager_Checkable.java

@@ -7,21 +7,23 @@
  * 2013-3-6			    CsHeng
  */
 
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Checkable;
 
+import com.gh.gamecenter.fragment.MainWrapperFragment;
+
+import java.util.List;
+
 import androidx.annotation.IdRes;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.viewpager.widget.ViewPager;
 
-import java.util.List;
-
 
 /**
  * ViewPager 配合ViewGroup Checkable实现双切换<br/>
@@ -36,7 +38,7 @@ public abstract class BaseFragment_ViewPager_Checkable extends BaseFragment_View
 
     protected ViewGroup mCheckableGroup;
 
-    private int mLastPosition = 0;
+    private int mLastPosition = MainWrapperFragment.INDEX_HOME;
 
     @IdRes
     protected abstract int getCheckableGroupId();

app/src/main/java/com/gh/base/fragment/BaseLazyFragment.kt

@@ -1,11 +1,12 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.base.fragment
 
 import android.os.Bundle
+import com.gh.gamecenter.normal.NormalFragment
 
 /**
  * 懒加载（支持多层嵌套）
  */
-abstract class BaseLazyFragment : ToolbarFragment() {
+abstract class BaseLazyFragment : NormalFragment() {
 
     private var mIsFirstVisible = true
 

app/src/main/java/com/gh/base/fragment/BaseLazyTabFragment.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.base.fragment
 
 import android.content.Intent
 import android.os.Bundle
@@ -7,9 +7,9 @@ import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
-import com.gh.gamecenter.common.R
-import com.gh.gamecenter.common.base.adapter.FragmentAdapter
-import com.gh.gamecenter.common.view.TabIndicatorView
+import com.gh.base.adapter.FragmentAdapter
+import com.gh.common.view.TabIndicatorView
+import com.gh.gamecenter.R
 import com.google.android.material.tabs.TabLayout
 import com.lightgame.view.NoScrollableViewPager
 

app/src/main/java/com/gh/base/fragment/LazyFragment.kt

@@ -1,9 +1,9 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.base.fragment
 
 import android.os.Bundle
 import android.view.View
 import android.view.ViewStub
-import com.gh.gamecenter.common.R
+import com.gh.gamecenter.R
 
 /**
  * 这是在 BaseLazyFragment 之上添加了一些通用功能的抽象类

app/src/main/java/com/gh/base/fragment/OnDialogBackListener.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.callback;
+package com.gh.base.fragment;
 
 public interface OnDialogBackListener {
     void onBack();

app/src/main/java/com/gh/base/fragment/WaitingDialogFragment.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.fragment;
+package com.gh.base.fragment;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -11,9 +11,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.FragmentManager;
 
-import com.gh.gamecenter.common.R;
-import com.gh.gamecenter.common.callback.OnDialogBackListener;
-import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.common.util.DisplayUtils;
+import com.gh.common.util.ExtensionsKt;
+import com.gh.gamecenter.R;
 
 /**
  * @author CsHeng

app/src/main/java/com/gh/common/AppExecutor.kt

@@ -1,12 +1,13 @@
-package com.gh.gamecenter.core
+package com.gh.common
 
 import android.os.Handler
 import android.os.Looper
-import com.gh.gamecenter.core.AppExecutor.heavyWeightIoExecutor
-import com.gh.gamecenter.core.AppExecutor.ioExecutor
-import com.gh.gamecenter.core.AppExecutor.lightWeightIoExecutor
-import com.gh.gamecenter.core.AppExecutor.uiExecutor
-
+import com.gh.base.GHThreadFactory
+import com.gh.common.AppExecutor.heavyWeightIoExecutor
+import com.gh.common.AppExecutor.ioExecutor
+import com.gh.common.AppExecutor.lightWeightIoExecutor
+import com.gh.common.AppExecutor.logExecutor
+import com.gh.common.AppExecutor.uiExecutor
 import io.reactivex.schedulers.Schedulers
 import java.util.concurrent.*
 

app/src/main/java/com/gh/common/Base64ImageHolder.kt

@@ -0,0 +1,5 @@
+package com.gh.common
+
+object Base64ImageHolder {
+    var image: String = ""
+}

app/src/main/java/com/gh/common/DefaultJsApi.kt

@@ -8,27 +8,16 @@ import android.webkit.JavascriptInterface
 import androidx.annotation.Keep
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentActivity
+import com.gh.base.CurrentActivityHolder
+import com.gh.common.constant.Constants
+import com.gh.common.loghub.LoghubUtils
+import com.gh.common.tracker.Tracker
 import com.gh.common.util.*
-import com.gh.common.util.LogUtils
+import com.gh.common.view.dsbridge.CompletionHandler
 import com.gh.gamecenter.*
-import com.gh.gamecenter.common.callback.BiCallback
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.entity.NotificationUgc
-import com.gh.gamecenter.common.loghub.LoghubUtils
-import com.gh.gamecenter.common.tracker.Tracker
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.runOnIoThread
-import com.gh.gamecenter.core.runOnUiThread
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.core.utils.MtaHelper
-import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.energy.EnergyCenterActivity
 import com.gh.gamecenter.energy.EnergyHouseActivity
-import com.gh.gamecenter.entity.Badge
-import com.gh.gamecenter.entity.MtaEvent
+import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.help.QaFeedbackDialogFragment
 import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
@@ -43,7 +32,7 @@ import java.io.File
 import java.io.FileOutputStream
 import java.util.*
 
-class DefaultJsApi(var context: Context, val entrance: String = "") {
+class DefaultJsApi(var context: Context) {
 
     private var mLoginHandler: CompletionHandler<Any>? = null
 
@@ -192,7 +181,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
     fun openBase64Image(event: Any) {
         val context = CurrentActivityHolder.getCurrentActivity()
 
-        ImageViewerActivity.base64Image = event.toString()
+        Base64ImageHolder.image = event.toString()
 
         context?.startActivity(ImageViewerActivity.getBase64Intent(context, true))
     }
@@ -243,7 +232,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
     fun shareBase64Image(event: Any) {
         val imageShareEvent = event.toString().toObject() ?: ImageShareEvent()
         val context = CurrentActivityHolder.getCurrentActivity()
-        ImageViewerActivity.base64Image = imageShareEvent.image.run {
+        Base64ImageHolder.image = imageShareEvent.image.run {
             if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
         }
         MessageShareUtils.getInstance(context).shareFromWeb(context, imageShareEvent.type)
@@ -254,7 +243,7 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         val inviteEvent = event.toString().toObject() ?: InviteFriendsEvent()
         val context = CurrentActivityHolder.getCurrentActivity()
         if ("poster" == inviteEvent.type) {
-            ImageViewerActivity.base64Image = inviteEvent.poster.run {
+            Base64ImageHolder.image = inviteEvent.poster.run {
                 if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
             }
             MessageShareUtils.getInstance(context).shareInviteFriends(context, inviteEvent.way)
@@ -431,11 +420,6 @@ class DefaultJsApi(var context: Context, val entrance: String = "") {
         GameActivityDownloadHelper.postExposureEvent(gameActivityEvent)
     }
 
-    @JavascriptInterface
-    fun getEntrance(msg: Any): String {
-        return entrance
-    }
-
     @Keep
     internal data class ImageEvent(var imageList: ArrayList<String> = arrayListOf(), var position: Int = 0)
 

app/src/main/java/com/gh/common/DefaultUrlHandler.kt

@@ -5,8 +5,8 @@ import android.content.Intent
 import android.net.Uri
 import android.text.TextUtils
 import android.util.Base64
-import com.gh.gamecenter.core.utils.CurrentActivityHolder
-import com.gh.gamecenter.common.constant.Constants
+import com.gh.base.CurrentActivityHolder
+import com.gh.common.constant.Constants
 import com.gh.common.util.*
 import com.gh.common.util.DirectUtils.directToFeedback
 import com.gh.common.util.DirectUtils.directToGameDetailVideoStreaming
@@ -15,16 +15,11 @@ import com.gh.common.util.DirectUtils.directToGameVideo
 import com.gh.common.util.DirectUtils.directToLegacyVideoDetail
 import com.gh.common.util.DirectUtils.directToLinkPage
 import com.gh.common.util.DirectUtils.directToQa
-import com.gh.gamecenter.core.utils.GsonUtils.gson
+import com.gh.common.util.GsonUtils.gson
 import com.gh.gamecenter.LibaoDetailActivity
 import com.gh.gamecenter.MainActivity
 import com.gh.gamecenter.NewsDetailActivity
 import com.gh.gamecenter.WebActivity
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.common.utils.DialogHelper
-import com.gh.gamecenter.common.utils.EnvHelper
-import com.gh.gamecenter.core.utils.ToastUtils
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.gamecollection.publish.GameCollectionEditActivity
 import com.gh.gamecenter.qa.BbsType
@@ -83,7 +78,7 @@ object DefaultUrlHandler {
                     e.printStackTrace()
                 }
 
-                EntranceConsts.HOST_QQ_QUN -> {
+                EntranceUtils.HOST_QQ_QUN -> {
                     val key = uri.getQueryParameter("key")
                     if (!DirectUtils.directToQqGroup(context, key)) {
                         Utils.toast(context, "请检查是否已经安装手机QQ")
@@ -108,8 +103,6 @@ object DefaultUrlHandler {
                 }
                 "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")
 
-                "real_name" -> DirectUtils.directToRealName(context)
-
                 "community" -> {
                     val community = CommunityEntity()
                     community.id = id
@@ -153,7 +146,7 @@ object DefaultUrlHandler {
                         )
                     }
                 }
-                EntranceConsts.HOST_UPLOAD_VIDEO -> {
+                EntranceUtils.HOST_UPLOAD_VIDEO -> {
                     val titleParameter = uri.getQueryParameter("title")
                     val title = if (titleParameter.isNullOrEmpty()) "" else "#$titleParameter#"
                     val categoryId = uri.getQueryParameter("category_id") ?: ""
@@ -164,16 +157,16 @@ object DefaultUrlHandler {
                     val tagActivityName = uri.getQueryParameter("tagActivityName") ?: ""
                     val linkEntity = VideoLinkEntity(title, categoryId, link, tagActivityId, tagActivityName)
                     val simpleGameEntity = SimpleGameEntity(gameId, gameName)
-                    CheckLoginUtils.checkLogin(context, null, true, EntranceConsts.ENTRANCE_BROWSER) {
-                        DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceConsts.ENTRANCE_BROWSER, "")
+                    CheckLoginUtils.checkLogin(context, null, true, EntranceUtils.ENTRANCE_BROWSER) {
+                        DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceUtils.ENTRANCE_BROWSER, "")
                     }
                 }
-                EntranceConsts.HOST_USERHOME -> {
+                EntranceUtils.HOST_USERHOME -> {
                     val position = uri.getQueryParameter("position")
                     val subtype = uri.getQueryParameter("sub_type") ?: ""
                     DirectUtils.directToHomeActivity(context, id, subtype, if (position.isNullOrEmpty()) -1 else position.toInt(), entrance, "")
                 }
-                EntranceConsts.HOST_VIDEO_MORE -> {
+                EntranceUtils.HOST_VIDEO_MORE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
                     val type = uri.getQueryParameter("type") ?: ""
                     val act = uri.getQueryParameter("act") ?: ""
@@ -205,48 +198,48 @@ object DefaultUrlHandler {
                         sectionName
                     )
                 }
-                EntranceConsts.HOST_VIDEO_DETAIL -> {
+                EntranceUtils.HOST_VIDEO_DETAIL -> {
                     DirectUtils.directToVideoDetail(context, id, entrance, path)
                 }
-                EntranceConsts.HOST_VIDEO_SINGLE -> {
+                EntranceUtils.HOST_VIDEO_SINGLE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
                     DirectUtils.directToVideoDetail(
                         context, id, VideoDetailContainerViewModel.Location.SINGLE_VIDEO.value,
                         false, "", entrance, "", if (TextUtils.isEmpty(referer)) "" else referer
                     )
                 }
-                EntranceConsts.HOST_VIDEO_STREAMING_HOME -> {
+                EntranceUtils.HOST_VIDEO_STREAMING_HOME -> {
                     intent = Intent(context, MainActivity::class.java)
                     intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP
                     intent.putExtra(MainActivity.SWITCH_TO_VIDEO, true)
                     context.startActivity(intent)
                 }
-                EntranceConsts.HOST_VIDEO_STREAMING_DESC -> {
+                EntranceUtils.HOST_VIDEO_STREAMING_DESC -> {
                     directToGameDetailVideoStreaming(context, id, entrance)
                 }
-                EntranceConsts.HOST_VIDEO_COLLECTION -> {
+                EntranceUtils.HOST_VIDEO_COLLECTION -> {
                     directToGameVideo(context, id, entrance, "")
                 }
 
-                EntranceConsts.HOST_CATEGORY -> {
+                EntranceUtils.HOST_CATEGORY -> {
                     val title = uri.getQueryParameter("title")
                     DirectUtils.directCategoryDirectory(context, id, title ?: "", entrance, "")
                 }
-                EntranceConsts.HOST_COLUMN_COLLECTION -> {
+                EntranceUtils.HOST_COLUMN_COLLECTION -> {
                     val name = uri.getQueryParameter("name")
                     DirectUtils.directToColumnCollection(context, id, -1, entrance, name ?: "")
                 }
-                EntranceConsts.HOST_COLUMN -> {
-                    DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceConsts.KEY_NAME), entrance)
+                EntranceUtils.HOST_COLUMN -> {
+                    DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceUtils.KEY_NAME), entrance)
                 }
-                EntranceConsts.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> {
+                EntranceUtils.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> {
                     val community = CommunityEntity()
                     community.id = uri.getQueryParameter("community_id") ?: ""
                     community.name = uri.getQueryParameter("community_name") ?: ""
                     val tag = uri.getQueryParameter("tag") ?: ""
                     DirectUtils.directAskColumnLabelDetail(context, tag, community, entrance, "")
                 }
-                EntranceConsts.HOST_COMMUNITY_COLUMN_DETAIL -> {
+                EntranceUtils.HOST_COMMUNITY_COLUMN_DETAIL -> {
                     val community = CommunityEntity()
                     community.id = uri.getQueryParameter("community_id") ?: ""
                     community.name = uri.getQueryParameter("community_name") ?: ""
@@ -254,42 +247,42 @@ object DefaultUrlHandler {
                     DirectUtils.directAskColumnDetail(context, columnId, community, entrance, "")
                 }
 
-                EntranceConsts.HOST_BLOCK -> {
+                EntranceUtils.HOST_BLOCK -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     val entity = SubjectRecommendEntity(link = id, name = name, text = name)
                     DirectUtils.directToBlock(context, entity, entrance)
                 }
 
-                EntranceConsts.HOST_SERVER_BLOCK -> {
+                EntranceUtils.HOST_SERVER_BLOCK -> {
                     DirectUtils.directToGameServers(context, entrance = entrance, path = "")
                 }
 
-                EntranceConsts.HOST_AMWAY_BLOCK -> {
+                EntranceUtils.HOST_AMWAY_BLOCK -> {
                     DirectUtils.directToAmway(context, entrance = entrance, path = "")
                 }
 
-                EntranceConsts.HOST_HELP -> {
+                EntranceUtils.HOST_HELP -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     DirectUtils.directToQa(context, name, id)
                 }
 
-                EntranceConsts.HOST_HELP_COLLECTION -> {
+                EntranceUtils.HOST_HELP_COLLECTION -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     DirectUtils.directToQaCollection(context, name, id)
                 }
 
-                EntranceConsts.HOST_GAME_UPLOAD -> {
+                EntranceUtils.HOST_GAME_UPLOAD -> {
                     DirectUtils.directGameUpload(context, entrance = entrance, path = "")
                 }
-                EntranceConsts.HOST_GAME_ZONE -> {
+                EntranceUtils.HOST_GAME_ZONE -> {
                     val zoneUrl = uri.getQueryParameter("url") ?: ""
                     DirectUtils.directGameZone(context, id, zoneUrl, entrance)
                 }
 
-                EntranceConsts.HOST_LINK -> {
+                EntranceUtils.HOST_LINK -> {
                     try {
                         val dataString = uri.getQueryParameter("data")
                         if (!TextUtils.isEmpty(dataString)) {
@@ -303,43 +296,43 @@ object DefaultUrlHandler {
                     }
                 }
 
-                EntranceConsts.HOST_GAME_NEWS -> {
+                EntranceUtils.HOST_GAME_NEWS -> {
                     DirectUtils.directToGameNews(
                         context,
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceUtils.KEY_GAME_ID),
+                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
                         entrance
                     );
                 }
 
-                EntranceConsts.HOST_GAME_CALENDAR -> {
-                    directToGameServerCalendar(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID))
+                EntranceUtils.HOST_GAME_CALENDAR -> {
+                    directToGameServerCalendar(context, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID))
                 }
 
-                EntranceConsts.HOST_HISTORY_APK -> {
-                    DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID))
+                EntranceUtils.HOST_HISTORY_APK -> {
+                    DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID))
                 }
 
-                EntranceConsts.HOST_FORUM_DETAIL -> {
+                EntranceUtils.HOST_FORUM_DETAIL -> {
                     DirectUtils.directForumDetail(context, id, entrance)
                 }
 
-                EntranceConsts.HOST_GAME_RATING_DETAIL -> {
+                EntranceUtils.HOST_GAME_RATING_DETAIL -> {
                     DirectUtils.directToGameRatingDetail(
                         context,
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
-                        uri.getQueryParameter(EntranceConsts.KEY_COMMENT_ID),
-                        EntranceConsts.ENTRANCE_BROWSER
+                        uri.getQueryParameter(EntranceUtils.KEY_GAME_ID),
+                        uri.getQueryParameter(EntranceUtils.KEY_COMMENT_ID),
+                        EntranceUtils.ENTRANCE_BROWSER
                     )
                 }
 
-                EntranceConsts.HOST_FORUM -> {
-                    val position = uri.getQueryParameter(EntranceConsts.KEY_POSITION)?.toInt()
+                EntranceUtils.HOST_FORUM -> {
+                    val position = uri.getQueryParameter(EntranceUtils.KEY_POSITION)?.toInt()
 
                     DirectUtils.directToForum(context, position ?: 0)
                 }
 
-                EntranceConsts.HOST_UPLOAD_VIDEO_NEW -> {
+                EntranceUtils.HOST_UPLOAD_VIDEO_NEW -> {
                     val activityName = uri.getQueryParameter("activity_name") ?: ""
                     val activityId = uri.getQueryParameter("activity_id") ?: ""
                     val original = uri.getQueryParameter("original") ?: ""
@@ -377,39 +370,39 @@ object DefaultUrlHandler {
                     )
                 }
 
-                EntranceConsts.HOST_SUGGESTION -> {
-                    val platform = uri.getQueryParameter(EntranceConsts.KEY_PLATFORM)
+                EntranceUtils.HOST_SUGGESTION -> {
+                    val platform = uri.getQueryParameter(EntranceUtils.KEY_PLATFORM)
                     val platformName = PlatformUtils.getInstance(context).getPlatformName(platform)
-                    val gameId = uri.getQueryParameter(EntranceConsts.KEY_GAMEID)
-                    val packageMd5 = uri.getQueryParameter(EntranceConsts.KEY_PACKAGE_MD5)
-                    val isQaFeedback = uri.getQueryParameter(EntranceConsts.KEY_IS_QA_FEEDBACK) == "true"
+                    val gameId = uri.getQueryParameter(EntranceUtils.KEY_GAMEID)
+                    val packageMd5 = uri.getQueryParameter(EntranceUtils.KEY_PACKAGE_MD5)
+                    val isQaFeedback = uri.getQueryParameter(EntranceUtils.KEY_IS_QA_FEEDBACK) == "true"
                     val content = if (TextUtils.isEmpty(gameId) || TextUtils.isEmpty(packageMd5)) String.format(
                         "%s-%s-V%s，",
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
                         if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceConsts.KEY_VERSION)
+                        uri.getQueryParameter(EntranceUtils.KEY_VERSION)
                     ) else String.format(
                         "%s-%s-V%s\n游戏ID：%s\n游戏包MD5：%s\n",
-                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
                         if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceConsts.KEY_VERSION), gameId, packageMd5
+                        uri.getQueryParameter(EntranceUtils.KEY_VERSION), gameId, packageMd5
                     )
                     val qaId = uri.getQueryParameter("qa_id") ?: ""
-                    val qaContentId = uri.getQueryParameter(EntranceConsts.KEY_QA_CONTENT_ID) ?: ""
-                    val qaTitle = uri.getQueryParameter(EntranceConsts.KEY_QA_TITLE)
+                    val qaContentId = uri.getQueryParameter(EntranceUtils.KEY_QA_CONTENT_ID) ?: ""
+                    val qaTitle = uri.getQueryParameter(EntranceUtils.KEY_QA_TITLE)
                     if (!TextUtils.isEmpty(qaId)) {
                         directToQa(context, qaTitle, qaId)
                     } else {
-                        directToFeedback(context, content, null, isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER)
+                        directToFeedback(context, content, null, isQaFeedback, qaContentId, EntranceUtils.ENTRANCE_BROWSER)
                     }
                 }
 
-                EntranceConsts.HOST_HELP_AND_FEEDBACK -> {
+                EntranceUtils.HOST_HELP_AND_FEEDBACK -> {
                     val position = uri.getQueryParameter("position") ?: ""
                     DirectUtils.directToHelpAndFeedback(context, position.toInt())
                 }
 
-                EntranceConsts.HOST_HELP_DETAIL -> {
+                EntranceUtils.HOST_HELP_DETAIL -> {
                     var url = uri.getQueryParameter("url")
                     if (!url.isNullOrEmpty()) {
                         context.startActivity(WebActivity.getIntent(context, url, false))
@@ -426,19 +419,16 @@ object DefaultUrlHandler {
                     }
                 }
 
-                EntranceConsts.HOST_GAME_COLLECTION_DETAIL -> {
+                EntranceUtils.HOST_GAME_COLLECTION_DETAIL -> {
                     DirectUtils.directToGameCollectionDetail(context, id, entrance)
                 }
 
-                EntranceConsts.HOST_GAME_COLLECTION_SQUARE -> {
+                EntranceUtils.HOST_GAME_COLLECTION_SQUARE -> {
                     DirectUtils.directToGameCollectionSquare(context, entrance)
                 }
 
-                EntranceConsts.HOST_GAME_COLLECTION_EDIT -> {
-                    val activityId = uri.getQueryParameter("activity_id") ?: ""
-                    val activityName = uri.getQueryParameter("activity_name") ?: ""
-                    val gameId = uri.getQueryParameter("game_id") ?: ""
-                    context.startActivity(GameCollectionEditActivity.getIntent(context, activityId, activityName, gameId, entrance))
+                EntranceUtils.HOST_GAME_COLLECTION_EDIT -> {
+                    context.startActivity(GameCollectionEditActivity.getIntent(context, entrance))
                 }
 
                 else -> {

app/src/main/java/com/gh/common/FixedRateJobHelper.kt

@@ -2,13 +2,13 @@ package com.gh.common
 
 import com.gh.common.exposure.ExposureManager
 import com.gh.common.filter.RegionSettingHelper
-import com.gh.gamecenter.common.loghub.LoghubUtils
-import com.gh.gamecenter.common.utils.doOnMainProcessOnly
-import com.gh.gamecenter.common.utils.tryCatchInRelease
+import com.gh.common.loghub.LoghubUtils
+import com.gh.common.util.doOnMainProcessOnly
+import com.gh.common.util.tryCatchInRelease
 import com.gh.common.videolog.VideoRecordUtils
 import com.gh.download.DownloadDataHelper
 import com.gh.gamecenter.entity.TimeEntity
-import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.schedulers.Schedulers

app/src/main/java/com/gh/common/LocalBroadcastReceiver.kt

@@ -0,0 +1,39 @@
+//package com.gh.common
+//
+//import android.content.BroadcastReceiver
+//import android.content.Context
+//import android.content.Intent
+//import com.gh.common.im.ImManager
+//import com.gh.gamecenter.manager.UserManager
+//import com.gh.gamecenter.retrofit.RetrofitManager
+//import com.halo.assistant.HaloApp
+//import com.m7.imkfsdk.chat.ChatActivity
+//import io.reactivex.schedulers.Schedulers
+//
+///**
+// * 可使用 [LocalBroadcastManager] 来进行简单的模块间消息通知
+// */
+//
+//class LocalBroadcastReceiver : BroadcastReceiver() {
+//
+//    override fun onReceive(context: Context?, intent: Intent?) {
+//        intent?.let {
+//            when (intent.action) {
+//                ChatActivity.ACTION_DISMISS_FLOATING_WINDOW -> {
+//                    ImManager.dismissFloatingWindow()
+//
+//                    RetrofitManager.getInstance().api.postImEnding(UserManager.getInstance().userId)
+//                            .subscribeOn(Schedulers.io())
+//                            .subscribe()
+//                }
+//
+//                ChatActivity.ACTION_HIDE_UNREAD_DOT -> {
+//                    ImManager.updateShouldShowFloatingWindowDot(false)
+//                }
+//
+//                else -> return
+//            }
+//        }
+//    }
+//
+//}

app/src/main/java/com/gh/common/PushManager.kt

@@ -0,0 +1,117 @@
+package com.gh.common
+
+import android.annotation.SuppressLint
+import com.gh.gamecenter.entity.AliasEntity
+import com.halo.assistant.HaloApp
+
+object PushManager {
+
+    var deviceToken: String? = ""
+
+    private var mPreviousAlias: AliasEntity? = null
+    private var mApplication = HaloApp.getInstance().application
+
+    const val SP_PUSH_ALIAS = "push_alias"
+
+    @JvmStatic
+    fun init(channel: String) {
+//        tryWithDefaultCatch {
+//            //初始化友盟推送
+//            UMConfigure.init(mApplication, Config.UMENG_APPKEY, channel, UMConfigure.DEVICE_TYPE_PHONE, Config.UMENG_MESSAGE_SECRET)
+//
+//            val pushAgent = PushAgent.getInstance(mApplication)
+//
+//            runOnIoThread { registerDevice() }
+//
+//            // 注册小米、华为和魅族通道
+//            MiPushRegistar.register(mApplication, Config.MIPUSH_APPID, Config.MIPUSH_APPKEY)
+//            HuaWeiRegister.register(mApplication)
+//            MeizuRegister.register(mApplication, BuildConfig.MEIZUPUSH_APPID, BuildConfig.MEIZUPUSH_APPKEY)
+//
+//            val aliasInSp = PreferenceManager.getDefaultSharedPreferences(mApplication).getString(SP_PUSH_ALIAS, "")
+//            mPreviousAlias = aliasInSp?.toObject()
+//
+//            if (mPreviousAlias == null) {
+//                getAndSetAlias()
+//            }
+//
+//            // 完全自定义处理（透传）
+//            pushAgent.setPushIntentServiceClass(GHUmengNotificationService::class.java)
+//        }
+    }
+
+    private fun registerDevice() {
+//        PushAgent.getInstance(mApplication).register(object : IUmengRegisterCallback {
+//            override fun onSuccess(dToken: String) {
+//                //注册成功会返回device token
+//                deviceToken = dToken
+//                getAndSetAlias()
+//                Utils.log("deviceToken::$dToken")
+//            }
+//
+//            override fun onFailure(s: String, s1: String) {
+//                Utils.log("deviceToken::" + "注册失败")
+//            }
+//        })
+    }
+
+    @SuppressLint("CheckResult")
+    @JvmStatic
+    fun getAndSetAlias() {
+//        if (deviceToken.isNullOrEmpty()) {
+//            registerDevice()
+//            return
+//        }
+//
+//        val meta = MetaUtil.getMeta()
+//
+//        val jsonObject = JSONObject()
+//        jsonObject.put("device_token", deviceToken)
+//        jsonObject.put("imei", meta.imei)
+//        jsonObject.put("android_id", meta.android_id)
+//        jsonObject.put("model", meta.model)
+//        jsonObject.put("manufacturer", meta.manufacturer)
+//        jsonObject.put("os", meta.os)
+//        jsonObject.put("os_version", meta.android_version)
+//        jsonObject.put("mac", meta.mac)
+//        jsonObject.put("gid", meta.gid)
+//
+//        val body = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString())
+//
+//        RetrofitManager.getInstance().api.getAlias(body)
+//                .subscribeOn(Schedulers.io())
+//                .subscribe(
+//                        { setAlias(it) },
+//                        { it.printStackTrace() }
+//                )
+    }
+
+    @JvmStatic
+    fun setAlias(alias: AliasEntity) {
+//        val pushAgent = PushAgent.getInstance(mApplication)
+//
+//        mPreviousAlias = alias
+//        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
+//            putString(SP_PUSH_ALIAS, mPreviousAlias?.toJson())
+//        }
+//
+//        pushAgent.setAlias(alias.alias, alias.aliasType) { b, s ->
+//            Utils.log("注册别名 $b + $s")
+//        }
+    }
+
+    @JvmStatic
+    fun deleteAlias() {
+//        val pushAgent = PushAgent.getInstance(mApplication)
+//
+//        mPreviousAlias?.let {
+//            pushAgent.deleteAlias(it.alias, it.aliasType) { b, s ->
+//                Utils.log("删除别名 $b + $s")
+//            }
+//        }
+//        PreferenceManager.getDefaultSharedPreferences(mApplication).edit {
+//            putString(SP_PUSH_ALIAS, "")
+//        }
+//        mPreviousAlias = null
+    }
+}

app/src/main/java/com/gh/common/TimeElapsedHelper.kt

@@ -1,13 +1,12 @@
-package com.gh.gamecenter.core.utils
+package com.gh.common
 
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
-import com.gh.gamecenter.core.AppExecutor
-import com.gh.gamecenter.core.GHThreadFactory
-import com.gh.gamecenter.core.HaloApp
+import com.gh.base.GHThreadFactory
+import com.halo.assistant.HaloApp
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 
@@ -57,7 +56,7 @@ class TimeElapsedHelper(val fragment: Fragment?, val activity: Activity?) {
 
             override fun onActivityDestroyed(a: Activity) {
                 if (activity == a) {
-                    HaloApp.getInstance().unregisterActivityLifecycleCallbacks(this)
+                    HaloApp.getInstance().application.unregisterActivityLifecycleCallbacks(this)
                 }
             }
         })

app/src/main/java/com/gh/common/Typealias.kt

@@ -1,3 +1,3 @@
-package com.gh.gamecenter.common.callback
+package com.gh.common
 
 typealias OnFastClickListener = (isSuccess: Boolean) -> Unit

app/src/main/java/com/gh/common/annotation/SyncIgnore.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.annotation;
+package com.gh.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

app/src/main/java/com/gh/common/annotation/SyncPage.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.annotation;
+package com.gh.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

app/src/main/java/com/gh/common/annotation/Synchronize.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.annotation;
+package com.gh.common.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

app/src/main/java/com/gh/common/avoidcallback/ActivityResultInfo.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.avoidcallback;
+package com.gh.common.avoidcallback;
 
 import android.content.Intent;
 

app/src/main/java/com/gh/common/avoidcallback/AvoidOnResultFragment.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.avoidcallback
+package com.gh.common.avoidcallback
 
 import android.content.Intent
 import android.os.Bundle

app/src/main/java/com/gh/common/avoidcallback/AvoidOnResultManager.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.avoidcallback
+package com.gh.common.avoidcallback
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity

app/src/main/java/com/gh/common/avoidcallback/Callback.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.avoidcallback
+package com.gh.common.avoidcallback
 
 import android.content.Intent
 

app/src/main/java/com/gh/common/constant/Config.java

@@ -1,28 +1,26 @@
 package com.gh.common.constant;
 
 import android.annotation.SuppressLint;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
-import androidx.annotation.Nullable;
-
-import com.gh.gamecenter.common.utils.EnvHelper;
-import com.gh.gamecenter.common.constant.Constants;
-import com.gh.gamecenter.core.utils.GsonUtils;
+import com.gh.common.util.EnvHelper;
+import com.gh.common.util.GsonUtils;
 import com.gh.common.util.PackageHelper;
 import com.gh.common.util.PackageUtils;
+import com.gh.common.util.SPUtils;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.SuggestionActivity;
-import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.entity.GameGuidePopupEntity;
 import com.gh.gamecenter.entity.NewSettingsEntity;
 import com.gh.gamecenter.entity.NewsEntity;
 import com.gh.gamecenter.entity.SettingsEntity;
 import com.gh.gamecenter.eventbus.EBReuse;
-import com.gh.gamecenter.common.retrofit.BiResponse;
-import com.gh.gamecenter.common.retrofit.Response;
+import com.gh.gamecenter.retrofit.BiResponse;
+import com.gh.gamecenter.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
@@ -35,6 +33,8 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.annotation.Nullable;
+
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
@@ -45,6 +45,10 @@ public class Config {
     public static final String API_HOST = EnvHelper.getHost();
     public static final String NEW_API_HOST = EnvHelper.getNewHost();
 
+    /**
+     * 需要配置的请使用{@link PreferenceManager#getDefaultSharedPreferences(Context)}
+     */
+
     // Third-Party confs
     public static final String WECHAT_APPID = BuildConfig.WECHAT_APPID;
     public static final String WECHAT_SECRET = BuildConfig.WECHAT_SECRET;
@@ -55,7 +59,10 @@ public class Config {
     // http://www.ghzs666.com/article/${articleId}.html
     public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一
 
-    private static final String SETTINGS_KEY = "settingsKey";
+    public static final String DEFAULT_CHANNEL = "GH_TEST3";
+    public static final String DEFAULT_CHANNEL_FOR_RELEASE = "GH_LOST"; // 正式包的缺省渠道，避免因渠道丢失而回落到测试渠道
+
+    private static String SETTINGS_KEY = "settingsKey";
 
     private static SettingsEntity mSettingsEntity;
     private static NewSettingsEntity mNewSettingsEntity;
@@ -86,7 +93,13 @@ public class Config {
         return false;
     }
 
+    public static String getExceptionMsg() {
+        return getPreferences().getString("errMsg", null);
+    }
 
+    public static void setExceptionMsg(String errMsg) {
+        SPUtils.setString(getPreferences(), "errMsg", errMsg);  //先用apply(),保存不了再用commit() 9.0机型保存不了信息
+    }
 
     public static boolean isShowDownload(String gameId) {
 
@@ -257,6 +270,13 @@ public class Config {
         return false;
     }
 
+    public static boolean isGameDomeSwitchOpen() {
+        return getSettings() != null && getSettings().getGameDomeSwitch().equals("on");
+    }
+    public static boolean isPermissionPopupSwitchOpen() {
+        return getSettings() != null && getSettings().getPermissionPopupSwitch().equals("on");
+    }
+
     public static void fixHideFunction() {
         SharedPreferences preferences = PreferenceManager.
                 getDefaultSharedPreferences(HaloApp.getInstance().getApplication());

app/src/main/java/com/gh/common/constant/Constants.java

@@ -1,12 +1,11 @@
-package com.gh.gamecenter.common.constant;
+package com.gh.common.constant;
 
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.gh.gamecenter.core.provider.IPackageUtilsProvider;
-import com.gh.gamecenter.core.utils.TimeUtils;
+import com.gh.common.util.PackageUtils;
+import com.gh.common.util.TimeUtils;
+import com.halo.assistant.HaloApp;
 
 public class Constants {
 
-    private static final IPackageUtilsProvider packageUtilsConfig = (IPackageUtilsProvider) ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation();
     public static final int SEND_NEWS_FEEDBACK = 0x126;
     public static final int SEND_COMMENT_FEEDBACK = 0x127;
 
@@ -105,11 +104,11 @@ public class Constants {
     // 今天是否已经触发了 “通知管理” 引导弹窗
     public static final String SP_IS_SHOWED_NOTIFICATION_TODAY = "show_is_notification_today";
     // v4.0.0已废弃,标记安装的游戏为已玩过弹窗，最多取消2次 (https://gitlab.ghzs.com/pm/halo-app-issues/issues/722 调整为版本相关) (不是常量了也放这里好像有点奇怪)
-    public static final String SP_MARK_INSTALLED_GAME = "mark_installed_game" + packageUtilsConfig.getGhVersionName();
+    public static final String SP_MARK_INSTALLED_GAME = "mark_installed_game" + PackageUtils.getGhVersionName();
     // 标记安装的游戏为已玩过弹窗（个人主页最多弹一次）
-    public static final String SP_MARK_INSTALLED_GAME_USER_HOME = "mark_installed_game_user_home" + packageUtilsConfig.getGhVersionName();
+    public static final String SP_MARK_INSTALLED_GAME_USER_HOME = "mark_installed_game_user_home" + PackageUtils.getGhVersionName();
     // 标记安装的游戏为已玩过弹窗（我的游戏最多弹一次）
-    public static final String SP_MARK_INSTALLED_GAME_MY_GAME = "mark_installed_game_my_game" + packageUtilsConfig.getGhVersionName();
+    public static final String SP_MARK_INSTALLED_GAME_MY_GAME = "mark_installed_game_my_game" + PackageUtils.getGhVersionName();
     //视频详情滑动引导
     public static final String SP_SHOW_SLIDE_GUIDE = "show_slide_guide";
     //视频详情点击引导
@@ -143,10 +142,10 @@ public class Constants {
     public static final String SP_REGULATION_TEST_STATUS = "regulation_test_status";
     public static final String SP_REGULATION_TEST_PASS_STATUS = "regulation_test_pass_status";
     //相同设备号，每一种第三方登录方式登录后弹出绑定手机页面的次数
-//    public static final String SP_QQ_SHOW_BIND_PHONE_TIME = "qq_show_bind_phone_time" + HaloApp.getInstance().getGid();
-//    public static final String SP_WECHAT_SHOW_BIND_PHONE_TIME = "wechat_show_bind_phone_time" + HaloApp.getInstance().getGid();
-//    public static final String SP_WEIBO_SHOW_BIND_PHONE_TIME = "weibo_show_bind_phone_time" + HaloApp.getInstance().getGid();
-//    public static final String SP_DOUYIN_SHOW_BIND_PHONE_TIME = "douyin_show_bind_phone_time" + HaloApp.getInstance().getGid();
+    public static final String SP_QQ_SHOW_BIND_PHONE_TIME = "qq_show_bind_phone_time" + HaloApp.getInstance().getGid();
+    public static final String SP_WECHAT_SHOW_BIND_PHONE_TIME = "wechat_show_bind_phone_time" + HaloApp.getInstance().getGid();
+    public static final String SP_WEIBO_SHOW_BIND_PHONE_TIME = "weibo_show_bind_phone_time" + HaloApp.getInstance().getGid();
+    public static final String SP_DOUYIN_SHOW_BIND_PHONE_TIME = "douyin_show_bind_phone_time" + HaloApp.getInstance().getGid();
     //隐私政策是否有更新
     public static final String SP_PRIVACY_CURRENT_MD5 = "sp_privacy_current_md5";
     public static final String SP_PRIVACY_MINE_MD5 = "sp_privacy_mine_md5";
@@ -248,7 +247,6 @@ public class Constants {
     public static final String SP_MY_GAME_GUIDE = "my_game_guide";
     //微信绑定配置信息
     public static final String SP_WECHAT_CONFIG = "wechat_config";
-
     //游戏库导航栏小红点提示
     public static final String SP_GAME_NAVIGATION = "game_navigation";
 
@@ -426,6 +424,4 @@ public class Constants {
     public static final String SP_NIGHT_MODE = "night_mode";
     // 跟随系统模式
     public static final String SP_SYSTEM_MODE = "system_mode";
-
-    public static final String SP_TEST_FLAVOR_CHANNEL = "sp_test_flavor_channel";
 }

app/src/main/java/com/gh/common/constant/ItemViewType.java

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.constant;
+package com.gh.common.constant;
 
 /**
  * Created by LGT on 2016/10/16.

app/src/main/java/com/gh/common/databind/AddKaiFuBindingAdapter.kt

@@ -13,10 +13,10 @@ import android.widget.PopupWindow
 import androidx.core.content.ContextCompat
 import androidx.databinding.BindingAdapter
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.gamecenter.common.callback.OnViewClickListener
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.toDrawable
-import com.gh.gamecenter.common.view.BugFixedPopupWindow
+import com.gh.base.OnViewClickListener
+import com.gh.common.util.dip2px
+import com.gh.common.util.toDrawable
+import com.gh.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.KaifuAddItemBinding
 import com.gh.gamecenter.databinding.LayoutAddKaifuPopupBinding
@@ -87,8 +87,8 @@ object AddKaiFuBindingAdapter {
 
             })
             if (i == list.size - 1) {
-                binding.kaifuAddTime.background = R.drawable.bg_add_kaifu_bottom_left.toDrawable(view.context)
-                binding.kaifuAddServerName.background = R.drawable.bg_add_kaifu_bottom_right.toDrawable(view.context)
+                binding.kaifuAddTime.background = R.drawable.bg_add_kaifu_bottom_left.toDrawable()
+                binding.kaifuAddServerName.background = R.drawable.bg_add_kaifu_bottom_right.toDrawable()
             }
         }
     }

app/src/main/java/com/gh/common/databind/BindingAdapters.java

@@ -19,6 +19,7 @@ import androidx.core.content.ContextCompat;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import com.facebook.drawee.view.SimpleDraweeView;
+import com.gh.base.OnViewClickListener;
 import com.gh.common.constant.Config;
 import com.gh.common.dialog.CertificationDialog;
 import com.gh.common.dialog.PackageCheckDialogFragment;
@@ -28,18 +29,25 @@ import com.gh.common.repository.ReservationRepository;
 import com.gh.common.simulator.SimulatorDownloadManager;
 import com.gh.common.simulator.SimulatorGameManager;
 import com.gh.common.util.CheckLoginUtils;
+import com.gh.common.util.DataUtils;
 import com.gh.common.util.DialogUtils;
+import com.gh.common.util.DisplayUtils;
 import com.gh.common.util.DownloadDialogHelper;
+import com.gh.common.util.ExtensionsKt;
 import com.gh.common.util.GameUtils;
 import com.gh.common.util.GameViewUtils;
+import com.gh.common.util.ImageUtils;
 import com.gh.common.util.LogUtils;
+import com.gh.common.util.MtaHelper;
 import com.gh.common.util.NewsUtils;
+import com.gh.common.util.NumberUtils;
 import com.gh.common.util.PackageInstaller;
 import com.gh.common.util.PackageUtils;
 import com.gh.common.util.PlatformUtils;
 import com.gh.common.util.RealNameHelper;
 import com.gh.common.util.ReservationHelper;
 import com.gh.common.view.DownloadProgressBar;
+import com.gh.common.view.DrawableView;
 import com.gh.common.view.GameIconView;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
@@ -48,14 +56,6 @@ import com.gh.gamecenter.DownloadManagerActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.baselist.LoadStatus;
-import com.gh.gamecenter.common.callback.OnViewClickListener;
-import com.gh.gamecenter.common.utils.ExtensionsKt;
-import com.gh.gamecenter.common.utils.ImageUtils;
-import com.gh.gamecenter.common.utils.NightModeUtils;
-import com.gh.gamecenter.common.view.DrawableView;
-import com.gh.gamecenter.core.utils.DisplayUtils;
-import com.gh.gamecenter.core.utils.MtaHelper;
-import com.gh.gamecenter.core.utils.NumberUtils;
 import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
@@ -428,6 +428,7 @@ public class BindingAdapters {
                             }
                             return;
                         }
+                        DataUtils.onGameLaunchEvent(v.getContext(), gameEntity.getName(), gameEntity.getApk().get(0).getPlatform(), location);
                         PackageUtils.launchApplicationByPackageName(v.getContext(), gameEntity.getApk().get(0).getPackageName());
                     } else {
                         DownloadDialog.showDownloadDialog(
@@ -594,7 +595,7 @@ public class BindingAdapters {
      */
     private static void restoreDialogFragment(DownloadProgressBar progressBar) {
         GamePermissionDialogFragment gamePermissionDialogFragment =
-                ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getName()));
+                ((GamePermissionDialogFragment) ((AppCompatActivity) progressBar.getContext()).getSupportFragmentManager().findFragmentByTag(GamePermissionDialogFragment.class.getSimpleName()));
         if (gamePermissionDialogFragment != null) {
             gamePermissionDialogFragment.dismissAllowingStateLoss();
         }
@@ -651,6 +652,8 @@ public class BindingAdapters {
         ApkEntity apkEntity = gameEntity.getApk().get(0);
         String msg = FileUtils.isCanDownload(progressBar.getContext(), apkEntity.getSize());
         if (TextUtils.isEmpty(msg)) {
+            DataUtils.onGameDownloadEvent(progressBar.getContext(), gameEntity.getName(), apkEntity.getPlatform(), entrance, "下载开始", method);
+
             DownloadManager.createDownload(progressBar.getContext(),
                     apkEntity,
                     gameEntity,
@@ -693,16 +696,15 @@ public class BindingAdapters {
                     tagStyle.add(typeTag);
                 } else {
                     TagStyleEntity typeTag = new TagStyleEntity();
-                    boolean isNightMode = NightModeUtils.INSTANCE.isNightMode(layout.getContext());
                     typeTag.setName(test.getType() != null ? test.getType() : "");
-                    typeTag.setBackground("1AFFA142");
-                    typeTag.setColor(isNightMode ? "EB9238" : "FFA142");
+                    typeTag.setBackground("FFF3E0");
+                    typeTag.setColor("FA8500");
                     tagStyle.add(typeTag);
 
                     TagStyleEntity timeTag = new TagStyleEntity();
                     timeTag.setName(GameViewUtils.getGameTestDate(test.getStart()));
-                    timeTag.setBackground("1A06CEA8");
-                    timeTag.setColor(isNightMode ? "07A385" : "06CEA8");
+                    timeTag.setBackground("E0FFF9");
+                    timeTag.setColor("00A887");
                     tagStyle.add(timeTag);
                 }
             } else {

app/src/main/java/com/gh/common/dialog/ApplyModeratorDialogFragment.kt

@@ -6,12 +6,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.core.utils.SpanBuilder
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.view.CustomLinkMovementMethod
+import com.gh.common.util.EntranceUtils
+import com.gh.common.util.SpanBuilder
+import com.gh.common.util.dip2px
+import com.gh.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.DialogApplyModeratorBinding
 
@@ -27,7 +27,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
         requireArguments().run {
             mGroupNumber = getString(KEY_GROUP_NUMBER) ?: ""
             mGroupKey = getString(KEY_GROUP_KEY) ?: ""
-            mParentTag = getString(EntranceConsts.KEY_PARENT_TAG) ?: ""
+            mParentTag = getString(EntranceUtils.KEY_PARENT_TAG) ?: ""
         }
     }
 
@@ -83,11 +83,11 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                 arguments = Bundle().apply {
                     putString(KEY_GROUP_NUMBER, number)
                     putString(KEY_GROUP_KEY, key)
-                    putString(EntranceConsts.KEY_PARENT_TAG, tag)
+                    putString(EntranceUtils.KEY_PARENT_TAG, tag)
                 }
             }.show(
                 activity.supportFragmentManager,
-                ApplyModeratorDialogFragment::class.java.name
+                ApplyModeratorDialogFragment::class.java.simpleName
             )
         }
     }

app/src/main/java/com/gh/common/dialog/BaseDraggableDialogFragment.kt

@@ -1,11 +1,12 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.common.dialog
 
 import android.annotation.SuppressLint
 import android.app.Dialog
 import android.os.Bundle
 import android.view.*
-import com.gh.gamecenter.common.HaloApp
-import com.gh.gamecenter.common.R
+import com.gh.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.R
+import com.halo.assistant.HaloApp
 
 abstract class BaseDraggableDialogFragment : BaseDialogFragment(), View.OnTouchListener {
     private var mInitPositionY = 0f
@@ -83,7 +84,7 @@ abstract class BaseDraggableDialogFragment : BaseDialogFragment(), View.OnTouchL
 
     override fun onStart() {
         super.onStart()
-        val width = HaloApp.getInstance().resources.displayMetrics.widthPixels
+        val width = HaloApp.getInstance().application.resources.displayMetrics.widthPixels
         val height = dialog?.window?.attributes?.height ?: ViewGroup.LayoutParams.WRAP_CONTENT
         dialog?.window?.setLayout(width, height)
     }

app/src/main/java/com/gh/common/dialog/BaseTrackableDialogFragment.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.base.fragment
+package com.gh.common.dialog
 
 import android.content.DialogInterface
 import android.os.Bundle
@@ -6,7 +6,7 @@ import android.view.KeyEvent
 import android.view.View
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentManager
-import com.gh.gamecenter.core.utils.MtaHelper
+import com.gh.common.util.MtaHelper
 import com.lightgame.dialog.BaseDialogFragment
 import java.util.concurrent.atomic.AtomicBoolean
 

app/src/main/java/com/gh/common/dialog/CertificationDialog.kt

@@ -14,16 +14,12 @@ import android.view.View
 import android.widget.CheckBox
 import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager
-import com.gh.gamecenter.common.avoidcallback.Callback
-import com.gh.gamecenter.common.constant.Constants
+import com.gh.common.avoidcallback.AvoidOnResultManager
+import com.gh.common.avoidcallback.Callback
+import com.gh.common.constant.Constants
 import com.gh.common.util.*
 import com.gh.gamecenter.R
 import com.gh.gamecenter.ShellActivity
-import com.gh.gamecenter.common.callback.ConfirmListener
-import com.gh.gamecenter.common.constant.EntranceConsts
-import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.entity.AuthDialogEntity
 import com.gh.gamecenter.entity.AuthDialogLevel
 import com.gh.gamecenter.entity.GameEntity
@@ -32,7 +28,7 @@ import com.google.gson.reflect.TypeToken
 import com.halo.assistant.fragment.user.UserInfoEditFragment
 import com.lightgame.utils.AppManager
 
-class CertificationDialog(context: Context, private val authDialogEntity: AuthDialogEntity, val gameId: String, val listener: ConfirmListener) :
+class CertificationDialog(context: Context, private val authDialogEntity: AuthDialogEntity, val gameId: String, val listener: DialogUtils.ConfirmListener) :
         Dialog(context, R.style.GhAlertDialog) {
 
     private lateinit var view: View
@@ -138,7 +134,7 @@ class CertificationDialog(context: Context, private val authDialogEntity: AuthDi
                     context,
                     ShellActivity.Type.REAL_NAME_INFO,
                 ).apply {
-                    putExtra(EntranceConsts.KEY_GAME_ID, gameId)
+                    putExtra(EntranceUtils.KEY_GAME_ID, gameId)
                 }, object : Callback {
                     override fun onActivityResult(resultCode: Int, data: Intent?) {
                         if (resultCode == Activity.RESULT_OK && data != null) {
@@ -156,7 +152,7 @@ class CertificationDialog(context: Context, private val authDialogEntity: AuthDi
 
     companion object {
         @JvmStatic
-        fun showCertificationDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
+        fun showCertificationDialog(context: Context, game: GameEntity, listener: DialogUtils.ConfirmListener) {
             //1.先判断是否登录 是执行2 否执行3
             //2.判断是否实名认证 是终止 否执行3
             //3.判断是否需要弹出认证弹窗接口
@@ -172,7 +168,7 @@ class CertificationDialog(context: Context, private val authDialogEntity: AuthDi
         }
 
         @SuppressLint("CheckResult")
-        private fun authDialog(context: Context, game: GameEntity, listener: ConfirmListener) {
+        private fun authDialog(context: Context, game: GameEntity, listener: DialogUtils.ConfirmListener) {
             var authDialog: AuthDialogEntity? = null
             if (game.authDialog != null) {
                 authDialog = game.authDialog

app/src/main/java/com/gh/common/dialog/DeviceRemindDialog.kt

@@ -19,14 +19,10 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.gamecenter.common.constant.Constants
+import com.gh.common.constant.Constants
+import com.gh.common.util.*
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
-import com.gh.gamecenter.core.utils.GsonUtils
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.common.utils.countDownTimer
-import com.gh.gamecenter.core.utils.DisplayUtils
-import com.gh.gamecenter.common.utils.ImageUtils
 import com.gh.gamecenter.databinding.DialogDeviceRemindBinding
 import com.gh.gamecenter.entity.DeviceDialogEntity
 import com.gh.gamecenter.entity.GameEntity

app/src/main/java/com/gh/common/dialog/GameOffServiceDialogFragment.kt

@@ -10,16 +10,18 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.text.HtmlCompat
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.toColor
+import com.gh.common.util.dip2px
+import com.gh.common.util.toColor
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
 import com.gh.gamecenter.entity.GameEntity
 
 // 游戏关闭下载弹窗
-class GameOffServiceDialogFragment : BaseDialogFragment() {
+class GameOffServiceDialogFragment
+//    : BaseTrackableDialogFragment()
+    : BaseDialogFragment() {
 
     private var mDialog: GameEntity.Dialog? = null
     private var mBinding: DialogGameOffServiceBinding? = null
@@ -76,6 +78,14 @@ class GameOffServiceDialogFragment : BaseDialogFragment() {
         return super.onCreateDialog(savedInstanceState).apply { setCanceledOnTouchOutside(true) }
     }
 
+//    override fun getEvent(): String {
+//        return "游戏下载状态按钮"
+//    }
+//
+//    override fun getKey(): String {
+//        return "查看详情弹窗"
+//    }
+
     companion object {
         const val KEY_DIALOG = "dialog"
 

app/src/main/java/com/gh/common/dialog/InstallPermissionDialogFragment.kt

@@ -13,20 +13,16 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentTransaction
 import com.airbnb.lottie.LottieAnimationView
 import com.gh.common.constant.Config
+import com.gh.common.constant.Constants
+import com.gh.common.util.*
+import com.gh.common.util.PermissionHelper.INSTALL_PERMISSION_CODE
 import com.gh.common.xapk.XapkInstaller
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.PermissionHelper
-import com.gh.gamecenter.common.utils.PermissionHelper.INSTALL_PERMISSION_CODE
-import com.gh.gamecenter.common.utils.getExtension
-import com.gh.gamecenter.common.utils.goneIf
-import com.gh.gamecenter.core.utils.SPUtils
 import com.lightgame.download.DownloadEntity
 import com.lightgame.utils.Utils
 import kotlin.random.Random
 
-class InstallPermissionDialogFragment : BaseDialogFragment() {
+class InstallPermissionDialogFragment : BaseTrackableDialogFragment() {
 
     lateinit var mView: View
     var isXapk = false
@@ -59,15 +55,18 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
 
         closeTv.setOnClickListener {
+            MtaHelper.onEvent(getEvent(), getKey(), "文案样式_点击以后再说")
             if (isXapk) {
                 mCallBack?.invoke(false)
             }
             dismiss()
         }
         closeIv.setOnClickListener {
+            MtaHelper.onEvent(getEvent(), getKey(), "图标样式_点击关闭")
             dismiss()
         }
         activateTv.setOnClickListener {
+            MtaHelper.onEvent(getEvent(), getKey(), if (randomNumber == 0) "文案样式_点击立即开启" else "图标样式_点击立即开启")
             PermissionHelper.toInstallPermissionSetting(requireActivity())
             if (isXapk) {
                 SPUtils.setString(Constants.SP_XAPK_UNZIP_ACTIVITY, requireActivity().javaClass.name)
@@ -88,6 +87,10 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
         }
     }
 
+    override fun getEvent(): String = "安装引导弹窗"
+
+    override fun getKey(): String = "引导弹窗"
+
     companion object {
         @JvmStatic
         fun show(activity: AppCompatActivity, downloadEntity: DownloadEntity, callBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)?) {
@@ -114,7 +117,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     return
                 }
             }
-            var installPermissionDialogFragment = activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.name) as? InstallPermissionDialogFragment
+            var installPermissionDialogFragment = activity.supportFragmentManager.findFragmentByTag(InstallPermissionDialogFragment::class.java.simpleName) as? InstallPermissionDialogFragment
             if (installPermissionDialogFragment != null) {
                 installPermissionDialogFragment.mCallBack = callBack
                 installPermissionDialogFragment.isXapk = isXapk
@@ -128,7 +131,7 @@ class InstallPermissionDialogFragment : BaseDialogFragment() {
                     this.isXapk = isXapk
                     this.url = downloadEntity.url
                 }
-                installPermissionDialogFragment.show(activity.supportFragmentManager, InstallPermissionDialogFragment::class.java.name)
+                installPermissionDialogFragment.show(activity.supportFragmentManager, InstallPermissionDialogFragment::class.java.simpleName)
             }
         }
     }

app/src/main/java/com/gh/common/dialog/NotificationHintDialogFragment.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.dialog
+package com.gh.common.dialog
 
 import android.annotation.SuppressLint
 import android.content.ActivityNotFoundException
@@ -10,17 +10,15 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.content.ContextCompat
-import com.alibaba.android.arouter.launcher.ARouter
-import com.gh.gamecenter.common.R
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.common.databinding.DialogNotificationHintBinding
-import com.gh.gamecenter.common.entity.NotificationStyleEntity
-import com.gh.gamecenter.common.entity.NotificationUgc
-import com.gh.gamecenter.common.utils.PermissionHelper
-import com.gh.gamecenter.common.utils.fromHtml
-import com.gh.gamecenter.core.provider.IBuildConfigProvider
-import com.gh.gamecenter.core.utils.GsonUtils
+import com.gh.common.util.GsonUtils
+import com.gh.common.util.MtaHelper
+import com.gh.common.util.PermissionHelper
+import com.gh.common.util.fromHtml
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.R
+import com.gh.gamecenter.databinding.DialogNotificationHintBinding
+import com.gh.gamecenter.entity.NotificationStyleEntity
+import com.gh.gamecenter.entity.NotificationUgc
 import com.lightgame.utils.Utils
 import org.json.JSONArray
 import java.io.BufferedReader
@@ -29,7 +27,7 @@ import java.io.InputStreamReader
 import kotlin.random.Random
 
 // 通知权限弹窗
-class NotificationHintDialogFragment : BaseDialogFragment() {
+class NotificationHintDialogFragment : BaseTrackableDialogFragment() {
 
     private var mNotificationUgc: NotificationUgc? = null
     private val mBinding: DialogNotificationHintBinding by lazy { DialogNotificationHintBinding.inflate(layoutInflater) }
@@ -70,13 +68,14 @@ class NotificationHintDialogFragment : BaseDialogFragment() {
             }
 
             activateTv.setOnClickListener {
+                MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "点击立即开启")
+                MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "${styleEntity.scenes}_${styleEntity.styleNo}_点击立即开启")
                 dismissAllowingStateLoss()
-                val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                     //这种方案适用于 API 26, 即8.0（含8.0）以上可以用
                     val intent = Intent()
                     intent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS
-                    intent.putExtra(Settings.EXTRA_APP_PACKAGE, buildConfig?.getApplicationId())
+                    intent.putExtra(Settings.EXTRA_APP_PACKAGE, BuildConfig.APPLICATION_ID)
                     try {
                         startActivity(intent)
                     } catch (e: ActivityNotFoundException) {
@@ -89,13 +88,25 @@ class NotificationHintDialogFragment : BaseDialogFragment() {
 
             closeIv.setOnClickListener {
                 dismissAllowingStateLoss()
+                MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "点击关闭")
+                MtaHelper.onEventWithBasicDeviceInfo(getEvent(), getKey(), "${styleEntity.scenes}_${styleEntity.styleNo}_点击关闭")
             }
         }
 
         dialog?.setCanceledOnTouchOutside(true)
     }
 
-    private fun getJsonFromAssets(): String {
+    override fun getEvent(): String {
+        return "推送引导弹窗"
+    }
+
+    override fun getKey(): String {
+        return "引导弹窗"
+    }
+
+    override fun trackWithBasicDeviceInfo() = true
+
+    private fun getJsonFromAssets(): String? {
         val stringBuilder = StringBuilder()
         var bufferedReader: BufferedReader? = null
         var inputStreamReader: InputStreamReader? = null

app/src/main/java/com/gh/common/dialog/PackageCheckDialogFragment.kt

@@ -15,16 +15,12 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
-import com.gh.gamecenter.common.constant.Constants
+import com.gh.base.BaseRecyclerViewHolder
+import com.gh.common.constant.Constants
 import com.gh.common.util.*
-import com.gh.common.util.LogUtils
-import com.gh.gamecenter.common.view.CustomLinkMovementMethod
+import com.gh.common.view.CustomLinkMovementMethod
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
-import com.gh.gamecenter.common.callback.ConfirmListener
-import com.gh.gamecenter.common.utils.*
-import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.databinding.FragmentPackageCheckBinding
 import com.gh.gamecenter.databinding.PackageCheckItemBinding
 import com.gh.gamecenter.entity.DetectionObjectEntity
@@ -56,7 +52,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     private var mAdapter: PackageCheckAdapter? = null
     private var mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
     var gameEntity: GameEntity? = null
-    var callBack: ConfirmListener? = null
+    var callBack: DialogUtils.ConfirmListener? = null
 
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
@@ -322,7 +318,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
 
     companion object {
         @JvmStatic
-        fun show(activity: AppCompatActivity, gameEntity: GameEntity, callBack: ConfirmListener) {
+        fun show(activity: AppCompatActivity, gameEntity: GameEntity, callBack: DialogUtils.ConfirmListener) {
             val packageDialogEntity = gameEntity.packageDialog
             if (packageDialogEntity == null) {
                 callBack.onConfirm()
@@ -350,12 +346,12 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
             if (!activity.lifecycle.currentState.isAtLeast(Lifecycle.State.RESUMED)) return
 
             var dialogFragment =
-                activity.supportFragmentManager.findFragmentByTag(PackageCheckDialogFragment::class.java.name) as? PackageCheckDialogFragment
+                activity.supportFragmentManager.findFragmentByTag(PackageCheckDialogFragment::class.java.simpleName) as? PackageCheckDialogFragment
             if (dialogFragment == null) {
                 dialogFragment = PackageCheckDialogFragment()
                 dialogFragment.gameEntity = gameEntity
                 dialogFragment.callBack = callBack
-                dialogFragment.show(activity.supportFragmentManager, PackageCheckDialogFragment::class.java.name)
+                dialogFragment.show(activity.supportFragmentManager, PackageCheckDialogFragment::class.java.simpleName)
             } else {
                 dialogFragment.gameEntity = gameEntity
                 dialogFragment.callBack = callBack

app/src/main/java/com/gh/common/dialog/PrivacyPolicyDialogFragment.kt

@@ -12,14 +12,14 @@ import android.view.*
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.FragmentActivity
 import androidx.fragment.app.FragmentTransaction
+import com.gh.base.fragment.BaseDialogFragment
+import com.gh.common.constant.Constants
+import com.gh.common.util.SPUtils
+import com.gh.common.util.dip2px
+import com.gh.common.util.fromHtml
+import com.gh.common.view.CustomLinkMovementMethod
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
-import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.utils.dip2px
-import com.gh.gamecenter.common.utils.fromHtml
-import com.gh.gamecenter.common.view.CustomLinkMovementMethod
-import com.gh.gamecenter.core.utils.SPUtils
 import com.gh.gamecenter.databinding.DialogPrivacyProtocolBinding
 import com.gh.gamecenter.entity.DialogEntity
 import com.lightgame.utils.AppManager
@@ -167,7 +167,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
         fun show(activity: FragmentActivity,
                  privacyPolicyEntity: DialogEntity.PrivacyPolicyEntity? = null,
                  callBack: ((isSuccess: Boolean) -> Unit)?) {
-            var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(PrivacyPolicyDialogFragment::class.java.name) as? PrivacyPolicyDialogFragment
+            var privacyDialogFragment = activity.supportFragmentManager.findFragmentByTag(PrivacyPolicyDialogFragment::class.java.simpleName) as? PrivacyPolicyDialogFragment
             if (privacyDialogFragment != null) {
                 privacyDialogFragment.mCallBack = callBack
                 val transaction: FragmentTransaction = activity.supportFragmentManager.beginTransaction()
@@ -183,7 +183,7 @@ class PrivacyPolicyDialogFragment : BaseDialogFragment() {
             }
             privacyDialogFragment.show(
                 activity.supportFragmentManager,
-                PrivacyPolicyDialogFragment::class.java.name
+                PrivacyPolicyDialogFragment::class.java.simpleName
             )
         }
     }

app/src/main/java/com/gh/common/dialog/ReserveDialogFragment.kt

@@ -0,0 +1,384 @@
+//package com.gh.common.dialog
+//
+//import android.annotation.SuppressLint
+//import android.app.Application
+//import android.os.Bundle
+//import android.text.Html
+//import android.view.*
+//import android.view.animation.AnimationUtils
+//import android.widget.EditText
+//import android.widget.TextView
+//import androidx.lifecycle.AndroidViewModel
+//import androidx.lifecycle.MutableLiveData
+//import androidx.lifecycle.Observer
+//import butterknife.BindView
+//import butterknife.ButterKnife
+//import butterknife.OnClick
+//import com.gh.base.fragment.BaseDialogFragment
+//import com.gh.common.AppExecutor
+//import com.gh.common.constant.Config
+//import com.gh.common.history.HistoryHelper
+//import com.gh.common.repository.ReservationRepository
+//import com.gh.common.util.*
+//import com.gh.gamecenter.R
+//import com.gh.gamecenter.entity.GameEntity
+//import com.gh.gamecenter.entity.NotificationUgc
+//import com.gh.gamecenter.manager.UserManager
+//import com.gh.gamecenter.retrofit.BiResponse
+//import com.gh.gamecenter.retrofit.RetrofitManager
+//import com.halo.assistant.HaloApp
+//import com.lightgame.utils.Utils
+//import io.reactivex.android.schedulers.AndroidSchedulers
+//import io.reactivex.schedulers.Schedulers
+//import okhttp3.ResponseBody
+//import org.json.JSONArray
+//import org.json.JSONObject
+//
+//// 预约弹窗
+//@Deprecated("v5.6.0废弃")
+//class ReserveDialogFragment
+//    : BaseDialogFragment(), KeyboardHeightObserver {
+////    : BaseTrackableDialogFragment() {
+//
+//    @BindView(R.id.reserve_hint_tv)
+//    lateinit var reserveHintTv: TextView
+//
+//    @BindView(R.id.reserve_content_tv)
+//    lateinit var reserveContentTv: TextView
+//
+//    @BindView(R.id.reserve_completed_content_tv)
+//    lateinit var reserveCompletedContentTv: TextView
+//
+//    @BindView(R.id.mobile_et)
+//    lateinit var mobileEt: EditText
+//
+//    @BindView(R.id.reserve_container)
+//    lateinit var reserveContainer: View
+//
+//    @BindView(R.id.reserve_completed_container)
+//    lateinit var reserveCompletedContainer: View
+//
+//    @BindView(R.id.customizable_btn)
+//    lateinit var customizableBtn: TextView
+//
+//    @BindView(R.id.content_container)
+//    lateinit var contentContainer: View
+//
+//    @BindView(R.id.mobile_index_container)
+//    lateinit var mobileIndexContainer: View
+//
+//    @BindView(R.id.mobile_index_reserve)
+//    lateinit var mobileIndexReserve: TextView
+//
+//    @BindView(R.id.mobile_index_user)
+//    lateinit var mobileIndexUser: TextView
+//
+//    @BindView(R.id.mobile_et_delete)
+//    lateinit var mobileEtDelete: View
+//
+//    @BindView(R.id.layout_container)
+//    lateinit var layoutContainer: View
+//
+//    private lateinit var mViewModel: ReserveViewModel
+//
+//    var successCallback: SuccessCallback? = null
+//
+//    private var mGame: GameEntity? = null
+//    private var mGameId: String = ""
+//    private var mGameName: String = ""
+//
+//    private var mKeyboardHeightProvider: KeyboardHeightProvider? = null
+//
+//    override fun onCreate(savedInstanceState: Bundle?) {
+//        super.onCreate(savedInstanceState)
+//
+//        mGame = requireArguments().getParcelable(EntranceUtils.KEY_GAME)
+//        mGameId = mGame?.id ?:""
+//        mGameName = mGame?.name ?:""
+//
+//        mViewModel = viewModelProvider()
+//        mKeyboardHeightProvider = KeyboardHeightProvider(activity)
+//        mKeyboardHeightProvider?.start()
+//    }
+//
+//    override fun onActivityCreated(savedInstanceState: Bundle?) {
+//        super.onActivityCreated(savedInstanceState)
+//        dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
+//    }
+//
+//    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+//        return inflater.inflate(R.layout.dialog_reserve_game, null)
+//    }
+//
+////    override fun getEvent(): String {
+////        return "预约游戏"
+////    }
+////
+////    override fun getKey(): String {
+////        return "预约功能操作"
+////    }
+//
+//    @Suppress("DEPRECATION")
+//    @SuppressLint("SetTextI18n")
+//    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+//        super.onViewCreated(view, savedInstanceState)
+//        ButterKnife.bind(this, view)
+//
+//        val reserveContent = "游戏上线，您将收到<font color='#1383EB'>免费短信</font>提醒"
+//        reserveContentTv.text = Html.fromHtml(reserveContent)
+//
+//
+//        mobileEt.setTextChangedListener { s, _, _, _ ->
+//            mobileIndexContainer.visibility = View.GONE
+//            mobileEtDelete.goneIf(s.trim().isEmpty())
+//        }
+//
+//        mViewModel.reservation.observeNonNull(this) {
+//            if (it.success) {
+//                showSuccessDialog(it.withMobile, it.boundWechat)
+//                successCallback?.onSuccess()
+//                HistoryHelper.insertGameEntity(mGame!!)
+//            }
+//        }
+//
+//        mViewModel.reserveMobile.observe(viewLifecycleOwner, Observer {
+//            setMobileIndexHint(it)
+//        })
+//
+//        dialog?.setCanceledOnTouchOutside(true)
+//    }
+//
+//    private fun showSuccessDialog(withMobile: Boolean, boundWechat: Boolean) {
+//        reserveHintTv.text = "游戏预约成功"
+//        reserveContainer.visibility = View.GONE
+//        reserveCompletedContainer.visibility = View.VISIBLE
+//
+//        val reservation = Config.getSettings()?.appointment
+//        val dialogConfig = if (withMobile) reservation?.withMobile else reservation?.withoutMobile
+//
+//        reserveCompletedContentTv.text = dialogConfig?.htmlContent?.fromHtml()
+//        if (dialogConfig?.text.isNullOrEmpty()
+//                || (dialogConfig?.type == "wechat_bind" && boundWechat)) {
+//            customizableBtn.visibility = View.GONE
+//        } else {
+//            customizableBtn.text = dialogConfig?.text
+//            customizableBtn.setOnClickListener {
+////                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击跳转按钮")
+//                DirectUtils.directToLinkPage(
+//                        requireContext(),
+//                        dialogConfig!!.toLinkEntity(),
+//                        "(游戏预约)",
+//                        "")
+//                dismissAllowingStateLoss()
+//            }
+//        }
+//    }
+//
+//    private fun setMobileIndexHint(reserveMobile: String?) {
+//        var userMobile = UserManager.getInstance().userInfoEntity?.mobile
+//        if (reserveMobile == userMobile) userMobile = null
+//
+//        if (!reserveMobile.isNullOrEmpty()) {
+//            mobileIndexReserve.visibility = View.VISIBLE
+//            mobileIndexReserve.text = reserveMobile
+//        } else {
+//            mobileIndexReserve.visibility = View.GONE
+//        }
+//
+//        if (!userMobile.isNullOrEmpty()) {
+//            mobileIndexUser.visibility = View.VISIBLE
+//            mobileIndexUser.text = userMobile
+//        } else {
+//            mobileIndexUser.visibility = View.GONE
+//        }
+//        mobileIndexContainer.goneIf(mobileIndexUser.visibility == View.GONE && mobileIndexReserve.visibility == View.GONE)
+//        if (mobileIndexContainer.visibility ==View.VISIBLE) {
+//            mobileIndexContainer.animation = AnimationUtils.loadAnimation(requireContext(), R.anim.reserve_dialog_index_anim)
+//        }
+//    }
+//
+//    @OnClick(R.id.reserve_with_mobile_btn,
+//            R.id.reserve_without_mobile_btn,
+//            R.id.content_container,
+//            R.id.close_btn,
+//            R.id.customizable_btn,
+//            R.id.mobile_index_reserve,
+//            R.id.mobile_index_user,
+//            R.id.mobile_et_delete,
+//            R.id.mobile_et,
+//            R.id.layout_container)
+//    fun onClick(view: View) {
+//        when (view.id) {
+//            R.id.reserve_without_mobile_btn -> {
+////                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击无手机号预约")
+//                if (mobileIndexContainer.visibility == View.VISIBLE) {
+//                    mobileIndexContainer.visibility = View.GONE
+//                    return
+//                }
+//
+//                mViewModel.reserve(gameId = mGameId, gameName = mGameName)
+//            }
+//
+//            R.id.reserve_with_mobile_btn -> {
+//                if (mobileIndexContainer.visibility == View.VISIBLE) {
+//                    mobileIndexContainer.visibility = View.GONE
+//                    return
+//                }
+//
+//                val mobile = mobileEt.text.toString()
+//                if (mobile.length < 11 || !mobile.startsWith("1")) {
+//                    Utils.toast(context, "手机号格式错误，请检查并重新输入")
+//                    return
+//                }
+//
+////                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击立即预约")
+//                mViewModel.reserve(gameId = mGameId, gameName = mGameName, mobile = mobile)
+//            }
+//
+//            R.id.close_btn -> {
+////                MtaHelper.onEvent("预约游戏", "预约功能操作", "点击关闭")
+//                dismissAllowingStateLoss()
+//                AppExecutor.uiExecutor.executeWithDelay(Runnable {
+//                    NotificationHelper.showNotificationHintDialog(NotificationUgc.RESERVE_GAME)
+//                }, 1000)
+//            }
+//            R.id.content_container -> {
+//                mobileIndexContainer.visibility = View.GONE
+//            }
+//            R.id.mobile_index_reserve -> {
+//                mobileEt.setText(mobileIndexReserve.text.toString())
+//                mobileEt.setSelection(mobileEt.text.length)
+//                mobileIndexContainer.visibility = View.GONE
+//            }
+//            R.id.mobile_index_user -> {
+//                mobileEt.setText(mobileIndexUser.text.toString())
+//                mobileEt.setSelection(mobileEt.text.length)
+//                mobileIndexContainer.visibility = View.GONE
+//            }
+//            R.id.mobile_et_delete -> {
+//                mobileEt.setText("")
+//            }
+//            R.id.mobile_et -> {
+//                mobileIndexContainer.visibility = View.GONE
+//            }
+//            R.id.layout_container -> {
+//                dismissAllowingStateLoss()
+//            }
+//        }
+//    }
+//
+//    override fun onResume() {
+//        super.onResume()
+//        if (HaloApp.getInstance().mCacheKeyboardHeight > 0) {
+//            val attributes = dialog?.window?.attributes
+//            val heightPixels = requireContext().resources.displayMetrics.heightPixels
+//            val mCacheKeyboardHeight = HaloApp.getInstance().mCacheKeyboardHeight
+//            val statusBarHeight = DisplayUtils.getStatusBarHeight(requireContext().resources)
+//            dialog?.window?.attributes?.height = heightPixels - mCacheKeyboardHeight - statusBarHeight
+//            attributes?.gravity = Gravity.TOP
+//            dialog?.window?.attributes = attributes
+//        }
+//        mKeyboardHeightProvider?.setKeyboardHeightObserver(this)
+//    }
+//
+//    override fun onPause() {
+//        super.onPause()
+//        mKeyboardHeightProvider?.setKeyboardHeightObserver(null)
+//    }
+//
+//    override fun onDestroy() {
+//        super.onDestroy()
+//        mKeyboardHeightProvider?.close()
+//    }
+//
+//    override fun onKeyboardHeightChanged(height: Int, orientation: Int) {
+//        if (height > 0) {
+//            val attributes = dialog?.window?.attributes
+//            attributes?.gravity = Gravity.CENTER
+//            dialog?.window?.attributes = attributes
+//            HaloApp.getInstance().mCacheKeyboardHeight = height
+//        }
+//    }
+//
+//    companion object {
+//        @JvmStatic
+//        fun getInstance(gameEntity: GameEntity, successCallback: SuccessCallback) = ReserveDialogFragment().apply {
+//            arguments = Bundle().apply {
+//                putParcelable(EntranceUtils.KEY_GAME, gameEntity)
+//            }
+//            this.successCallback = successCallback
+//        }
+//    }
+//
+//    interface SuccessCallback {
+//        fun onSuccess()
+//    }
+//}
+//
+//class ReserveViewModel(application: Application) : AndroidViewModel(application) {
+//    val reservation = MutableLiveData<Reservation>()
+//
+//    val reserveMobile = MutableLiveData<String>()
+//
+//    init {
+//        getAppointmentMobile()
+//    }
+//
+//    @SuppressLint("CheckResult")
+//    fun reserve(gameId: String, gameName: String, mobile: String = "") {
+//
+//        val requestMap = hashMapOf<String, String>()
+//        requestMap["game_id"] = gameId
+//        if (mobile.isNotEmpty()) {
+//            requestMap["mobile"] = mobile
+//        }
+//
+//        RetrofitManager.getInstance().api
+//                .createNewGameReservation(requestMap.createRequestBody())
+//                .subscribeOn(Schedulers.io())
+//                .subscribe(object : BiResponse<ResponseBody>() {
+//                    override fun onSuccess(data: ResponseBody) {
+//                        var boundWechat = false
+//                        tryWithDefaultCatch {
+//                            boundWechat = JSONObject(data.string() ?: "").getBoolean("wechat_bind")
+//                        }
+//
+//                        reservation.postValue(Reservation(success = true, withMobile = mobile.isNotEmpty(), boundWechat = boundWechat))
+//                        ReservationRepository.addReservationToMemoryAndRefresh(gameId)
+//
+////                        MtaHelper.onEvent("预约游戏", "预约", gameName)
+//                    }
+//
+//                    override fun onFailure(exception: Exception) {
+//                        Utils.toast(getApplication(), exception.message)
+//                    }
+//                })
+//    }
+//
+//    @SuppressLint("CheckResult")
+//    private fun getAppointmentMobile() {
+//        RetrofitManager.getInstance().api
+//                .getAppointmentMobile(UserManager.getInstance().userId)
+//                .subscribeOn(Schedulers.io())
+//                .observeOn(AndroidSchedulers.mainThread())
+//                .subscribe(object : BiResponse<ResponseBody>() {
+//                    override fun onSuccess(data: ResponseBody) {
+//                        var mobile: String? = null
+//                        tryCatchInRelease {
+//                            val jsonArray = JSONArray(data.string())
+//                            if (jsonArray.length() > 0) {
+//                                mobile = jsonArray.get(0).toString()
+//                            }
+//                        }
+//
+//                        reserveMobile.postValue(mobile)
+//                    }
+//
+//                    override fun onFailure(exception: Exception) {
+//                        reserveMobile.postValue(null)
+//                    }
+//                })
+//    }
+//
+//    class Reservation(var success: Boolean = false, var withMobile: Boolean = false, var boundWechat: Boolean = false)
+//}

app/src/main/java/com/gh/common/dialog/TrackableDialog.kt

@@ -1,10 +1,10 @@
-package com.gh.gamecenter.common.base
+package com.gh.common.dialog
 
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
 import android.view.KeyEvent
-import com.gh.gamecenter.core.utils.MtaHelper
+import com.gh.common.util.MtaHelper
 import java.util.concurrent.atomic.AtomicBoolean
 
 open class TrackableDialog(context: Context,

app/src/main/java/com/gh/common/exposure/ExposureConverters.kt

@@ -1,9 +1,8 @@
 package com.gh.common.exposure
 
 import androidx.room.TypeConverter
-import com.gh.gamecenter.common.entity.ExposureEntity
-import com.gh.gamecenter.common.exposure.meta.Meta
-import com.gh.gamecenter.core.utils.GsonUtils
+import com.gh.common.exposure.meta.Meta
+import com.gh.common.util.GsonUtils
 import java.util.*
 import kotlin.collections.ArrayList
 

app/src/main/java/com/gh/common/exposure/ExposureEntity.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.entity
+package com.gh.common.exposure
 
 import android.os.Parcelable
 import androidx.annotation.Keep
@@ -64,19 +64,7 @@ data class ExposureEntity(
     @SerializedName("dialog_id")
     var welcomeDialogId: String? = null,
     @SerializedName("link_title")
-    var welcomeDialogLinkTitle: String? = null,
-
-    //v5.10 补充
-    @SerializedName("control_type")
-    var controlType: String? = null,
-    @SerializedName("control_name")
-    var controlName: String? = null,
-    //跳转链接类型 如：游戏专题
-    @SerializedName("control_link_type")
-    var controlLinkType: String? = null,
-    //跳转链接标题 如：热门好游
-    @SerializedName("control_link_name")
-    var controlLinkName: String? = null,
+    var welcomeDialogLinkTitle: String? = null
 ) : Parcelable {
 
     fun setContainerInfo(id: String?, type: String?) {

app/src/main/java/com/gh/common/exposure/ExposureEvent.kt

@@ -4,13 +4,12 @@ import android.os.Parcelable
 import androidx.annotation.Keep
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.common.exposure.meta.Meta
-import com.gh.gamecenter.common.exposure.meta.MetaUtil
+import com.gh.common.constant.Constants
+import com.gh.common.exposure.meta.Meta
+import com.gh.common.exposure.meta.MetaUtil
 import com.gh.common.exposure.time.TimeUtil
-import com.gh.gamecenter.common.utils.getFirstElementDividedByDivider
+import com.gh.common.util.getFirstElementDividedByDivider
 import com.gh.download.server.BrowserInstallHelper
-import com.gh.gamecenter.common.entity.ExposureEntity
 import com.gh.gamecenter.entity.GameEntity
 import com.lightgame.download.DownloadEntity
 import kotlinx.parcelize.Parcelize

app/src/main/java/com/gh/common/exposure/ExposureManager.kt

@@ -1,11 +1,10 @@
 package com.gh.common.exposure
 
 import com.aliyun.sls.android.producer.Log
-import com.gh.gamecenter.common.loghub.LoghubHelper
-import com.gh.gamecenter.common.utils.toJson
-import com.gh.gamecenter.common.utils.tryWithDefaultCatch
+import com.gh.common.loghub.LoghubHelper
+import com.gh.common.util.toJson
+import com.gh.common.util.tryWithDefaultCatch
 import com.gh.gamecenter.BuildConfig
-import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 import java.util.concurrent.ExecutorService
@@ -127,4 +126,19 @@ object ExposureManager {
         logTime = event.time.toLong()
     }
 
+    class FixedSizeLinkedHashSet<T>(var maxSize: Int) : LinkedHashSet<T>() {
+        override fun add(element: T): Boolean {
+            if (size == maxSize) {
+                pop()
+            }
+            return super.add(element);
+        }
+
+        private fun pop() {
+            if (size > 0) {
+                remove(iterator().next())
+            }
+        }
+    }
+
 }

app/src/main/java/com/gh/common/exposure/ExposureUtils.kt

@@ -3,8 +3,7 @@ package com.gh.common.exposure
 import android.text.TextUtils
 import com.g00fy2.versioncompare.Version
 import com.gh.common.util.PackageUtils
-import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
-import com.gh.gamecenter.common.utils.toObject
+import com.gh.common.util.toObject
 import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.GameEntity
 import com.halo.assistant.HaloApp
@@ -12,7 +11,7 @@ import com.lightgame.download.DownloadEntity
 
 object ExposureUtils {
 
-    private val mDownloadCompleteTraceEventIdSet = FixedSizeLinkedHashSet<String>(3)
+    private val mDownloadCompleteTraceEventIdSet = ExposureManager.FixedSizeLinkedHashSet<String>(3)
 
     @JvmStatic
     fun logADownloadExposureEvent(

app/src/main/java/com/gh/common/exposure/meta/Meta.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.exposure.meta
+package com.gh.common.exposure.meta
 
 import android.os.Parcelable
 import androidx.annotation.Keep

app/src/main/java/com/gh/common/exposure/meta/MetaUtil.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.exposure.meta
+package com.gh.common.exposure.meta
 
 import android.Manifest
 import android.app.Application
@@ -9,20 +9,17 @@ import android.os.Build
 import android.provider.Settings
 import android.telephony.TelephonyManager
 import android.text.TextUtils
-import com.alibaba.android.arouter.launcher.ARouter
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.common.utils.tryWithDefaultCatch
-import com.gh.gamecenter.common.HaloApp
-import com.gh.gamecenter.common.constant.RouteConsts
-import com.gh.gamecenter.core.provider.IAppProvider
-import com.gh.gamecenter.core.provider.IBuildConfigProvider
-import com.gh.gamecenter.core.provider.IUserManagerProvider
+import com.gh.common.constant.Constants
+import com.gh.common.util.SPUtils
+import com.gh.common.util.tryWithDefaultCatch
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.manager.UserManager
+import com.halo.assistant.HaloApp
 import com.walkud.rom.checker.RomIdentifier
 
 object MetaUtil {
 
-    private val application: Application = HaloApp.getInstance()
+    private val application: Application = HaloApp.getInstance().application
     private var channel = ""
 
     private var m: Meta? = null
@@ -42,27 +39,23 @@ object MetaUtil {
                 romVersion = RomIdentifier.getRom().versionName
             }
         }
-        val appProvider = ARouter.getInstance().build(RouteConsts.provider.app).navigation() as? IAppProvider
-        val buildConfigProvider = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
-        val userManagerProvider = ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider
-        m = Meta(
-            mac = null,
-            jnfj = getBase64EncodedIMEI(),
-            model = getModel(),
-            manufacturer = getManufacturer(),
-            dia = getBase64EncodedAndroidId(),
-            android_sdk = getAndroidSDK(),
-            android_version = getAndroidVersion(),
-            network = getNetwork(),
-            os = getOS(),
-            gid = appProvider?.getGid(),
-            oaid = appProvider?.getOaid(),
-            channel = getChannel(),
-            appVersion = buildConfigProvider?.getVersionName(),
-            userId = userManagerProvider?.getUserId(),
-            exposureVersion = buildConfigProvider?.getExposureVersion(),
-            rom = romName + "" + romVersion
-        )
+
+        m = Meta(mac = null,
+                jnfj = getBase64EncodedIMEI(),
+                model = getModel(),
+                manufacturer = getManufacturer(),
+                dia = getBase64EncodedAndroidId(),
+                android_sdk = getAndroidSDK(),
+                android_version = getAndroidVersion(),
+                network = getNetwork(),
+                os = getOS(),
+                gid = HaloApp.getInstance().gid,
+                oaid = HaloApp.getInstance().oaid,
+                channel = getChannel(),
+                appVersion = BuildConfig.VERSION_NAME,
+                userId = UserManager.getInstance().userId,
+                exposureVersion = BuildConfig.EXPOSURE_VERSION,
+                rom = romName + "" + romVersion)
     }
 
     fun getMeta(): Meta {
@@ -73,8 +66,7 @@ object MetaUtil {
     }
 
     private fun getChannel(): String? {
-        val appProvider = ARouter.getInstance().build(RouteConsts.provider.app).navigation() as? IAppProvider
-        return appProvider?.getChannel()
+        return HaloApp.getInstance().channel
     }
 
     /**
@@ -82,8 +74,8 @@ object MetaUtil {
      */
     @JvmStatic
     fun getIMEI(): String {
-        val appProvider = ARouter.getInstance().build(RouteConsts.provider.app).navigation() as? IAppProvider
-        if (appProvider?.isUserAcceptPrivacyPolicy(HaloApp.getInstance()) == false) {
+
+        if (!HaloApp.isUserAcceptPrivacyPolicy(HaloApp.getInstance().application)) {
             return ""
         }
 
@@ -168,8 +160,8 @@ object MetaUtil {
 
     @JvmStatic
     fun getAndroidId(): String {
-        val appProvider = ARouter.getInstance().build(RouteConsts.provider.app).navigation() as? IAppProvider
-        if (appProvider?.isUserAcceptPrivacyPolicy(HaloApp.getInstance()) == false) {
+
+        if (!HaloApp.isUserAcceptPrivacyPolicy(HaloApp.getInstance().application)) {
             return ""
         }
 
@@ -211,7 +203,7 @@ object MetaUtil {
             return "unknown"
 
         val activeNetwork = (application.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager).activeNetworkInfo
-            ?: return "unknown"
+                ?: return "unknown"
 
         return when (activeNetwork.type) {
             ConnectivityManager.TYPE_WIFI -> "Wifi"

app/src/main/java/com/gh/common/filter/RegionSettingHelper.kt

@@ -1,14 +1,14 @@
 package com.gh.common.filter
 
 import android.annotation.SuppressLint
-import com.gh.gamecenter.common.constant.Constants
-import com.gh.gamecenter.core.utils.SPUtils
-import com.gh.gamecenter.common.utils.debounceActionWithInterval
-import com.gh.gamecenter.common.utils.toJson
-import com.gh.gamecenter.common.utils.toObject
+import com.gh.common.constant.Constants
+import com.gh.common.util.SPUtils
+import com.gh.common.util.debounceActionWithInterval
+import com.gh.common.util.toJson
+import com.gh.common.util.toObject
 import com.gh.gamecenter.R
 import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.functions.Function

app/src/main/java/com/gh/common/history/HistoryHelper.kt

@@ -1,10 +1,10 @@
 package com.gh.common.history
 
-import com.gh.gamecenter.common.utils.clearHtmlFormatCompletely
-import com.gh.gamecenter.common.utils.removeInsertedContent
-import com.gh.gamecenter.common.utils.removeVideoContent
-import com.gh.gamecenter.common.utils.tryCatchInRelease
-import com.gh.gamecenter.core.runOnIoThread
+import com.gh.common.runOnIoThread
+import com.gh.common.util.clearHtmlFormatCompletely
+import com.gh.common.util.removeInsertedContent
+import com.gh.common.util.removeVideoContent
+import com.gh.common.util.tryCatchInRelease
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.qa.entity.AnswerDetailEntity
 import com.gh.gamecenter.qa.entity.AnswerEntity
@@ -108,7 +108,7 @@ object HistoryHelper {
 
     @JvmStatic
     fun deleteGamesCollectionEntity(gameCollectionId: String) {
-        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gamesCollectionDao().deleteGamesCollection(GamesCollectionEntity(id = gameCollectionId)) } }
+        runOnIoThread { tryCatchInRelease { HistoryDatabase.instance.gamesCollectionDao().deleteGamesCollection(GamesCollectionEntity(id = gameCollectionId)) }}
     }
 
 

app/src/main/java/com/gh/common/iinterface/IOffsetable.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.core.iinterface
+package com.gh.common.iinterface
 
 @Suppress("SpellCheckingInspection")
 interface IOffsetable {

app/src/main/java/com/gh/common/iinterface/IScrollable.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.core.iinterface
+package com.gh.common.iinterface
 
 interface IScrollable {
     fun scrollToTop()

app/src/main/java/com/gh/common/im/ImHintHelper.kt

@@ -0,0 +1,67 @@
+//package com.gh.common.im
+//
+//import android.app.Activity
+//import androidx.core.view.ViewCompat
+//import android.view.View
+//import android.view.ViewGroup
+//
+//object ImHintHelper {
+//
+//    @JvmStatic
+//    fun show(activity: Activity?) {
+//        activity?.let {
+//            var hintView = retrieveHintViewFromActivity(it)
+//            if (hintView == null) {
+//                hintView = ImHintView(it)
+//                hintView.showDot(ImManager.shouldShowFloatingWindowDot)
+//
+//                val decorView = it.window.decorView as ViewGroup
+//                it.runOnUiThread {
+//                    decorView.addView(hintView)
+//                }
+//            } else {
+//                hintView.showDot(ImManager.shouldShowFloatingWindowDot)
+//            }
+//        }
+//    }
+//
+//    @JvmStatic
+//    fun dismiss(activity: Activity?) {
+//        activity?.let {
+//            clearCurrent(it)
+//        }
+//    }
+//
+//    private fun retrieveHintViewFromActivity(activity: Activity?) : ImHintView? {
+//        (activity?.window?.decorView as? ViewGroup)?.let {
+//            for (i in 0..it.childCount) {
+//                val childView = if (it.getChildAt(i) is ImHintView) it.getChildAt(i) as ImHintView else null
+//                if (childView != null && childView.windowToken != null) {
+//                    return childView
+//                }
+//            }
+//            return null
+//        }
+//        return null
+//    }
+//
+//    private fun clearCurrent(activity: Activity?) {
+//        (activity?.window?.decorView as? ViewGroup)?.let {
+//            for (i in 0..it.childCount) {
+//                val childView = if (it.getChildAt(i) is ImHintView) it.getChildAt(i) as ImHintView else null
+//                if (childView != null && childView.windowToken != null) {
+//                    ViewCompat.animate(childView).alpha(0f).withEndAction(getRemoveViewRunnable(childView))
+//                }
+//            }
+//        }
+//    }
+//
+//    private fun getRemoveViewRunnable(childView: View?): Runnable {
+//        return Runnable {
+//            childView?.let {
+//                (childView.parent as? ViewGroup)?.removeView(childView)
+//            }
+//        }
+//    }
+//
+//}

app/src/main/java/com/gh/common/im/ImHintView.kt

@@ -0,0 +1,45 @@
+//package com.gh.common.im
+//
+//import android.app.Activity
+//import android.content.Context
+//import android.util.AttributeSet
+//import android.util.TypedValue
+//import android.view.View
+//import android.widget.RelativeLayout
+//import androidx.core.view.ViewCompat
+//import com.gh.common.util.DisplayUtils
+//import com.gh.gamecenter.R
+//import kotlinx.android.synthetic.main.view_im_hint.view.*
+//
+//class ImHintView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
+//    : RelativeLayout(context, attrs, defStyle) {
+//
+//    init {
+//        inflate(context, R.layout.view_im_hint, this)
+//
+//        ViewCompat.setTranslationZ(this, Integer.MAX_VALUE.toFloat() - 1)
+//
+//        ivContainer.setOnClickListener {
+//            if (context is Activity) {
+//                ImManager.startChatActivity(context)
+//                ImManager.removeNotification()
+//            }
+//        }
+//
+//        val lp = ivContainer.layoutParams as RelativeLayout.LayoutParams
+//
+//        lp.setMargins(0, 0, dp2px(30f), dp2px(106f) + DisplayUtils.retrieveNavigationHeight(context))
+//    }
+//
+//    fun showDot(show: Boolean) {
+//        if (show) {
+//            unreadDot.visibility = View.VISIBLE
+//        } else {
+//            unreadDot.visibility = View.GONE
+//        }
+//    }
+//
+//    private fun dp2px(dp: Float): Int {
+//        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.applicationContext.resources.displayMetrics).toInt()
+//    }
+//}

app/src/main/java/com/gh/common/im/ImManager.kt

@@ -0,0 +1,145 @@
+package com.gh.common.im
+
+import android.app.Activity
+import com.gh.gamecenter.HelpAndFeedbackActivity
+import com.gh.gamecenter.MainActivity
+import com.gh.gamecenter.MessageActivity
+
+object ImManager {
+
+    const val IM_KEY = "893be270-9c75-11e8-a344-212975ba32b9"
+    const val SP_FLOATING_WINDOW_KEY = "IM_FLOATING_WINDOW"
+    const val SP_FLOATING_WINDOW_DOT_KEY = "IM_FLOATING_WINDOW_DOT"
+
+    var shouldShowFloatingWindow = false
+    var shouldShowFloatingWindowDot = false
+
+    // 记录当前用户 ID 避免重复初始化
+    var currentUserId = ""
+
+    @JvmStatic
+    fun attachIm() {
+//        try {
+//            if (UserManager.getInstance().userInfoEntity != null &&
+//                    currentUserId != UserManager.getInstance().userId) {
+//                currentUserId = UserManager.getInstance().userId
+//                MoorUtils.init(HaloApp.getInstance().application)
+//                Utils.init(HaloApp.getInstance().application)
+//                IMChatManager.getInstance().init(
+//                        HaloApp.getInstance().application,
+//                        ImReceiver.UNIQUE_BROADCAST_ACTION,
+//                        IM_KEY,
+//                        UserManager.getInstance().userInfoEntity?.name + "(" + UserManager.getInstance().userId + ")",
+//                        UserManager.getInstance().userId)
+//
+//                shouldShowFloatingWindow = SPUtils.getBoolean(SP_FLOATING_WINDOW_KEY + UserManager.getInstance().userId)
+//                shouldShowFloatingWindowDot = SPUtils.getBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId)
+//                updateFloatingWindow()
+//            }
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//        }
+    }
+
+    @JvmStatic
+    fun detachIm() {
+//        try {
+//            IMChatManager.getInstance().quitSDk()
+//            shouldShowFloatingWindow = false
+//            updateFloatingWindow()
+//            removeNotification()
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//        }
+    }
+
+    @JvmStatic
+    fun startChatActivity(activity: Activity, inputContent: String? = "", requestCode: Int? = null) {
+//        if (!UserManager.getInstance().userId.isNullOrEmpty()) {
+//            try {
+//                SPUtils.setBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId, false)
+//                shouldShowFloatingWindowDot = false
+//                val chatHelper = KfStartHelper(activity, UserManager.getInstance().userInfoEntity?.icon, inputContent, requestCode)
+//                chatHelper.initSdkChat(
+//                        ImReceiver.UNIQUE_BROADCAST_ACTION,
+//                        IM_KEY,
+//                        UserManager.getInstance().userInfoEntity?.name + "(" + UserManager.getInstance().userId + ")"
+//                                + "[" + BuildConfig.VERSION_NAME + "]",
+//                        UserManager.getInstance().userId)
+//            } catch (e: Exception) {
+//                e.printStackTrace()
+//            }
+//        }
+    }
+
+    @JvmStatic
+    fun showFloatingWindow() {
+        updateShouldShowFloatingWindow(true)
+        updateShouldShowFloatingWindowDot(true)
+        updateFloatingWindow()
+    }
+
+    @JvmStatic
+    fun dismissFloatingWindow() {
+        updateShouldShowFloatingWindow(false)
+        updateShouldShowFloatingWindowDot(false)
+        updateFloatingWindow()
+    }
+
+    @JvmStatic
+    fun removeNotification() {
+//        val notificationManager = HaloApp.getInstance().application?.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+//        notificationManager.cancel(ImReceiver.NOTIFICATION_ID)
+    }
+
+    @JvmStatic
+    fun updateFloatingWindow() {
+//        try {
+//            CurrentActivityHolder.getCurrentActivity()?.let {
+//                if (isActivityValid(it)) {
+//                    if (shouldShowFloatingWindow) {
+//                        ImHintHelper.show(it)
+//                    } else {
+//                        ImHintHelper.dismiss(it)
+//                        removeNotification()
+//                    }
+//                }
+//            }
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//        }
+    }
+
+    @JvmStatic
+    fun sendFeedbackMessage(message: String) {
+//        val fromToMessage = IMMessage.createTxtMessage(message)
+//        runOnIoThread {
+//            tryWithDefaultCatch {
+//                IMChat.getInstance().sendMessage(fromToMessage, object : ChatListener {
+//                    override fun onProgress(p0: Int) {}
+//                    override fun onSuccess() {}
+//                    override fun onFailed() {}
+//                })
+//            }
+//        }
+    }
+
+    fun updateShouldShowFloatingWindow(show: Boolean) {
+//        SPUtils.setBoolean(SP_FLOATING_WINDOW_KEY + UserManager.getInstance().userId, show)
+//        shouldShowFloatingWindow = show
+    }
+
+    fun updateShouldShowFloatingWindowDot(show: Boolean) {
+//        SPUtils.setBoolean(SP_FLOATING_WINDOW_DOT_KEY + UserManager.getInstance().userId, show)
+//        shouldShowFloatingWindowDot = show
+    }
+
+    private fun isActivityValid(activity: Activity): Boolean {
+        return when (activity) {
+            is MainActivity -> true
+            is HelpAndFeedbackActivity -> true
+            is MessageActivity -> true
+            else -> false
+        }
+    }
+}

app/src/main/java/com/gh/common/im/ImReceiver.kt

@@ -0,0 +1,68 @@
+package com.gh.common.im
+
+import android.app.NotificationManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+
+class ImReceiver : BroadcastReceiver() {
+
+    companion object {
+        const val UNIQUE_BROADCAST_ACTION = "com.gh.im"
+        const val NOTIFICATION_ID: Int = 987321
+    }
+
+    var notificationManager: NotificationManager? = null
+
+    override fun onReceive(context: Context?, intent: Intent?) {
+//        context?.doOnMainProcessOnly {
+//            intent?.let {
+//                if (intent.action == IMChatManager.NEW_MSG_ACTION) {
+//                    notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+//                    // 判断 ImActivity 是否在最顶端
+//                    if (CurrentActivityHolder.getCurrentActivity() is ChatActivity) {
+//                        ImManager.showFloatingWindow()
+//                        ImManager.updateShouldShowFloatingWindowDot(false)
+//                    } else {
+//                        val contentIntent = Intent(Utils.getApp(), ChatActivity::class.java)
+//
+//                        contentIntent.putExtra("PeerId", "")
+//                        contentIntent.putExtra("type", "peedId")
+//
+//                        contentIntent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+//                        val resultPendingIntent = PendingIntent.getActivity(
+//                                Utils.getApp(),
+//                                0,
+//                                contentIntent,
+//                                PendingIntent.FLAG_UPDATE_CURRENT
+//                        )
+//
+//                        // 新的通知
+//                        val builder = NotificationCompat.Builder(Utils.getApp(), "Halo_IM")
+//                        val notification = builder.setTicker("您有新的消息")
+//                                .setDefaults(Notification.DEFAULT_ALL)
+//                                .setSmallIcon(R.drawable.ic_notification)
+//                                .setWhen(System.currentTimeMillis())
+//                                .setContentIntent(resultPendingIntent)
+//                                .setContentTitle("光环助手客服回复")
+//                                .setContentText("您有新的消息")
+//                                .setAutoCancel(true)
+//                                .build()
+//
+//                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+//                            val channel = NotificationChannel("Halo_IM", "Halo_IM", NotificationManager.IMPORTANCE_DEFAULT)
+//                            notificationManager?.createNotificationChannel(channel)
+//                        }
+//
+//                        if (notification != null) {
+//                            notificationManager?.notify(NOTIFICATION_ID, notification)
+//                            ImManager.showFloatingWindow()
+//                        }
+//                    }
+//                } else if (intent.action == IMChatManager.FINISH_ACTION) {
+//                    ImManager.dismissFloatingWindow()
+//                }
+//            }
+//        }
+    }
+}

app/src/main/java/com/gh/common/image/EmptyDecoder.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.image
+package com.gh.common.image
 
 import com.facebook.imagepipeline.common.ImageDecodeOptions
 import com.facebook.imagepipeline.decoder.ImageDecoder

app/src/main/java/com/gh/common/json/JsonBuilder.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.json
+package com.gh.common.json
 
 import org.json.JSONArray
 import org.json.JSONObject

app/src/main/java/com/gh/common/loghub/LoghubDatabase.kt

@@ -0,0 +1,21 @@
+package com.gh.common.loghub
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+
+@Database(entities = [LoghubEvent::class], version = 1, exportSchema = false)
+abstract class LoghubDatabase : RoomDatabase() {
+    companion object {
+        private const val DATABASE = "gh_loghub_database"
+
+        fun buildDatabase(context: Context): LoghubDatabase {
+            return Room.databaseBuilder(context, LoghubDatabase::class.java, DATABASE)
+                    .fallbackToDestructiveMigration()
+                    .build()
+        }
+    }
+
+    abstract fun logHubEventDao(): LoghubEventDao
+}

app/src/main/java/com/gh/common/loghub/LoghubEvent.kt

@@ -0,0 +1,17 @@
+package com.gh.common.loghub
+
+import android.os.Parcelable
+import androidx.annotation.Keep
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import kotlinx.parcelize.Parcelize
+import java.util.*
+
+@Keep
+@Parcelize
+@Entity(tableName = "loghubEvent")
+data class LoghubEvent(@PrimaryKey
+                       val id: String = UUID.randomUUID().toString(),
+                       var time: String,
+                       var content: String,
+                       var logStore: String) : Parcelable

app/src/main/java/com/gh/common/loghub/LoghubEventDao.kt

@@ -1,4 +1,4 @@
-package com.gh.gamecenter.common.loghub
+package com.gh.common.loghub
 
 import androidx.room.*
 

app/src/main/java/com/gh/common/loghub/LoghubHelper.kt

@@ -1,8 +1,8 @@
-package com.gh.gamecenter.common.loghub
+package com.gh.common.loghub
 
 import com.aliyun.sls.android.producer.*
-import com.gh.gamecenter.common.HaloApp
-import com.gh.gamecenter.common.utils.PackageFlavorHelper
+import com.gh.common.util.PackageFlavorHelper
+import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
 
 /**
@@ -48,7 +48,7 @@ object LoghubHelper {
             // 每次发送前会把日志保存到本地的binlog文件，只有发送成功才会删除，保证日志上传At Least Once
             setPersistent(1)
             // 持久化的文件名，需要保证文件所在的文件夹已创建。配置多个客户端时，不应设置相同文件
-            setPersistentFilePath(HaloApp.getInstance().filesDir.absolutePath + "/${logStore}.dat")
+            setPersistentFilePath(HaloApp.getInstance().application.filesDir.absolutePath + "/${logStore}.dat")
             // 是否每次AddLog强制刷新，高可靠性场景建议打开
             setPersistentForceFlush(1)
             // 持久化文件滚动个数，建议设置成10。

app/src/main/java/com/gh/common/loghub/LoghubUtils.kt

@@ -1,11 +1,11 @@
-package com.gh.gamecenter.common.loghub
+package com.gh.common.loghub
 
 import android.app.Application
 import androidx.annotation.Keep
 import com.aliyun.sls.android.producer.Log
-import com.gh.gamecenter.common.entity.ExposureEntity
-import com.gh.gamecenter.common.exposure.meta.Meta
-import com.gh.gamecenter.common.utils.tryWithDefaultCatch
+import com.gh.common.exposure.ExposureEntity
+import com.gh.common.exposure.meta.Meta
+import com.gh.common.util.tryWithDefaultCatch
 import org.json.JSONObject
 import java.util.concurrent.ExecutorService
 
@@ -32,16 +32,10 @@ object LoghubUtils {
     }
 
     @JvmStatic
-    @JvmOverloads
-    fun log(logJson: JSONObject, logStore: String, forcedUpload: Boolean, isFlat: Boolean = false) {
+    fun log(logJson: JSONObject, logStore: String, forcedUpload: Boolean) {
         loghubEventExecutor?.execute {
             try {
-                val event = LoghubEvent(
-                    time = (System.currentTimeMillis() / 1000L).toString(),
-                    content = logJson.toString(),
-                    logStore = logStore,
-                    isFlat = isFlat
-                )
+                val event = LoghubEvent(time = (System.currentTimeMillis() / 1000L).toString(), content = logJson.toString(), logStore = logStore)
                 loghubEventSet.add(event)
                 loghubEventDao.insert(event)
             } catch (e: Exception) {
@@ -55,16 +49,10 @@ object LoghubUtils {
     }
 
     @JvmStatic
-    @JvmOverloads
-    fun log(jsonString: String, logStore: String, forcedUpload: Boolean, isFlat: Boolean = false) {
+    fun log(jsonString: String, logStore: String, forcedUpload: Boolean) {
         loghubEventExecutor?.execute {
             try {
-                val event = LoghubEvent(
-                    time = (System.currentTimeMillis() / 1000L).toString(),
-                    content = jsonString,
-                    logStore = logStore,
-                    isFlat = isFlat
-                )
+                val event = LoghubEvent(time = (System.currentTimeMillis() / 1000L).toString(), content = jsonString, logStore = logStore)
                 loghubEventSet.add(event)
                 loghubEventDao.insert(event)
             } catch (e: Exception) {
@@ -103,18 +91,8 @@ object LoghubUtils {
                     log.putContent(key, contentJson.get(key).toString())
                 }
             } else {
-                // isFlat为true代表仍需要平铺数据
-                if (event.isFlat) {
-                    val contentJson = JSONObject(event.content)
-                    for (key in contentJson.keys()) {
-                        log.putContent(key, contentJson.get(key).toString())
-                    }
-                    // 新数据使用timestamp字段记录时间
-                    log.putContent("timestamp", event.time)
-                } else {
-                    log.putContent("current time", event.time)
-                    log.putContent("content", event.content)
-                }
+                log.putContent("current time ", event.time)
+                log.putContent("content", event.content)
             }
 
             LoghubHelper.uploadLog(log, event.logStore)
@@ -125,8 +103,8 @@ object LoghubUtils {
 
 @Keep
 data class SimpleLogContainerEntity(
-    var event: String? = null,
-    var action: String? = null,
-    var meta: Meta? = null,
-    var payload: ExposureEntity? = null,
-    var timestamp: Long? = 0)
+        var event: String? = null,
+        var action: String? = null,
+        var meta: Meta? = null,
+        var payload: ExposureEntity? = null,
+        var timestamp: Long? = 0)

app/src/main/java/com/gh/common/notifier/Notifier.kt

@@ -0,0 +1,170 @@
+package com.gh.common.notifier
+
+import android.app.Activity
+import androidx.core.view.ViewCompat
+import android.view.View
+import android.view.ViewGroup
+import com.gh.common.util.SPUtils
+import com.gh.gamecenter.*
+import java.lang.ref.WeakReference
+
+@Suppress("DEPRECATION")
+class Notifier private constructor() {
+
+    companion object {
+
+        private var activityWeakReference: WeakReference<Activity>? = null
+
+        private const val SP_VIEWED_NOTIFIER = "viewed_notifier"
+
+        /**
+         * 根据内容决定是否显示 Notifier
+         */
+        @JvmStatic
+        fun shouldShowNotifier(content: String): Boolean {
+            val viewedNotifierCollection = SPUtils.getString(SP_VIEWED_NOTIFIER)
+            return !viewedNotifierCollection.contains(content)
+        }
+
+        /**
+         * 标记相应内容的 Notifier 已经显示过了
+         */
+        @JvmStatic
+        fun tagNotifierAsShowed(content: String) {
+            val viewedNotifierCollection = SPUtils.getString(SP_VIEWED_NOTIFIER)
+            if (viewedNotifierCollection.length > 3000) {
+                SPUtils.setString(SP_VIEWED_NOTIFIER, content)
+            } else {
+                SPUtils.setString(SP_VIEWED_NOTIFIER, viewedNotifierCollection + content)
+            }
+        }
+
+        @JvmStatic
+        fun create(activity: Activity?): Notifier {
+            if (activity == null) {
+                throw IllegalArgumentException("Activity cannot be null!")
+            }
+
+            val notifier = Notifier()
+
+            // Hide current NotifierView, if one is active
+            clearCurrent(activity)
+
+            notifier.setActivity(activity)
+            notifier.notifierView = NotifierView(activity)
+
+            return notifier
+        }
+
+        @JvmStatic
+        fun isActivityValid(activity: Activity?): Boolean {
+            if (activity == null) return false
+
+            return when (activity) {
+                is MessageActivity -> false
+                is DownloadManagerActivity -> false
+                is CleanApkActivity -> false
+                is SplashScreenActivity -> false
+                else -> isNotExistInActivity(activity)
+            }
+        }
+
+        @JvmStatic
+        fun isNotExistInActivity(activity: Activity?): Boolean {
+            if (activity == null) return false
+
+            (activity.window?.decorView as? ViewGroup)?.let {
+                //Find all NotifierView Views in Parent layout
+                for (i in 0..it.childCount) {
+                    val childView = if (it.getChildAt(i) is NotifierView) it.getChildAt(i) as NotifierView else null
+                    if (childView != null && childView.windowToken != null) {
+                        return false
+                    }
+                }
+            }
+            return true
+        }
+
+        /**
+         * Cleans up the currently showing notifierView view, if one is present
+         *
+         * @param activity The current Activity
+         */
+        @JvmStatic
+        fun clearCurrent(activity: Activity?) {
+            (activity?.window?.decorView as? ViewGroup)?.let {
+                //Find all NotifierView Views in Parent layout
+                for (i in 0..it.childCount) {
+                    val childView = if (it.getChildAt(i) is NotifierView) it.getChildAt(i) as NotifierView else null
+                    if (childView != null && childView.windowToken != null) {
+                        ViewCompat.animate(childView).alpha(0f).withEndAction(getRemoveViewRunnable(childView))
+                    }
+                }
+            }
+        }
+
+        @JvmStatic
+        fun hide() {
+            activityWeakReference?.get()?.let { clearCurrent(it) }
+        }
+
+        private fun getRemoveViewRunnable(childView: NotifierView?): Runnable {
+            return Runnable {
+                childView?.let {
+                    (childView.parent as? ViewGroup)?.removeView(childView)
+                }
+            }
+        }
+    }
+
+    private var notifierView: NotifierView? = null
+
+    private val activityDecorView: ViewGroup?
+        get() {
+            var decorView: ViewGroup? = null
+
+            activityWeakReference?.get()?.let {
+                decorView = it.window.decorView as ViewGroup
+            }
+
+            return decorView
+        }
+
+    fun show(showVerticalTranslateAnimation: Boolean, delay: Long? = 0): NotifierView? {
+        activityWeakReference?.get()?.let {
+            it.runOnUiThread {
+                activityDecorView?.postDelayed({
+                    notifierView?.showVerticalTranslateAnimation = showVerticalTranslateAnimation
+                    activityDecorView?.addView(notifierView)
+                }, delay!!)
+            }
+        }
+
+        return notifierView
+    }
+
+    fun setIcon(url: String?): Notifier {
+        url?.let { notifierView?.setIcon(it) }
+        return this
+    }
+
+    fun setText(text: String?): Notifier {
+        notifierView?.setText(text)
+
+        return this
+    }
+
+    fun setDuration(time: Long): Notifier {
+        notifierView?.duration = time
+        return this
+    }
+
+    fun setOnClickListener(onClickListener: View.OnClickListener): Notifier {
+        notifierView?.findViewById<View>(R.id.cardView)?.setOnClickListener(onClickListener)
+        return this
+    }
+
+    private fun setActivity(activity: Activity) {
+        activityWeakReference = WeakReference(activity)
+    }
+}