chore: 版本更新至 5.10.4

fix: 还原 LG Library, 处理首页红点问题, 处理进入搜索页的软键盘唤起问题

See merge request halo/android/assistant-android!287

README.md

@@ -12,12 +12,13 @@
 2. 尽量使 View 在被销毁之后仍能恢复状态，处理方式可参考 [保存界面状态](https://developer.android.com/topic/libraries/architecture/saving-states)
 3. 尽量参考原有文件结构及命名规范，即以 大模块 - 小模块 的形式生成包关系
 4. 遵循最小改动原则，在提交代码前务必先检查变动的代码，尽量以可控的变动规模来构成一个 commit ，以便日后追踪问题
-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!
+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!
 
 ### 公用部分
 

app/build.gradle

@@ -43,14 +43,8 @@ android {
     }
 
     defaultConfig {
-
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [eventBusIndex: 'com.gh.EventBusIndex']
-            }
-        }
 
         ndk {
             // 如果不添加 `arm64` 调用系统的 PackageManager 的方法读取安装包信息的时候会出现 native 层闪退，草
@@ -86,13 +80,6 @@ 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）
@@ -107,6 +94,12 @@ android {
         }
     }
 
+    kapt {
+        arguments {
+            arg("AROUTER_MODULE_NAME", project.name)
+        }
+    }
+
     buildTypes {
         debug {
             debuggable true
@@ -146,10 +139,10 @@ android {
 
     sourceSets {
         publish {
-            java.srcDirs = ['src/main/java']
+            java.srcDirs = ['src/main/java', "src/default/java"]
         }
         internal {
-            java.srcDirs = ['src/main/java']
+            java.srcDirs = ['src/main/java', "src/default/java"]
         }
         tea {
             java.srcDirs = ['src/main/java', 'src/tea/java']
@@ -200,86 +193,44 @@ 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.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 "androidx.multidex:multidex:${multiDex}"
+    implementation "androidx.fragment:fragment-ktx:${fragment}"
+
+    implementation "androidx.annotation:annotation:${annotation}"
+
+    implementation "androidx.viewpager2:viewpager2:${viewpager2}"
+    kapt "androidx.room:room-compiler:${room}"
 
     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"
@@ -291,38 +242,15 @@ dependencies {
 
     implementation "com.llew.huawei:verifier:${verifier}"
 
-    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}"
@@ -333,13 +261,12 @@ dependencies {
 
     implementation "com.lg:gid:${gid}"
 
-    implementation "com.louiscad.splitties:splitties-fun-pack-android-base-with-views-dsl:${splitties}"
-
     compileOnly "com.github.axen1314.lancet:lancet-base:${lancet_version}"
+    kapt "com.alibaba:arouter-compiler:$arouterVersion"
 
-    implementation project(':libraries:LGLibrary')
-    implementation project(':libraries:QQShare')
-    implementation project(':libraries:Matisse')
+    implementation(project(':module_common')) {
+        exclude group: 'androidx.swiperefreshlayout'
+    }
 }
 File propFile = file('sign.properties')
 if (propFile.exists()) {
@@ -595,4 +522,4 @@ project.afterEvaluate {
             }
         }
     }
-}
+}

app/proguard-rules.txt

@@ -14,8 +14,11 @@
 }
 #--------- remove logs end  ----------------
 
+# inline getter method
+-allowaccessmodification
+
 #--------- remove useless mtahelper class --------
--assumenosideeffects class com.gh.common.util.MtaHelper {
+-assumenosideeffects class com.gh.gamecenter.core.utils.MtaHelper {
     public static void onEvent(...);
     public static void onEventWithTime(...);
     public static void onEventWithBasicDeviceInfo(...);
@@ -65,6 +68,7 @@
 -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.* {*;}
@@ -155,3 +159,12 @@
     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

@@ -0,0 +1,26 @@
+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

@@ -736,6 +736,10 @@
             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/BaseRichEditorActivity.kt

@@ -14,12 +14,16 @@ import android.widget.CheckBox
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.lifecycle.Observer
-import com.gh.common.AppExecutor
-import com.gh.common.runOnIoThread
-import com.gh.common.util.*
+import com.gh.common.util.DialogUtils
+import com.gh.common.util.NewLogUtils
 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
@@ -37,6 +41,7 @@ import org.json.JSONArray
 import org.json.JSONObject
 import java.io.File
 
+// TODO: 移动到module_bbs模块
 abstract class BaseRichEditorActivity<VM : BaseRichEditorViewModel> : ToolBarActivity(),
     KeyboardHeightObserver, UploadVideoListener {
 
@@ -205,6 +210,7 @@ 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")
@@ -735,6 +741,14 @@ 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.black, R.color.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,15 +9,16 @@ import android.text.TextUtils
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.MutableLiveData
-import com.gh.base.fragment.WaitingDialogFragment
-import com.gh.common.runOnUiThread
-import com.gh.common.util.*
+import com.gh.gamecenter.common.base.fragment.WaitingDialogFragment
+import com.gh.gamecenter.core.runOnUiThread
 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.retrofit.Response
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.retrofit.service.ApiService
 import com.gh.gamecenter.video.upload.OnUploadListener
@@ -40,6 +41,7 @@ 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>()
@@ -189,7 +191,8 @@ 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 {
@@ -308,7 +311,8 @@ 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/DownloadToolbarActivity.kt

@@ -0,0 +1,113 @@
+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).setImageDrawable(
+                ContextCompat.getDrawable(this, R.drawable.toolbar_download)
+            )
+        }
+    }
+}

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

@@ -1,229 +0,0 @@
-//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 com.gh.common.notifier.Notifier
-import com.gh.common.util.DataUtils
+import androidx.appcompat.app.AppCompatActivity
 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,21 +16,19 @@ 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?) {
-        AppManager.getInstance().addActivity(activity)
+        // do nothing
     }
 
     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
@@ -47,7 +45,6 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
         }
 
         if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
-            DataUtils.onResume(activity)
             // FIXME 这里应该只是部分Activity需要
             try {
                 // 初始化gameMap
@@ -58,6 +55,10 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
                 e.printStackTrace()
             }
         }
+
+        if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
+            NightModeSwitchHelper.showNightModeSwitchFloatingView(activity)
+        }
     }
 
     private fun shouldShowActivityBackView(activity: Activity): Boolean {
@@ -70,28 +71,22 @@ class GlobalActivityLifecycleObserver : Application.ActivityLifecycleCallbacks {
     }
 
     override fun onActivityPaused(activity: Activity) {
-        CurrentActivityHolder.activitySet.remove(activity)
         FloatingBackViewManager.dismissBackView()
-
-        if (HaloApp.isUserAcceptPrivacyPolicy(activity)) {
-            DataUtils.onPause(activity)
-        }
-
-        if (activity.isFinishing) {
-            AppManager.getInstance().finishActivity(activity)
+        if (PackageFlavorHelper.IS_TEST_FLAVOR && activity is AppCompatActivity) {
+            NightModeSwitchHelper.dismissNightModeSwitchFloatingView()
         }
     }
 
     override fun onActivityStopped(activity: Activity) {
-        Notifier.hide()
+        // do nothing
     }
 
     override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {
-
+        // do nothing
     }
 
     override fun onActivityDestroyed(activity: Activity) {
-        AppManager.getInstance().finishActivity(activity)
+        // do nothing
     }
 
 }

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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,109 @@
+package com.gh.base
+
+import android.os.Build
+import android.view.Gravity
+import android.widget.ImageView
+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
+import com.squareup.picasso.Picasso
+
+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/common/Base64ImageHolder.kt

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

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

@@ -8,16 +8,27 @@ 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.view.dsbridge.CompletionHandler
+import com.gh.common.util.LogUtils
 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.*
+import com.gh.gamecenter.entity.Badge
+import com.gh.gamecenter.entity.MtaEvent
 import com.gh.gamecenter.help.QaFeedbackDialogFragment
 import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.personalhome.border.AvatarBorderActivity
@@ -32,7 +43,7 @@ import java.io.File
 import java.io.FileOutputStream
 import java.util.*
 
-class DefaultJsApi(var context: Context) {
+class DefaultJsApi(var context: Context, val entrance: String = "") {
 
     private var mLoginHandler: CompletionHandler<Any>? = null
 
@@ -181,7 +192,7 @@ class DefaultJsApi(var context: Context) {
     fun openBase64Image(event: Any) {
         val context = CurrentActivityHolder.getCurrentActivity()
 
-        Base64ImageHolder.image = event.toString()
+        ImageViewerActivity.base64Image = event.toString()
 
         context?.startActivity(ImageViewerActivity.getBase64Intent(context, true))
     }
@@ -232,7 +243,7 @@ class DefaultJsApi(var context: Context) {
     fun shareBase64Image(event: Any) {
         val imageShareEvent = event.toString().toObject() ?: ImageShareEvent()
         val context = CurrentActivityHolder.getCurrentActivity()
-        Base64ImageHolder.image = imageShareEvent.image.run {
+        ImageViewerActivity.base64Image = imageShareEvent.image.run {
             if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
         }
         MessageShareUtils.getInstance(context).shareFromWeb(context, imageShareEvent.type)
@@ -243,7 +254,7 @@ class DefaultJsApi(var context: Context) {
         val inviteEvent = event.toString().toObject() ?: InviteFriendsEvent()
         val context = CurrentActivityHolder.getCurrentActivity()
         if ("poster" == inviteEvent.type) {
-            Base64ImageHolder.image = inviteEvent.poster.run {
+            ImageViewerActivity.base64Image = inviteEvent.poster.run {
                 if (this.startsWith("data:image/png;base64")) this.split(",")[1] else this
             }
             MessageShareUtils.getInstance(context).shareInviteFriends(context, inviteEvent.way)
@@ -420,6 +431,11 @@ class DefaultJsApi(var context: Context) {
         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.base.CurrentActivityHolder
-import com.gh.common.constant.Constants
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.util.*
 import com.gh.common.util.DirectUtils.directToFeedback
 import com.gh.common.util.DirectUtils.directToGameDetailVideoStreaming
@@ -15,11 +15,16 @@ 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.common.util.GsonUtils.gson
+import com.gh.gamecenter.core.utils.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
@@ -78,7 +83,7 @@ object DefaultUrlHandler {
                     e.printStackTrace()
                 }
 
-                EntranceUtils.HOST_QQ_QUN -> {
+                EntranceConsts.HOST_QQ_QUN -> {
                     val key = uri.getQueryParameter("key")
                     if (!DirectUtils.directToQqGroup(context, key)) {
                         Utils.toast(context, "请检查是否已经安装手机QQ")
@@ -103,6 +108,8 @@ object DefaultUrlHandler {
                 }
                 "question" -> DirectUtils.directToQuestionDetail(context, id, entrance, "文章链接")
 
+                "real_name" -> DirectUtils.directToRealName(context)
+
                 "community" -> {
                     val community = CommunityEntity()
                     community.id = id
@@ -146,7 +153,7 @@ object DefaultUrlHandler {
                         )
                     }
                 }
-                EntranceUtils.HOST_UPLOAD_VIDEO -> {
+                EntranceConsts.HOST_UPLOAD_VIDEO -> {
                     val titleParameter = uri.getQueryParameter("title")
                     val title = if (titleParameter.isNullOrEmpty()) "" else "#$titleParameter#"
                     val categoryId = uri.getQueryParameter("category_id") ?: ""
@@ -157,16 +164,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, EntranceUtils.ENTRANCE_BROWSER) {
-                        DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceUtils.ENTRANCE_BROWSER, "")
+                    CheckLoginUtils.checkLogin(context, null, true, EntranceConsts.ENTRANCE_BROWSER) {
+                        DirectUtils.directToVideoManager(context, linkEntity, simpleGameEntity, EntranceConsts.ENTRANCE_BROWSER, "")
                     }
                 }
-                EntranceUtils.HOST_USERHOME -> {
+                EntranceConsts.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, "")
                 }
-                EntranceUtils.HOST_VIDEO_MORE -> {
+                EntranceConsts.HOST_VIDEO_MORE -> {
                     val referer = uri.getQueryParameter("referer") ?: ""
                     val type = uri.getQueryParameter("type") ?: ""
                     val act = uri.getQueryParameter("act") ?: ""
@@ -198,48 +205,48 @@ object DefaultUrlHandler {
                         sectionName
                     )
                 }
-                EntranceUtils.HOST_VIDEO_DETAIL -> {
+                EntranceConsts.HOST_VIDEO_DETAIL -> {
                     DirectUtils.directToVideoDetail(context, id, entrance, path)
                 }
-                EntranceUtils.HOST_VIDEO_SINGLE -> {
+                EntranceConsts.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
                     )
                 }
-                EntranceUtils.HOST_VIDEO_STREAMING_HOME -> {
+                EntranceConsts.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)
                 }
-                EntranceUtils.HOST_VIDEO_STREAMING_DESC -> {
+                EntranceConsts.HOST_VIDEO_STREAMING_DESC -> {
                     directToGameDetailVideoStreaming(context, id, entrance)
                 }
-                EntranceUtils.HOST_VIDEO_COLLECTION -> {
+                EntranceConsts.HOST_VIDEO_COLLECTION -> {
                     directToGameVideo(context, id, entrance, "")
                 }
 
-                EntranceUtils.HOST_CATEGORY -> {
+                EntranceConsts.HOST_CATEGORY -> {
                     val title = uri.getQueryParameter("title")
                     DirectUtils.directCategoryDirectory(context, id, title ?: "", entrance, "")
                 }
-                EntranceUtils.HOST_COLUMN_COLLECTION -> {
+                EntranceConsts.HOST_COLUMN_COLLECTION -> {
                     val name = uri.getQueryParameter("name")
                     DirectUtils.directToColumnCollection(context, id, -1, entrance, name ?: "")
                 }
-                EntranceUtils.HOST_COLUMN -> {
-                    DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceUtils.KEY_NAME), entrance)
+                EntranceConsts.HOST_COLUMN -> {
+                    DirectUtils.directToSubject(context, id, uri.getQueryParameter(EntranceConsts.KEY_NAME), entrance)
                 }
-                EntranceUtils.HOST_COMMUNITY_QUESTION_LABEL_DETAIL -> {
+                EntranceConsts.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, "")
                 }
-                EntranceUtils.HOST_COMMUNITY_COLUMN_DETAIL -> {
+                EntranceConsts.HOST_COMMUNITY_COLUMN_DETAIL -> {
                     val community = CommunityEntity()
                     community.id = uri.getQueryParameter("community_id") ?: ""
                     community.name = uri.getQueryParameter("community_name") ?: ""
@@ -247,42 +254,42 @@ object DefaultUrlHandler {
                     DirectUtils.directAskColumnDetail(context, columnId, community, entrance, "")
                 }
 
-                EntranceUtils.HOST_BLOCK -> {
+                EntranceConsts.HOST_BLOCK -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     val entity = SubjectRecommendEntity(link = id, name = name, text = name)
                     DirectUtils.directToBlock(context, entity, entrance)
                 }
 
-                EntranceUtils.HOST_SERVER_BLOCK -> {
+                EntranceConsts.HOST_SERVER_BLOCK -> {
                     DirectUtils.directToGameServers(context, entrance = entrance, path = "")
                 }
 
-                EntranceUtils.HOST_AMWAY_BLOCK -> {
+                EntranceConsts.HOST_AMWAY_BLOCK -> {
                     DirectUtils.directToAmway(context, entrance = entrance, path = "")
                 }
 
-                EntranceUtils.HOST_HELP -> {
+                EntranceConsts.HOST_HELP -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     DirectUtils.directToQa(context, name, id)
                 }
 
-                EntranceUtils.HOST_HELP_COLLECTION -> {
+                EntranceConsts.HOST_HELP_COLLECTION -> {
                     val name = uri.getQueryParameter("name")
                         ?: ""
                     DirectUtils.directToQaCollection(context, name, id)
                 }
 
-                EntranceUtils.HOST_GAME_UPLOAD -> {
+                EntranceConsts.HOST_GAME_UPLOAD -> {
                     DirectUtils.directGameUpload(context, entrance = entrance, path = "")
                 }
-                EntranceUtils.HOST_GAME_ZONE -> {
+                EntranceConsts.HOST_GAME_ZONE -> {
                     val zoneUrl = uri.getQueryParameter("url") ?: ""
                     DirectUtils.directGameZone(context, id, zoneUrl, entrance)
                 }
 
-                EntranceUtils.HOST_LINK -> {
+                EntranceConsts.HOST_LINK -> {
                     try {
                         val dataString = uri.getQueryParameter("data")
                         if (!TextUtils.isEmpty(dataString)) {
@@ -296,43 +303,43 @@ object DefaultUrlHandler {
                     }
                 }
 
-                EntranceUtils.HOST_GAME_NEWS -> {
+                EntranceConsts.HOST_GAME_NEWS -> {
                     DirectUtils.directToGameNews(
                         context,
-                        uri.getQueryParameter(EntranceUtils.KEY_GAME_ID),
-                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
+                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
                         entrance
                     );
                 }
 
-                EntranceUtils.HOST_GAME_CALENDAR -> {
-                    directToGameServerCalendar(context, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID))
+                EntranceConsts.HOST_GAME_CALENDAR -> {
+                    directToGameServerCalendar(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID))
                 }
 
-                EntranceUtils.HOST_HISTORY_APK -> {
-                    DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceUtils.KEY_GAME_ID))
+                EntranceConsts.HOST_HISTORY_APK -> {
+                    DirectUtils.directToHistoryApk(context, uri.getQueryParameter(EntranceConsts.KEY_GAME_ID))
                 }
 
-                EntranceUtils.HOST_FORUM_DETAIL -> {
+                EntranceConsts.HOST_FORUM_DETAIL -> {
                     DirectUtils.directForumDetail(context, id, entrance)
                 }
 
-                EntranceUtils.HOST_GAME_RATING_DETAIL -> {
+                EntranceConsts.HOST_GAME_RATING_DETAIL -> {
                     DirectUtils.directToGameRatingDetail(
                         context,
-                        uri.getQueryParameter(EntranceUtils.KEY_GAME_ID),
-                        uri.getQueryParameter(EntranceUtils.KEY_COMMENT_ID),
-                        EntranceUtils.ENTRANCE_BROWSER
+                        uri.getQueryParameter(EntranceConsts.KEY_GAME_ID),
+                        uri.getQueryParameter(EntranceConsts.KEY_COMMENT_ID),
+                        EntranceConsts.ENTRANCE_BROWSER
                     )
                 }
 
-                EntranceUtils.HOST_FORUM -> {
-                    val position = uri.getQueryParameter(EntranceUtils.KEY_POSITION)?.toInt()
+                EntranceConsts.HOST_FORUM -> {
+                    val position = uri.getQueryParameter(EntranceConsts.KEY_POSITION)?.toInt()
 
                     DirectUtils.directToForum(context, position ?: 0)
                 }
 
-                EntranceUtils.HOST_UPLOAD_VIDEO_NEW -> {
+                EntranceConsts.HOST_UPLOAD_VIDEO_NEW -> {
                     val activityName = uri.getQueryParameter("activity_name") ?: ""
                     val activityId = uri.getQueryParameter("activity_id") ?: ""
                     val original = uri.getQueryParameter("original") ?: ""
@@ -370,39 +377,39 @@ object DefaultUrlHandler {
                     )
                 }
 
-                EntranceUtils.HOST_SUGGESTION -> {
-                    val platform = uri.getQueryParameter(EntranceUtils.KEY_PLATFORM)
+                EntranceConsts.HOST_SUGGESTION -> {
+                    val platform = uri.getQueryParameter(EntranceConsts.KEY_PLATFORM)
                     val platformName = PlatformUtils.getInstance(context).getPlatformName(platform)
-                    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 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 content = if (TextUtils.isEmpty(gameId) || TextUtils.isEmpty(packageMd5)) String.format(
                         "%s-%s-V%s，",
-                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
                         if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceUtils.KEY_VERSION)
+                        uri.getQueryParameter(EntranceConsts.KEY_VERSION)
                     ) else String.format(
                         "%s-%s-V%s\n游戏ID：%s\n游戏包MD5：%s\n",
-                        uri.getQueryParameter(EntranceUtils.KEY_GAME_NAME),
+                        uri.getQueryParameter(EntranceConsts.KEY_GAME_NAME),
                         if (TextUtils.isEmpty(platformName)) platform else platformName,
-                        uri.getQueryParameter(EntranceUtils.KEY_VERSION), gameId, packageMd5
+                        uri.getQueryParameter(EntranceConsts.KEY_VERSION), gameId, packageMd5
                     )
                     val qaId = uri.getQueryParameter("qa_id") ?: ""
-                    val qaContentId = uri.getQueryParameter(EntranceUtils.KEY_QA_CONTENT_ID) ?: ""
-                    val qaTitle = uri.getQueryParameter(EntranceUtils.KEY_QA_TITLE)
+                    val qaContentId = uri.getQueryParameter(EntranceConsts.KEY_QA_CONTENT_ID) ?: ""
+                    val qaTitle = uri.getQueryParameter(EntranceConsts.KEY_QA_TITLE)
                     if (!TextUtils.isEmpty(qaId)) {
                         directToQa(context, qaTitle, qaId)
                     } else {
-                        directToFeedback(context, content, null, isQaFeedback, qaContentId, EntranceUtils.ENTRANCE_BROWSER)
+                        directToFeedback(context, content, null, isQaFeedback, qaContentId, EntranceConsts.ENTRANCE_BROWSER)
                     }
                 }
 
-                EntranceUtils.HOST_HELP_AND_FEEDBACK -> {
+                EntranceConsts.HOST_HELP_AND_FEEDBACK -> {
                     val position = uri.getQueryParameter("position") ?: ""
                     DirectUtils.directToHelpAndFeedback(context, position.toInt())
                 }
 
-                EntranceUtils.HOST_HELP_DETAIL -> {
+                EntranceConsts.HOST_HELP_DETAIL -> {
                     var url = uri.getQueryParameter("url")
                     if (!url.isNullOrEmpty()) {
                         context.startActivity(WebActivity.getIntent(context, url, false))
@@ -419,16 +426,19 @@ object DefaultUrlHandler {
                     }
                 }
 
-                EntranceUtils.HOST_GAME_COLLECTION_DETAIL -> {
+                EntranceConsts.HOST_GAME_COLLECTION_DETAIL -> {
                     DirectUtils.directToGameCollectionDetail(context, id, entrance)
                 }
 
-                EntranceUtils.HOST_GAME_COLLECTION_SQUARE -> {
+                EntranceConsts.HOST_GAME_COLLECTION_SQUARE -> {
                     DirectUtils.directToGameCollectionSquare(context, entrance)
                 }
 
-                EntranceUtils.HOST_GAME_COLLECTION_EDIT -> {
-                    context.startActivity(GameCollectionEditActivity.getIntent(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))
                 }
 
                 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.common.loghub.LoghubUtils
-import com.gh.common.util.doOnMainProcessOnly
-import com.gh.common.util.tryCatchInRelease
+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.videolog.VideoRecordUtils
 import com.gh.download.DownloadDataHelper
 import com.gh.gamecenter.entity.TimeEntity
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.common.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

@@ -1,39 +0,0 @@
-//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

@@ -1,117 +0,0 @@
-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/constant/Config.java

@@ -1,26 +1,28 @@
 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 com.gh.common.util.EnvHelper;
-import com.gh.common.util.GsonUtils;
+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.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.retrofit.BiResponse;
-import com.gh.gamecenter.retrofit.Response;
+import com.gh.gamecenter.common.retrofit.BiResponse;
+import com.gh.gamecenter.common.retrofit.Response;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
@@ -33,8 +35,6 @@ 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,10 +45,6 @@ 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;
@@ -59,10 +55,7 @@ public class Config {
     // http://www.ghzs666.com/article/${articleId}.html
     public static final String URL_ARTICLE = "http://www.ghzs666.com/article/"; // ghzs/ghzs666 统一
 
-    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 final String SETTINGS_KEY = "settingsKey";
 
     private static SettingsEntity mSettingsEntity;
     private static NewSettingsEntity mNewSettingsEntity;
@@ -93,13 +86,7 @@ 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) {
 
@@ -270,13 +257,6 @@ 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/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.base.OnViewClickListener
-import com.gh.common.util.dip2px
-import com.gh.common.util.toDrawable
-import com.gh.common.view.BugFixedPopupWindow
+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.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()
-                binding.kaifuAddServerName.background = R.drawable.bg_add_kaifu_bottom_right.toDrawable()
+                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)
             }
         }
     }

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

@@ -19,7 +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.gamecenter.common.callback.OnViewClickListener;
 import com.gh.common.constant.Config;
 import com.gh.common.dialog.CertificationDialog;
 import com.gh.common.dialog.PackageCheckDialogFragment;
@@ -31,23 +31,23 @@ 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.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.core.utils.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.gamecenter.common.utils.ImageUtils;
 import com.gh.common.util.LogUtils;
-import com.gh.common.util.MtaHelper;
+import com.gh.gamecenter.core.utils.MtaHelper;
 import com.gh.common.util.NewsUtils;
-import com.gh.common.util.NumberUtils;
+import com.gh.gamecenter.core.utils.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.gamecenter.common.view.DrawableView;
 import com.gh.common.view.GameIconView;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
@@ -428,7 +428,6 @@ 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(
@@ -652,8 +651,6 @@ 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,

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.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
-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.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.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(EntranceUtils.KEY_PARENT_TAG) ?: ""
+            mParentTag = getString(EntranceConsts.KEY_PARENT_TAG) ?: ""
         }
     }
 
@@ -83,7 +83,7 @@ class ApplyModeratorDialogFragment : BaseDialogFragment() {
                 arguments = Bundle().apply {
                     putString(KEY_GROUP_NUMBER, number)
                     putString(KEY_GROUP_KEY, key)
-                    putString(EntranceUtils.KEY_PARENT_TAG, tag)
+                    putString(EntranceConsts.KEY_PARENT_TAG, tag)
                 }
             }.show(
                 activity.supportFragmentManager,

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

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

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

@@ -19,10 +19,14 @@ import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.common.constant.Constants
-import com.gh.common.util.*
+import com.gh.gamecenter.common.constant.Constants
 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,18 +10,16 @@ import android.view.ViewGroup
 import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.text.HtmlCompat
-import com.gh.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
 import com.gh.common.util.DirectUtils
-import com.gh.common.util.dip2px
-import com.gh.common.util.toColor
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.toColor
 import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.DialogGameOffServiceBinding
 import com.gh.gamecenter.entity.GameEntity
 
 // 游戏关闭下载弹窗
-class GameOffServiceDialogFragment
-//    : BaseTrackableDialogFragment()
-    : BaseDialogFragment() {
+class GameOffServiceDialogFragment : BaseDialogFragment() {
 
     private var mDialog: GameEntity.Dialog? = null
     private var mBinding: DialogGameOffServiceBinding? = null
@@ -78,14 +76,6 @@ class GameOffServiceDialogFragment
         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,16 +13,20 @@ 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 : BaseTrackableDialogFragment() {
+class InstallPermissionDialogFragment : BaseDialogFragment() {
 
     lateinit var mView: View
     var isXapk = false
@@ -55,18 +59,15 @@ class InstallPermissionDialogFragment : BaseTrackableDialogFragment() {
         }
 
         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)
@@ -87,10 +88,6 @@ class InstallPermissionDialogFragment : BaseTrackableDialogFragment() {
         }
     }
 
-    override fun getEvent(): String = "安装引导弹窗"
-
-    override fun getKey(): String = "引导弹窗"
-
     companion object {
         @JvmStatic
         fun show(activity: AppCompatActivity, downloadEntity: DownloadEntity, callBack: ((isFromPermissionGrantedCallback: Boolean) -> Unit)?) {

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

@@ -15,12 +15,16 @@ import androidx.fragment.app.FragmentTransaction
 import androidx.lifecycle.Lifecycle
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.base.BaseRecyclerViewHolder
-import com.gh.common.constant.Constants
+import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.util.*
-import com.gh.common.view.CustomLinkMovementMethod
+import com.gh.common.util.LogUtils
+import com.gh.gamecenter.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
@@ -52,7 +56,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
     private var mAdapter: PackageCheckAdapter? = null
     private var mAllInstalledPackages = PackageUtils.getInstalledPackages(HaloApp.getInstance().application, 0)
     var gameEntity: GameEntity? = null
-    var callBack: DialogUtils.ConfirmListener? = null
+    var callBack: ConfirmListener? = null
 
     private val dataWatcher = object : DataWatcher() {
         override fun onDataChanged(downloadEntity: DownloadEntity) {
@@ -318,7 +322,7 @@ class PackageCheckDialogFragment : BaseDialogFragment() {
 
     companion object {
         @JvmStatic
-        fun show(activity: AppCompatActivity, gameEntity: GameEntity, callBack: DialogUtils.ConfirmListener) {
+        fun show(activity: AppCompatActivity, gameEntity: GameEntity, callBack: ConfirmListener) {
             val packageDialogEntity = gameEntity.packageDialog
             if (packageDialogEntity == null) {
                 callBack.onConfirm()

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

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

@@ -1,4 +1,4 @@
-package com.gh.common.view
+package com.gh.common.dialog
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -6,12 +6,13 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.gh.base.BaseRecyclerViewHolder
-import com.gh.base.fragment.BaseDialogFragment
-import com.gh.common.util.ImageUtils
-import com.gh.common.util.fromHtml
+import com.gh.gamecenter.common.base.BaseRecyclerViewHolder
+import com.gh.gamecenter.common.base.fragment.BaseDialogFragment
+import com.gh.gamecenter.common.utils.ImageUtils
+import com.gh.gamecenter.common.utils.fromHtml
 import com.gh.gamecenter.GameDetailActivity
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.view.FixLinearLayoutManager
 import com.gh.gamecenter.databinding.DialogReserveBinding
 import com.gh.gamecenter.databinding.DialogReserveItemBinding
 import com.gh.gamecenter.entity.SimpleGameEntity

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

@@ -1,384 +0,0 @@
-//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/exposure/ExposureConverters.kt

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

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

@@ -4,12 +4,13 @@ import android.os.Parcelable
 import androidx.annotation.Keep
 import androidx.room.Entity
 import androidx.room.PrimaryKey
-import com.gh.common.constant.Constants
-import com.gh.common.exposure.meta.Meta
-import com.gh.common.exposure.meta.MetaUtil
+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.exposure.time.TimeUtil
-import com.gh.common.util.getFirstElementDividedByDivider
+import com.gh.gamecenter.common.utils.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,10 +1,11 @@
 package com.gh.common.exposure
 
 import com.aliyun.sls.android.producer.Log
-import com.gh.common.loghub.LoghubHelper
-import com.gh.common.util.toJson
-import com.gh.common.util.tryWithDefaultCatch
+import com.gh.gamecenter.common.loghub.LoghubHelper
+import com.gh.gamecenter.common.utils.toJson
+import com.gh.gamecenter.common.utils.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
@@ -126,19 +127,4 @@ 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,7 +3,8 @@ package com.gh.common.exposure
 import android.text.TextUtils
 import com.g00fy2.versioncompare.Version
 import com.gh.common.util.PackageUtils
-import com.gh.common.util.toObject
+import com.gh.gamecenter.common.utils.FixedSizeLinkedHashSet
+import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.GameEntity
 import com.halo.assistant.HaloApp
@@ -11,7 +12,7 @@ import com.lightgame.download.DownloadEntity
 
 object ExposureUtils {
 
-    private val mDownloadCompleteTraceEventIdSet = ExposureManager.FixedSizeLinkedHashSet<String>(3)
+    private val mDownloadCompleteTraceEventIdSet = FixedSizeLinkedHashSet<String>(3)
 
     @JvmStatic
     fun logADownloadExposureEvent(

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.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.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.gamecenter.R
 import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.common.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.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.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.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/im/ImHintHelper.kt

@@ -1,67 +0,0 @@
-//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

@@ -1,45 +0,0 @@
-//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

@@ -1,145 +0,0 @@
-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

@@ -1,68 +0,0 @@
-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/notifier/Notifier.kt

@@ -1,170 +0,0 @@
-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)
-    }
-}

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

@@ -1,312 +0,0 @@
-package com.gh.common.notifier
-
-import android.animation.*
-import android.content.Context
-import android.graphics.Path
-import android.text.TextUtils
-import android.util.AttributeSet
-import android.util.Log
-import android.util.TypedValue
-import android.view.Gravity
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.cardview.widget.CardView
-import androidx.core.view.ViewCompat
-import com.facebook.drawee.view.SimpleDraweeView
-import com.gh.common.util.DisplayUtils
-import com.gh.common.util.ImageUtils
-import com.gh.common.util.doOnEnd
-import com.gh.common.util.doOnStart
-import com.gh.gamecenter.R
-
-class NotifierView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyle: Int = 0)
-    : FrameLayout(context, attrs, defStyle) {
-
-    companion object {
-        const val SCALE_MINI = 0.2F
-        const val SCALE_DEFAULT = 1F
-
-        const val DEFAULT_DURATION = 500L
-    }
-
-    var onShowListener: OnShowNotificationListener? = null
-    var onHideListener: OnHideNotificationListener? = null
-
-    lateinit var expandAnimator: ValueAnimator
-    lateinit var shrinkAnimator: ValueAnimator
-
-    lateinit var translateUpAnimator: ObjectAnimator
-    lateinit var translateDownAnimator: ObjectAnimator
-
-    lateinit var translateToLeftAnimator: ObjectAnimator
-    lateinit var translateToRightAnimator: ObjectAnimator
-
-    lateinit var zoomInAnimator: ObjectAnimator
-    lateinit var zoomOutAnimator: ObjectAnimator
-
-    var showAnimatorSet: AnimatorSet
-    var hideAnimatorSet: AnimatorSet
-
-    var rightToLeftPath: Path
-    var leftToRightPath: Path
-
-    var veryRight: Float = 0F
-    var veryBottom: Float = 0F
-    var centerX: Float = 0F
-
-    var navigationHeight = 0
-
-    var textWidth: Int = 0
-    var cardViewWidth: Int = 0
-    var verticalAnimationOffset: Int = 0
-
-    var duration = DEFAULT_DURATION
-
-    var showVerticalTranslateAnimation: Boolean = true
-
-    private var mCardView: CardView
-    private var mContentTv: TextView
-    private var mIconIv: SimpleDraweeView
-
-    init {
-        inflate(context, R.layout.view_notifier, this)
-
-        ViewCompat.setTranslationZ(this, Integer.MAX_VALUE.toFloat())
-
-        mCardView = findViewById(R.id.cardView)
-        mContentTv = findViewById(R.id.tvText)
-        mIconIv = findViewById(R.id.ivIcon)
-
-        mCardView.scaleX = SCALE_MINI
-        mCardView.scaleY = SCALE_MINI
-
-        verticalAnimationOffset = dp2px(100F)
-
-        navigationHeight = DisplayUtils.retrieveNavigationHeight(context)
-
-        rightToLeftPath = Path()
-        leftToRightPath = Path()
-
-        showAnimatorSet = AnimatorSet()
-        hideAnimatorSet = AnimatorSet()
-    }
-
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-
-        centerX = (left + right - cardViewWidth) / 2F
-
-        // TODO Provide method to change these absolute offset.
-        val r = right - dp2px(72F).toFloat()
-        val b = bottom - dp2px(145F).toFloat() - navigationHeight
-
-        // Only set
-        if (veryRight != r || veryBottom != b) {
-            veryRight = r
-            veryBottom = b
-
-            rightToLeftPath.moveTo(r, b)
-            rightToLeftPath.lineTo(centerX, b)
-
-            leftToRightPath.moveTo(centerX, b)
-            leftToRightPath.lineTo(r, b)
-
-            initAnimator()
-        }
-    }
-
-    private fun initAnimator() {
-        expandAnimator = ValueAnimator.ofFloat(0F, 1F)
-        expandAnimator.duration = DEFAULT_DURATION
-        expandAnimator.addUpdateListener { a ->
-            val progress = a?.animatedValue as Float
-            mContentTv.width = (textWidth * progress).toInt()
-        }
-        expandAnimator.doOnEnd {
-            enableSwipeToDismiss()
-            shrinkAfterDelay()
-        }
-
-        shrinkAnimator = ValueAnimator.ofFloat(1F, 0F)
-        shrinkAnimator.duration = DEFAULT_DURATION
-        shrinkAnimator.addUpdateListener { a ->
-            val progress = a?.animatedValue as Float
-            mContentTv.width = (textWidth * progress).toInt()
-        }
-        shrinkAnimator.doOnEnd {
-            val lp = FrameLayout.LayoutParams(mCardView.layoutParams)
-            lp.gravity = Gravity.NO_GRAVITY
-            mCardView.layoutParams = lp
-
-            disableSwipeToDismiss()
-        }
-
-        translateToLeftAnimator = ObjectAnimator.ofFloat(mCardView, "translationX", veryRight, centerX)
-        translateToLeftAnimator.duration = DEFAULT_DURATION
-        translateToLeftAnimator.doOnEnd {
-            onShowListener?.onShow()
-
-            val lp = FrameLayout.LayoutParams(mCardView.layoutParams)
-            lp.gravity = Gravity.CENTER_HORIZONTAL
-            mCardView.layoutParams = lp
-            mCardView.translationX = 0f
-
-            expandAnimator.start()
-        }
-
-        translateToRightAnimator = ObjectAnimator.ofFloat(mCardView, "translationX", centerX, veryRight)
-        translateToRightAnimator.duration = DEFAULT_DURATION
-
-        translateUpAnimator = ObjectAnimator.ofFloat(mCardView, "translationY", veryBottom + verticalAnimationOffset, veryBottom)
-        translateUpAnimator.duration = DEFAULT_DURATION
-        translateUpAnimator.doOnStart { mCardView.translationX = veryRight }
-
-        translateDownAnimator = ObjectAnimator.ofFloat(mCardView, "translationY", veryBottom, veryBottom + verticalAnimationOffset)
-        translateDownAnimator.duration = DEFAULT_DURATION
-
-        zoomInAnimator = ObjectAnimator.ofPropertyValuesHolder(mCardView, PropertyValuesHolder.ofFloat("scaleX", SCALE_DEFAULT),
-                PropertyValuesHolder.ofFloat("scaleY", SCALE_DEFAULT))
-        zoomInAnimator.duration = DEFAULT_DURATION
-        zoomInAnimator.doOnStart { mCardView.translationX = veryRight }
-        zoomInAnimator.doOnStart { mCardView.translationY = veryBottom }
-
-        zoomOutAnimator = ObjectAnimator.ofPropertyValuesHolder(mCardView, PropertyValuesHolder.ofFloat("scaleX", SCALE_MINI),
-                PropertyValuesHolder.ofFloat("scaleY", SCALE_MINI))
-        zoomOutAnimator.duration = DEFAULT_DURATION
-        zoomOutAnimator.doOnEnd { removeFromParent() }
-
-        if (showVerticalTranslateAnimation) {
-            showAnimatorSet.play(translateUpAnimator).with(zoomInAnimator).before(translateToLeftAnimator)
-        } else {
-            showAnimatorSet.play(zoomInAnimator).before(translateToLeftAnimator)
-        }
-        showAnimatorSet.start()
-    }
-
-    private fun enableSwipeToDismiss() {
-        mCardView?.setOnTouchListener(SwipeDismissTouchListener(mCardView, object : SwipeDismissTouchListener.DismissCallbacks {
-            override fun canDismiss(): Boolean {
-                return true
-            }
-
-            override fun onDismiss(view: View) {
-                removeFromParent()
-            }
-
-            override fun onTouch(view: View, touch: Boolean) {
-                // Ignore.
-            }
-        }))
-    }
-
-    private fun disableSwipeToDismiss() {
-        mCardView?.setOnTouchListener(null)
-    }
-
-    override fun onDetachedFromWindow() {
-        super.onDetachedFromWindow()
-
-        showAnimatorSet.cancel()
-        hideAnimatorSet.cancel()
-
-        try {
-            removeAllListeners(expandAnimator,
-                    shrinkAnimator,
-                    translateUpAnimator,
-                    translateDownAnimator,
-                    translateToLeftAnimator,
-                    translateToRightAnimator)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
-
-    private fun removeAllListeners(vararg ts: Animator) {
-        for (a in ts) {
-            a.removeAllListeners()
-            if (a is ValueAnimator) {
-                a.removeAllUpdateListeners()
-            }
-        }
-    }
-
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        performClick()
-        return super.onTouchEvent(event)
-    }
-
-    private fun shrinkAfterDelay() {
-        postDelayed({ shrink() }, duration)
-    }
-
-    private fun shrink() {
-        shrinkAnimator.doOnEnd { hide() }
-        shrinkAnimator.start()
-    }
-
-    private fun removeFromParent() {
-        clearAnimation()
-        visibility = View.GONE
-
-        postDelayed(object : Runnable {
-            override fun run() {
-                try {
-                    if (parent == null) {
-                        Log.e(javaClass.simpleName, "getParent() returning Null")
-                    } else {
-                        try {
-                            (parent as ViewGroup).removeView(this@NotifierView)
-
-                            onHideListener?.onHide()
-                        } catch (ex: Exception) {
-                            Log.e(javaClass.simpleName, "Cannot remove from parent layout")
-                        }
-                    }
-                } catch (ex: Exception) {
-                    Log.e(javaClass.simpleName, Log.getStackTraceString(ex))
-                }
-            }
-        }, 100)
-    }
-
-    fun setText(text: String?) {
-        if (!TextUtils.isEmpty(text)) {
-            mContentTv.text = text
-            mContentTv.measure(0, 0)
-            textWidth = mContentTv.measuredWidth
-            mContentTv.width = 0
-
-            mCardView.measure(0, 0)
-            cardViewWidth = mCardView.measuredWidth
-        }
-    }
-
-    fun hide() {
-        if (showVerticalTranslateAnimation) {
-            hideAnimatorSet.play(translateDownAnimator).with(zoomOutAnimator).after(translateToRightAnimator)
-        } else {
-            hideAnimatorSet.play(zoomOutAnimator).after(translateToRightAnimator)
-        }
-        hideAnimatorSet.start()
-    }
-
-    fun setIcon(url: String) {
-        ImageUtils.display(mIconIv, url)
-    }
-
-    private fun dp2px(dp: Float): Int {
-        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, context.applicationContext.resources.displayMetrics).toInt()
-    }
-
-    interface OnShowNotificationListener {
-        fun onShow()
-    }
-
-    interface OnHideNotificationListener {
-        fun onHide()
-    }
-
-}

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

@@ -1,238 +0,0 @@
-package com.gh.common.notifier
-
-/*
- * Copyright 2013 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Modifications Copyright (C) 2017 David Kwon
- */
-
-import android.animation.Animator
-import android.animation.AnimatorListenerAdapter
-import android.animation.ValueAnimator
-import android.os.Build
-import androidx.annotation.RequiresApi
-import android.view.MotionEvent
-import android.view.VelocityTracker
-import android.view.View
-import android.view.ViewConfiguration
-
-/**
- * A [View.OnTouchListener] that makes any [View] dismissable when the
- * user swipes (drags her finger) horizontally across the view.
- *
- * @param view     The view to make dismissable.
- * @param callbacks The callback to trigger when the user has indicated that she would like to
- * dismiss this view.
- */
-class SwipeDismissTouchListener(
-        private val mView: View,
-        private val mCallbacks: DismissCallbacks) : View.OnTouchListener {
-
-    // Cached ViewConfiguration and system-wide constant values
-    private val mSlop: Int
-    private val mMinFlingVelocity: Int
-    private val mAnimationTime: Long
-    private var mViewWidth = 1 // 1 and not 0 to prevent dividing by zero
-
-    // Transient properties
-    private var mDownX: Float = 0.toFloat()
-    private var mDownY: Float = 0.toFloat()
-    private var mSwiping: Boolean = false
-    private var mSwipingSlop: Int = 0
-    private var mVelocityTracker: VelocityTracker? = null
-    private var mTranslationX: Float = 0.toFloat()
-
-    init {
-        val vc = ViewConfiguration.get(mView.context)
-        mSlop = vc.scaledTouchSlop
-        mMinFlingVelocity = vc.scaledMinimumFlingVelocity * 16
-        mAnimationTime = mView.context.resources.getInteger(
-                android.R.integer.config_shortAnimTime).toLong()
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB_MR1)
-    override fun onTouch(view: View, motionEvent: MotionEvent): Boolean {
-        // offset because the view is translated during swipe
-        motionEvent.offsetLocation(mTranslationX, 0f)
-
-        if (mViewWidth < 2) {
-            mViewWidth = mView.width
-        }
-
-        when (motionEvent.actionMasked) {
-            MotionEvent.ACTION_DOWN -> {
-                mDownX = motionEvent.rawX
-                mDownY = motionEvent.rawY
-                if (mCallbacks.canDismiss()) {
-                    mVelocityTracker = VelocityTracker.obtain()
-                    mVelocityTracker!!.addMovement(motionEvent)
-                }
-                mCallbacks.onTouch(view, true)
-                return false
-            }
-            MotionEvent.ACTION_UP -> {
-                mVelocityTracker?.run {
-                    val deltaX = motionEvent.rawX - mDownX
-                    this.addMovement(motionEvent)
-                    this.computeCurrentVelocity(1000)
-                    val velocityX = this.xVelocity
-                    val absVelocityX = Math.abs(velocityX)
-                    val absVelocityY = Math.abs(this.yVelocity)
-                    var dismiss = false
-                    var dismissRight = false
-                    if (Math.abs(deltaX) > mViewWidth / 2 && mSwiping) {
-                        dismiss = true
-                        dismissRight = deltaX > 0
-                    } else if (mMinFlingVelocity <= absVelocityX && absVelocityY < absVelocityX && mSwiping) {
-                        // dismiss only if flinging in the same direction as dragging
-                        dismiss = velocityX < 0 == deltaX < 0
-                        dismissRight = this.xVelocity > 0
-                    }
-                    if (dismiss) {
-                        // dismiss
-                        mView.animate()
-                                .translationX((if (dismissRight) mViewWidth else -mViewWidth).toFloat())
-                                .alpha(0f)
-                                .setDuration(mAnimationTime)
-                                .setListener(object : AnimatorListenerAdapter() {
-                                    override fun onAnimationEnd(animation: Animator) {
-                                        performDismiss()
-                                    }
-                                })
-                    } else if (mSwiping) {
-                        // cancel
-                        mView.animate()
-                                .translationX(0f)
-                                .alpha(1f)
-                                .setDuration(mAnimationTime)
-                                .setListener(null)
-                        mCallbacks.onTouch(view, false)
-                    }
-                    this.recycle()
-                    mVelocityTracker = null
-                    mTranslationX = 0f
-                    mDownX = 0f
-                    mDownY = 0f
-                    mSwiping = false
-                }
-            }
-            MotionEvent.ACTION_CANCEL -> {
-                mVelocityTracker?.run {
-                    mView.animate()
-                            .translationX(0f)
-                            .alpha(1f)
-                            .setDuration(mAnimationTime)
-                            .setListener(null)
-                    this.recycle()
-                    mVelocityTracker = null
-                    mTranslationX = 0f
-                    mDownX = 0f
-                    mDownY = 0f
-                    mSwiping = false
-                }
-            }
-            MotionEvent.ACTION_MOVE -> {
-                mVelocityTracker?.run {
-                    this.addMovement(motionEvent)
-                    val deltaX = motionEvent.rawX - mDownX
-                    val deltaY = motionEvent.rawY - mDownY
-                    if (Math.abs(deltaX) > mSlop && Math.abs(deltaY) < Math.abs(deltaX) / 2) {
-                        mSwiping = true
-                        mSwipingSlop = if (deltaX > 0) mSlop else -mSlop
-                        mView.parent.requestDisallowInterceptTouchEvent(true)
-
-                        // Cancel listview's touch
-                        val cancelEvent = MotionEvent.obtain(motionEvent)
-                        cancelEvent.action = MotionEvent.ACTION_CANCEL or (motionEvent.actionIndex shl MotionEvent.ACTION_POINTER_INDEX_SHIFT)
-                        mView.onTouchEvent(cancelEvent)
-                        cancelEvent.recycle()
-                    }
-
-                    if (mSwiping) {
-                        mTranslationX = deltaX
-                        mView.translationX = deltaX - mSwipingSlop
-                        // TODO: use an ease-out interpolator or such
-                        mView.alpha = Math.max(0f, Math.min(1f,
-                                1f - 2f * Math.abs(deltaX) / mViewWidth))
-                        return true
-                    }
-                }
-            }
-            else -> {
-                view.performClick()
-                return false
-            }
-        }
-        return false
-    }
-
-    @RequiresApi(api = Build.VERSION_CODES.HONEYCOMB)
-    private fun performDismiss() {
-        // Animate the dismissed view to zero-height and then fire the dismiss callback.
-        // This triggers layout on each animation frame; in the future we may want to do something
-        // smarter and more performant.
-
-        val lp = mView.layoutParams
-        val originalHeight = mView.height
-
-        val animator = ValueAnimator.ofInt(originalHeight, 1).setDuration(mAnimationTime)
-
-        animator.addListener(object : AnimatorListenerAdapter() {
-            override fun onAnimationEnd(animation: Animator) {
-                mCallbacks.onDismiss(mView)
-                // Reset view presentation
-                mView.alpha = 1f
-                mView.translationX = 0f
-                lp.height = originalHeight
-                mView.layoutParams = lp
-            }
-        })
-
-        animator.addUpdateListener { valueAnimator ->
-            lp.height = valueAnimator.animatedValue as Int
-            mView.layoutParams = lp
-        }
-
-        animator.start()
-    }
-
-    /**
-     * The callback interface used by [SwipeDismissTouchListener] to inform its client
-     * about a successful dismissal of the view for which it was created.
-     */
-    interface DismissCallbacks {
-        /**
-         * Called to determine whether the view can be dismissed.
-         *
-         * @return boolean The view can dismiss.
-         */
-        fun canDismiss(): Boolean
-
-        /**
-         * Called when the user has indicated they she would like to dismiss the view.
-         *
-         * @param view  The originating [View]
-         */
-        fun onDismiss(view: View)
-
-        /**
-         * Called when the user touches the view or release the view.
-         *
-         * @param view  The originating [View]
-         * @param touch The view is being touched.
-         */
-        fun onTouch(view: View, touch: Boolean)
-    }
-}

app/src/main/java/com/gh/common/provider/ActivationProviderImpl.kt

@@ -0,0 +1,18 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.ActivationHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IActivationProvider
+
+@Route(path = RouteConsts.provider.activation, name = "ActivationHelper暴露服务")
+interface ActivationProviderImpl : IActivationProvider {
+    override fun init(context: Context?) {
+
+    }
+
+    override fun sendActivationInfo() {
+        ActivationHelper.sendActivationInfo()
+    }
+}

app/src/main/java/com/gh/common/provider/AppProviderImpl.kt

@@ -0,0 +1,51 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.R
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IAppProvider
+import com.halo.assistant.HaloApp
+
+@Route(path = RouteConsts.provider.app, name = "Application暴露服务")
+class AppProviderImpl : IAppProvider {
+    override fun init(context: Context?) {
+
+    }
+
+    override fun getAppName(): String {
+        return HaloApp.getInstance().getString(R.string.app_name)
+    }
+
+    override fun getGid(): String {
+        return HaloApp.getInstance().gid ?: ""
+    }
+
+    override fun getOaid(): String {
+        return HaloApp.getInstance().oaid ?: ""
+    }
+
+    override fun getChannel(): String {
+        return HaloApp.getInstance().channel ?: ""
+    }
+
+    override fun getUserAgent(): String {
+        return HaloApp.getInstance().userAgent ?: ""
+    }
+
+    override fun getServerUserMark(): String {
+        return HaloApp.getInstance().serverUserMark ?: ""
+    }
+
+    override fun getDeviceRamSize(): Long {
+        return HaloApp.getInstance().deviceRamSize
+    }
+
+    override fun getTemporaryLocalDeviceId(): String {
+        return HaloApp.getInstance().temporaryLocalDeviceId ?: ""
+    }
+
+    override fun isUserAcceptPrivacyPolicy(context: Context): Boolean {
+        return HaloApp.isUserAcceptPrivacyPolicy(context)
+    }
+}

app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt

@@ -0,0 +1,31 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.BuildConfig
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IBuildConfigProvider
+
+@Route(path = RouteConsts.provider.buildConfig, name = "BuildConfig暴露服务")
+class BuildConfigImpl : IBuildConfigProvider {
+    override fun init(context: Context?) {
+
+    }
+
+    override fun getApplicationId(): String = BuildConfig.APPLICATION_ID
+
+    override fun getVersionName(): String = BuildConfig.VERSION_NAME
+
+    override fun getExposureVersion(): String = BuildConfig.EXPOSURE_VERSION
+
+    override fun isDebug(): Boolean = BuildConfig.DEBUG
+
+    override fun getApiHost(): String = BuildConfig.API_HOST
+
+    override fun getDevApiHost(): String = BuildConfig.DEV_API_HOST
+
+    override fun getNewApiHost(): String = BuildConfig.NEW_API_HOST
+
+    override fun getNewDevApiHost(): String = BuildConfig.NEW_DEV_API_HOST
+
+}

app/src/main/java/com/gh/common/provider/CheckLoginProviderImpl.kt

@@ -0,0 +1,18 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.CheckLoginUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.ICheckLoginProvider
+
+@Route(path = RouteConsts.provider.checkLogin, name = "CheckLoginUtils暴露服务")
+class CheckLoginProviderImpl : ICheckLoginProvider {
+    override fun checkLogin(context: Context, entrance: String, action: (() -> Unit)?) {
+        CheckLoginUtils.checkLogin(context, entrance, action)
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt

@@ -0,0 +1,62 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.constant.Config
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IConfigProvider
+
+@Route(path = RouteConsts.provider.config, name = "Config暴露服务")
+class ConfigProviderImpl : IConfigProvider {
+    override fun getTencentAppId(): String {
+        return Config.TENCENT_APPID
+    }
+
+    override fun getWechatAppId(): String {
+        return Config.WECHAT_APPID
+    }
+
+    override fun getUploadLimitSize(): Long {
+        return Config.getSettings()?.image?.uploadLimitSize ?: 0L
+    }
+
+    override fun getSize(): Int {
+        return Config.getSettings()?.image?.size ?: 0
+    }
+
+    override fun getRatio(): Int {
+        return Config.getSettings()?.image?.ratio ?: 0
+    }
+
+    override fun getQuality(): Int {
+        return Config.getSettings()?.image?.quality ?: 0
+    }
+
+    override fun getGif(): String {
+        return Config.getSettings()?.image?.oss?.gif ?: ""
+    }
+
+    override fun getJpeg(): String {
+        return Config.getSettings()?.image?.oss?.jpeg ?: ""
+    }
+
+    override fun getWebp(): String {
+        return Config.getSettings()?.image?.oss?.webp ?: ""
+    }
+
+    override fun getGitThumb(): String {
+        return Config.getSettings()?.image?.oss?.gitThumb ?: ""
+    }
+
+    override fun getGifWaterMark(): String {
+        return Config.getSettings()?.image?.oss?.gifWaterMark ?: ""
+    }
+
+    override fun getQQ(): String {
+        return Config.getSettings()?.support?.qq ?: ""
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/DefaultUrlHandlerProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.DefaultUrlHandler
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDefaultUrlHandlerProvider
+
+@Route(path = RouteConsts.provider.defaultUrlHandler, name = "DefaultUrlHandler暴露服务")
+class DefaultUrlHandlerProviderImpl : IDefaultUrlHandlerProvider {
+
+    override fun interceptUrl(context: Context, url: String, entrance: String):Boolean {
+        return DefaultUrlHandler.interceptUrl(context, url, entrance)
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/DialogUtilsProviderImpl.kt

@@ -0,0 +1,28 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DialogUtils
+import com.gh.gamecenter.common.callback.CancelListener
+import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDialogUtilsProvider
+
+@Route(path = RouteConsts.provider.dialogUtils, name = "DialogUtils暴露服务")
+class DialogUtilsProviderImpl : IDialogUtilsProvider {
+    override fun showRegulationTestDialog(context: Context, confirm: () -> Unit, cancel: () -> Unit) {
+        DialogUtils.showRegulationTestDialog(context, object : ConfirmListener {
+            override fun onConfirm() {
+                confirm.invoke()
+            }
+        }, object :CancelListener{
+            override fun onCancel() {
+                cancel.invoke()
+            }
+        })
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/DirectProviderImpl.kt

@@ -0,0 +1,27 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.DirectUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDirectProvider
+
+@Route(path = RouteConsts.provider.directUtils, name = "DirectUtils暴露服务")
+class DirectProviderImpl : IDirectProvider {
+
+    override fun directToWebView(context: Context, url: String, entrance: String?) {
+        DirectUtils.directToWebView(context, url, entrance)
+    }
+
+    override fun directToRegulationTestPage(context: Context) {
+        DirectUtils.directToRegulationTestPage(context)
+    }
+
+    override fun directToQqConversation(context: Context, qq: String) {
+        DirectUtils.directToQqConversation(context, qq)
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/DownloadManagerProviderImpl.kt

@@ -0,0 +1,21 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.download.DownloadManager
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IDownloadManagerProvider
+import com.lightgame.download.DownloadEntity
+
+@Route(path = RouteConsts.provider.downloadManager, name = "DownloadManager暴露服务")
+class DownloadManagerProviderImpl : IDownloadManagerProvider {
+
+    override fun getDownloadEntityByUrl(url: String): DownloadEntity? {
+        return DownloadManager.getInstance().getDownloadEntityByUrl(url)
+    }
+
+    override fun init(context: Context?) {
+
+    }
+
+}

app/src/main/java/com/gh/common/provider/EnergyTaskProviderImpl.kt

@@ -0,0 +1,23 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.EnergyTaskHelper
+import com.gh.common.util.IntegralLogHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IEnergyTaskProvider
+
+@Route(path = RouteConsts.provider.energyTask, name = "EnergyTask暴露服务")
+class EnergyTaskProviderImpl : IEnergyTaskProvider {
+    override fun postEnergyTaskForShare(type: String, id: String, url: String) {
+        EnergyTaskHelper.postEnergyTaskForShare(type, id, url)
+    }
+
+    override fun logInviteResult(result: String, type: String?) {
+        IntegralLogHelper.logInviteResult(result, type)
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/EntranceUtilsProviderImpl.kt

@@ -0,0 +1,23 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.os.Bundle
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.EntranceUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IEntranceUtilsProvider
+
+@Route(path = RouteConsts.provider.entranceUtils, name = "EntranceUtils暴露服务")
+class EntranceUtilsProviderImpl: IEntranceUtilsProvider {
+    override fun jumpActivity(context: Context, bundle: Bundle) {
+        EntranceUtils.jumpActivity(context, bundle)
+    }
+
+    override fun saveShortcut(activityName: String, bundle: Bundle?) {
+        EntranceUtils.saveShortcut(activityName, bundle)
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/PackageHelperProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.PackageHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IPackageHelperProvider
+
+@Route(path = RouteConsts.provider.packageHelper, name = "PackageHelper暴露服务")
+class PackageHelperProviderImpl : IPackageHelperProvider {
+
+    override fun getLocalPackageNameSet(): HashSet<String> {
+        return PackageHelper.localPackageNameSet
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/PackageInstallerProviderImpl.kt

@@ -0,0 +1,24 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.PackageInstaller
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IPackageInstallerProvider
+import com.lightgame.download.DownloadEntity
+
+@Route(path = RouteConsts.provider.packageInstaller, name = "PackageInstaller暴露服务")
+class PackageInstallerProviderImpl : IPackageInstallerProvider {
+
+    override fun install(context: Context, downloadEntity: DownloadEntity, showUnzipToast: Boolean) {
+        PackageInstaller.install(context, downloadEntity, showUnzipToast)
+    }
+
+    override fun uninstall(context: Context, path: String) {
+        PackageInstaller.uninstall(context, path)
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/PackageUtilsProviderImpl.kt

@@ -0,0 +1,39 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.content.pm.PackageInfo
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.PackageUtils
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IPackageUtilsProvider
+
+@Route(path = RouteConsts.provider.packageUtils, name = "PackageUtils暴露服务")
+class PackageUtilsProviderImpl : IPackageUtilsProvider {
+    override fun obtainProcessName(context: Context): String? {
+        return PackageUtils.obtainProcessName(context)
+    }
+
+    override fun getGhVersionName(): String {
+        return PackageUtils.getGhVersionName()
+    }
+
+    override fun getGhVersionCode(): Int {
+        return PackageUtils.getGhVersionCode()
+    }
+
+    override fun getInstalledPackages(context: Context, flag: Int): List<PackageInfo> {
+        return PackageUtils.getInstalledPackages(context, flag)
+    }
+
+    override fun getApkSignatureByPackageName(context: Context, packageName: String): Array<String> {
+        return PackageUtils.getApkSignatureByPackageName(context, packageName)
+    }
+
+    override fun getSideLoadedInfo(): MutableMap<String, String>? {
+        return PackageUtils.getSideLoadedInfo()
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/QuickLoginProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.common.util.QuickLoginHelper
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IQuickLoginProvider
+
+@Route(path = RouteConsts.provider.quickLogin, name = "一键登录暴露服务")
+class QuickLoginProviderImpl : IQuickLoginProvider {
+
+    override fun startLogin(context: Context, entrance: String) {
+        QuickLoginHelper.startLogin(context, entrance)
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/UserManagerProviderImpl.kt

@@ -0,0 +1,38 @@
+package com.gh.common.provider
+
+import android.content.Context
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IUserManagerProvider
+import com.gh.gamecenter.manager.UserManager
+
+@Route(path = RouteConsts.provider.userManager, name = "UserManager暴露服务")
+class UserManagerProviderImpl : IUserManagerProvider {
+    override fun userShouldTakeRegulationBaseOnLastRemind(): Boolean {
+        return UserManager.getInstance().userShouldTakeRegulationBaseOnLastRemind()
+    }
+
+    override fun getUserId(): String {
+        return UserManager.getInstance().userId ?: ""
+    }
+
+    override fun getToken(): String {
+        return UserManager.getInstance().token ?: ""
+    }
+
+    override fun refreshToken(accessToken: String, success: () -> Unit, fail: (String?) -> Unit) {
+        UserManager.getInstance().refreshToken(accessToken, object : UserManager.refreshCallBack {
+            override fun onLogin() {
+                success.invoke()
+            }
+
+            override fun onLoginFailure(errorMessage: String?) {
+                fail.invoke(errorMessage)
+            }
+        })
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/provider/WebProviderImpl.kt

@@ -0,0 +1,19 @@
+package com.gh.common.provider
+
+import android.content.Context
+import android.content.Intent
+import com.alibaba.android.arouter.facade.annotation.Route
+import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.common.constant.RouteConsts
+import com.gh.gamecenter.core.provider.IWebProvider
+
+@Route(path = RouteConsts.provider.webActivity, name = "WebActivity暴露服务")
+class WebProviderImpl : IWebProvider {
+    override fun getIntent(context: Context, url: String, autoCompletionTitle: Boolean): Intent {
+        return WebActivity.getIntent(context, url, autoCompletionTitle)
+    }
+
+    override fun init(context: Context?) {
+
+    }
+}

app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt

@@ -2,7 +2,7 @@ package com.gh.common.repository
 
 import com.gh.common.filter.RegionSettingHelper
 import com.gh.common.util.ApkActiveUtils
-import com.gh.common.util.RandomUtils
+import com.gh.gamecenter.core.utils.RandomUtils
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.Observable

app/src/main/java/com/gh/common/repository/ReservationRepository.kt

@@ -3,7 +3,7 @@ package com.gh.common.repository
 import android.annotation.SuppressLint
 import com.gh.common.util.CheckLoginUtils
 import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils

app/src/main/java/com/gh/common/simulator/SimulatorDownloadManager.kt

@@ -9,12 +9,15 @@ import android.widget.TextView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.constraintlayout.widget.ConstraintLayout
 import com.g00fy2.versioncompare.Version
-import com.gh.common.AppExecutor.uiExecutor
-import com.gh.common.constant.Constants
-import com.gh.common.dialog.TrackableDialog
+import com.gh.gamecenter.core.AppExecutor.uiExecutor
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.base.TrackableDialog
 import com.gh.common.util.*
+import com.gh.common.util.LogUtils
 import com.gh.download.DownloadManager
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.SimulatorEntity
 import com.gh.gamecenter.entity.TrackableEntity

app/src/main/java/com/gh/common/simulator/SimulatorGameManager.kt

@@ -7,15 +7,19 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.text.TextUtils
 import com.g00fy2.versioncompare.Version
-import com.gh.common.json.json
+import com.gh.gamecenter.common.json.json
 import com.gh.common.util.*
+import com.gh.common.util.LogUtils
 import com.gh.download.DownloadManager
+import com.gh.gamecenter.common.callback.BiCallback
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.SimulatorGameRecordEntity
 import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.retrofit.BiResponse
-import com.gh.gamecenter.retrofit.EmptyResponse
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.retrofit.EmptyResponse
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.room.AppDatabase
 import com.halo.assistant.HaloApp

app/src/main/java/com/gh/common/syncpage/example/ExampleAdapter.kt

@@ -1,98 +0,0 @@
-package com.gh.common.syncpage.example
-
-import android.content.Context
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.gh.common.constant.ItemViewType
-import com.gh.common.syncpage.ISyncAdapterHandler
-import com.gh.gamecenter.R
-import com.gh.gamecenter.adapter.viewholder.FooterViewHolder
-import com.gh.gamecenter.baselist.ListAdapter
-import com.gh.gamecenter.databinding.CommunityAnswerItemBinding
-import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.qa.answer.CommunityAnswerItemViewHolder
-import com.gh.gamecenter.qa.answer.detail.AnswerDetailActivity
-import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
-import com.gh.gamecenter.qa.entity.AnswerEntity
-import com.gh.gamecenter.qa.entity.Questions
-
-class ExampleAdapter(context: Context) : ListAdapter<AnswerEntity>(context), ISyncAdapterHandler {
-
-    override fun areItemsTheSame(oldItem: AnswerEntity?, newItem: AnswerEntity?): Boolean {
-        return oldItem?.id == newItem?.id
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        if (position == itemCount - 1) return ItemViewType.ITEM_FOOTER
-        return ItemViewType.ITEM_BODY
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val view: View
-        return when (viewType) {
-            ItemViewType.ITEM_FOOTER -> {
-                view = mLayoutInflater.inflate(R.layout.refresh_footerview, parent, false)
-                FooterViewHolder(view)
-            }
-            else -> {
-                view = mLayoutInflater.inflate(R.layout.community_answer_item, parent, false)
-                CommunityAnswerItemViewHolder(CommunityAnswerItemBinding.bind(view))
-            }
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return if (mEntityList.isNotEmpty()) mEntityList.size + FOOTER_ITEM_COUNT else 0
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (getItemViewType(position)) {
-            ItemViewType.ITEM_BODY -> {
-                val answer = mEntityList[position]
-                if ("community_article" == answer.type) {
-                    val questions = Questions()
-                    questions.title = answer.articleTitle
-                    answer.questions = questions
-                }
-
-                val answerViewHolder = holder as CommunityAnswerItemViewHolder
-                val binding = answerViewHolder.binding
-                answerViewHolder.bindAnswerItem(answer, "", getPath())
-                binding.title.setOnClickListener {
-                    if ("community_article" == answer.type) {
-                        mContext.startActivity(ArticleDetailActivity.getIntent(mContext, UserManager.getInstance().community, answer.id!!, "", getPath()))
-                    }
-//                    else {
-//                        val questions = answer.questions
-//                        mContext.startActivity(QuestionsDetailActivity.getIntent(mContext, questions.id, "", getPath()))
-//                    }
-                }
-
-                answerViewHolder.itemView.setOnClickListener {
-                    if ("community_article" == answer.type) {
-                        mContext.startActivity(ArticleDetailActivity.getIntent(mContext, UserManager.getInstance().community, answer.id!!, "", getPath()))
-                    } else {
-                        mContext.startActivity(AnswerDetailActivity.getIntent(mContext, answer.id, "", getPath()))
-                    }
-                }
-            }
-            ItemViewType.ITEM_FOOTER -> {
-                val footerViewHolder = holder as FooterViewHolder
-                footerViewHolder.initItemPadding()
-                footerViewHolder.initFooterViewHolder(mIsLoading, mIsNetworkError, mIsOver)
-            }
-        }
-    }
-
-    override fun getSyncData(position: Int): Pair<String, AnswerEntity>? {
-        if (position >= mEntityList.size) return null
-        val entity = mEntityList[position]
-        return Pair(entity.id ?: "", entity)
-    }
-
-    fun getPath(): String {
-        return "问答-推荐-按时间"
-    }
-
-}

app/src/main/java/com/gh/common/syncpage/example/ExampleFragment.kt

@@ -1,65 +0,0 @@
-package com.gh.common.syncpage.example
-
-import android.os.Bundle
-import android.view.View
-import androidx.lifecycle.ViewModelProviders
-import androidx.recyclerview.widget.RecyclerView
-import com.gh.common.view.VerticalItemDecoration
-import com.gh.gamecenter.baselist.ListFragment
-import com.gh.gamecenter.baselist.NormalListViewModel
-import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.qa.entity.AnswerEntity
-import com.gh.gamecenter.retrofit.RetrofitManager
-import com.halo.assistant.HaloApp
-import io.reactivex.Observable
-
-class ExampleFragment : ListFragment<AnswerEntity, NormalListViewModel<AnswerEntity>>() {
-
-    private var mAdapter: ExampleAdapter? = null
-
-    override fun provideListAdapter(): ExampleAdapter {
-        if (mAdapter == null) {
-            mAdapter = ExampleAdapter(requireContext())
-        }
-        return mAdapter!!
-    }
-
-    override fun getItemDecoration(): RecyclerView.ItemDecoration {
-        return VerticalItemDecoration(context, 8F, false)
-    }
-
-    override fun provideDataObservable(page: Int): Observable<MutableList<AnswerEntity>> {
-        return RetrofitManager.getInstance().api.getCommunitiesRecommendNewest(UserManager.getInstance().community.id, page)
-    }
-
-    override fun provideListViewModel(): NormalListViewModel<AnswerEntity> {
-        val factory = NormalListViewModel.Factory(HaloApp.getInstance().application, this)
-        return ViewModelProviders.of(this, factory).get(NormalListViewModel::class.java) as NormalListViewModel<AnswerEntity>
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-//        SyncPageRepository.syncPageLiveData.observe(this, Observer {
-//            it ?: return@Observer
-//            val adapter = mListRv.adapter
-//            if (adapter !is ISyncAdapterHandler) return@Observer
-//            for(position in 0 until adapter.itemCount) {
-//                val syncKey = adapter.getSyncData(position)
-//                for (syncDataEntity in it) {
-//                    if (syncDataEntity.syncId == syncKey?.first) {
-//                        val isSuccess = SyncPageRepository.handleSyncData(syncKey.second, syncDataEntity)
-//                        if (isSuccess) adapter.notifyItemChanged(position)
-//                    }
-//                }
-//            }
-//        })
-    }
-
-    override fun provideSyncAdapter(): RecyclerView.Adapter<*>? {
-        return mListRv.adapter
-    }
-
-    override fun addSyncPageObserver(): Boolean {
-        return true
-    }
-}

app/src/main/java/com/gh/common/util/ActivationHelper.kt

@@ -1,6 +1,7 @@
 package com.gh.common.util
 
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.schedulers.Schedulers
 import okhttp3.ResponseBody

app/src/main/java/com/gh/common/util/AdHelper.kt

@@ -3,9 +3,10 @@ package com.gh.common.util
 import android.annotation.SuppressLint
 import androidx.lifecycle.MutableLiveData
 import com.gh.common.constant.Config
+import com.gh.gamecenter.common.utils.NetworkUtils
 import com.gh.gamecenter.entity.SettingsEntity
 import com.gh.gamecenter.entity.StartupAdEntity
-import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.schedulers.Schedulers
@@ -16,7 +17,6 @@ object AdHelper {
     const val LOCATION_SEARCH_EMPTY = "search_empty"
     const val LOCATION_GAME_REQUEST_VERSION = "game_request_version"
     const val LOCATION_SUGGESTION_FUNCTION = "suggestion_function"
-    const val LOCATION_DISCOVER = "discover"
     const val LOCATION_SIMULATOR_GAME = "simulator_game"
 
     @JvmField
@@ -50,20 +50,6 @@ object AdHelper {
         return null
     }
 
-    fun getDiscoverAds(): List<SettingsEntity.AD> {
-        val adList = Config.getSettings()?.adList ?: return listOf()
-
-        val discoverAdList = arrayListOf<SettingsEntity.AD>()
-
-        for (ad in adList) {
-            if (ad.location == LOCATION_DISCOVER) {
-                discoverAdList.add(ad)
-            }
-        }
-
-        return discoverAdList
-    }
-
     fun getAdForLocation(location: String): SettingsEntity.AD? {
         val adList = Config.getSettings()?.adList ?: return null
 

app/src/main/java/com/gh/common/util/AntiBotHelper.kt

@@ -1,10 +0,0 @@
-package com.gh.common.util
-
-object AntiBotHelper {
-//    @JvmStatic
-//    val manager by lazy {
-//        SecurityGuardManager.getInstance(HaloApp.getInstance().application).getInterface(IJAQAVMPSignComponent::class.java).apply {
-//            this.initialize()
-//        }
-//    }
-}

app/src/main/java/com/gh/common/util/BbsReportHelper.kt

@@ -9,15 +9,19 @@ import android.view.View
 import android.view.Window
 import androidx.core.widget.doOnTextChanged
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.gh.base.CurrentActivityHolder
-import com.gh.common.json.json
-import com.gh.common.view.VerticalItemDecoration
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.common.json.json
+import com.gh.gamecenter.common.view.VerticalItemDecoration
 import com.gh.gamecenter.R
 import com.gh.gamecenter.SuggestionActivity
 import com.gh.gamecenter.adapter.ReportReasonAdapter
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.common.utils.toColor
+import com.gh.gamecenter.common.utils.toObject
+import com.gh.gamecenter.common.utils.toRequestBody
 import com.gh.gamecenter.databinding.DialogReportReasonBinding
 import com.gh.gamecenter.entity.SettingsEntity
-import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.android.schedulers.AndroidSchedulers

app/src/main/java/com/gh/common/util/BbsStayTimeHelper.kt

@@ -4,15 +4,18 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Application
 import android.os.Bundle
-import com.gh.base.CurrentActivityHolder
-import com.gh.base.GHThreadFactory
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
+import com.gh.gamecenter.core.GHThreadFactory
 import com.gh.gamecenter.MainActivity
+import com.gh.gamecenter.core.utils.ToastUtils
+import com.gh.gamecenter.common.utils.isPublishEnv
+import com.gh.gamecenter.common.utils.tryWithDefaultCatch
 import com.gh.gamecenter.forum.detail.ForumDetailActivity
 import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
 import com.gh.gamecenter.qa.comment.CommentActivity
 import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
-import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.android.schedulers.AndroidSchedulers

app/src/main/java/com/gh/common/util/CheckLoginUtils.java

@@ -5,9 +5,12 @@ import android.content.Context;
 import android.os.Bundle;
 import android.text.TextUtils;
 
-import com.gh.base.CurrentActivityHolder;
-import com.gh.common.constant.Constants;
+import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.core.utils.CurrentActivityHolder;
+import com.gh.gamecenter.common.constant.Constants;
 import com.gh.gamecenter.LoginActivity;
+import com.gh.gamecenter.common.utils.NetworkUtils;
+import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.manager.UserManager;
 import com.lightgame.utils.Utils;
 
@@ -36,8 +39,8 @@ public class CheckLoginUtils {
             } else {
                 // 有可能App未启动
                 Bundle bundle = new Bundle();
-                bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-                bundle.putString(EntranceUtils.KEY_TO, LoginActivity.class.getName());
+                bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
+                bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName());
                 EntranceUtils.jumpActivity(context, bundle);
             }
         } else {
@@ -55,8 +58,8 @@ public class CheckLoginUtils {
 
             // 有可能App未启动
             Bundle bundle = new Bundle();
-            bundle.putString(EntranceUtils.KEY_ENTRANCE, entrance);
-            bundle.putString(EntranceUtils.KEY_TO, LoginActivity.class.getName());
+            bundle.putString(EntranceConsts.KEY_ENTRANCE, entrance);
+            bundle.putString(EntranceConsts.KEY_TO, LoginActivity.class.getName());
             EntranceUtils.jumpActivity(context, nextToBundle, bundle, (resultCode, data) -> {
                 if (isTriggerNextStep && listener != null && isLogin()) {
                     listener.onLogin();

app/src/main/java/com/gh/common/util/CollectionUtils.kt

@@ -3,7 +3,7 @@ package com.gh.common.util
 import android.content.Context
 import com.gh.gamecenter.eventbus.EBCollectionChanged
 import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers

app/src/main/java/com/gh/common/util/CommentDraftContainer.kt

@@ -1,8 +0,0 @@
-package com.gh.common.util
-
-import com.gh.gamecenter.room.AppDatabase
-import com.gh.gamecenter.room.dao.CommentDraftDao
-
-object CommentDraftContainer {
-    val commentDraftDao: CommentDraftDao by lazy { AppDatabase.getInstance().commentDraftDao() }
-}

app/src/main/java/com/gh/common/util/CommentHelper.kt

@@ -5,18 +5,21 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
-import com.gh.common.constant.Constants
-import com.gh.common.json.json
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.json.json
 import com.gh.common.util.CommentUtils.copyText
-import com.gh.common.view.BugFixedPopupWindow
+import com.gh.gamecenter.common.view.BugFixedPopupWindow
 import com.gh.gamecenter.CommentDetailActivity
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.gamecenter.common.utils.ifLogin
+import com.gh.gamecenter.common.utils.showAutoOrientation
 import com.gh.gamecenter.entity.CommentEntity
 import com.gh.gamecenter.entity.MeEntity
 import com.gh.gamecenter.entity.Permissions
 import com.gh.gamecenter.manager.UserManager
 import com.gh.gamecenter.qa.comment.OnCommentOptionClickListener
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils
@@ -45,7 +48,7 @@ object CommentHelper {
             showConversation = showConversation,
             articleId = articleId,
             communityId = communityId,
-            isShowTop = isShowTop,
+            isShowTopOrAccept = isShowTop,
             ignoreModerator = ignoreModerator,
             listener = listener
         )
@@ -84,7 +87,7 @@ object CommentHelper {
             showConversation = showConversation,
             videoId = videoId,
             isVideoAuthor = isVideoAuthor,
-            isShowTop = isShowTop,
+            isShowTopOrAccept = isShowTop,
             listener = listener
         )
     }
@@ -101,7 +104,7 @@ object CommentHelper {
             commentEntity = commentEntity,
             showConversation = false,
             questionId = questionId,
-            isShowTop = isShowTop,
+            isShowTopOrAccept = isShowTop,
             ignoreModerator = true,
             listener = listener
         )
@@ -133,18 +136,19 @@ object CommentHelper {
         questionId: String? = null,
         videoId: String? = null,
         gameCollectionId: String? = null,
-        isShowTop: Boolean = false,
+        isShowTopOrAccept: Boolean = false,
         ignoreModerator: Boolean = false,
         isVideoAuthor: Boolean = false,
         listener: OnCommentOptionClickListener? = null
     ) {
         val context = view.context
         val dialogOptions = ArrayList<String>()
+        val isContentAuthor = commentEntity.me?.isContentAuthor == true
 
-        if (isShowTop && (articleId != null || questionId != null || videoId != null) && commentEntity.me?.isContentAuthor == true) {
+        if (isShowTopOrAccept && (articleId != null || questionId != null || videoId != null) && isContentAuthor) {
             dialogOptions.add(if (commentEntity.isTop) "取消置顶" else "置顶")
         }
-        if (questionId != null && commentEntity.me?.isContentAuthor == true) {
+        if (isShowTopOrAccept && questionId != null && isContentAuthor) {
             if (commentEntity.accept) {
                 dialogOptions.add("取消采纳")
             } else {
@@ -170,7 +174,7 @@ object CommentHelper {
         ) {
             dialogOptions.add("取消精选")
         }
-        if (commentEntity.user.id == UserManager.getInstance().userId || commentEntity.me?.isModerator == true || commentEntity.me?.isContentAuthor == true) {
+        if (commentEntity.user.id == UserManager.getInstance().userId || commentEntity.me?.isModerator == true || isContentAuthor) {
             dialogOptions.add("删除评论")
         }
 

app/src/main/java/com/gh/common/util/CommentUtils.java

@@ -17,12 +17,18 @@ import androidx.core.content.ContextCompat;
 import com.gh.gamecenter.CommentDetailActivity;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.CommentViewHolder;
+import com.gh.gamecenter.common.callback.SimpleCallback;
+import com.gh.gamecenter.common.retrofit.BiResponse;
+import com.gh.gamecenter.common.retrofit.Response;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.ImageUtils;
+import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.gamecenter.core.utils.NumberUtils;
+import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.entity.CommentEntity;
 import com.gh.gamecenter.entity.MeEntity;
 import com.gh.gamecenter.entity.UserInfoEntity;
 import com.gh.gamecenter.manager.UserManager;
-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;
@@ -129,23 +135,20 @@ public class CommentUtils {
                     0, DisplayUtils.dip2px(context, 12));
             container.addView(reportTv);
 
-            reportTv.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    dialog.cancel();
-                    switch (reportTv.getText().toString()) {
-                        case "复制":
-                            copyText(commentEntity.getContent(), context);
-                            break;
-                        case "投诉":
-                            CheckLoginUtils.checkLogin(context, patch + "-投诉",
-                                    () -> showReportTypeDialog(commentEntity, context));
+            reportTv.setOnClickListener(v -> {
+                dialog.cancel();
+                switch (reportTv.getText().toString()) {
+                    case "复制":
+                        copyText(commentEntity.getContent(), context);
+                        break;
+                    case "投诉":
+                        CheckLoginUtils.checkLogin(context, patch + "-投诉",
+                                () -> showReportTypeDialog(commentEntity, context));
 
-                            break;
-                        case "查看对话":
-                            context.startActivity(CommentDetailActivity.getIntent(context, commentEntity.getId(), null));
-                            break;
-                    }
+                        break;
+                    case "查看对话":
+                        context.startActivity(CommentDetailActivity.getIntent(context, commentEntity.getId(), null));
+                        break;
                 }
             });
         }

app/src/main/java/com/gh/common/util/CommunityHelper.kt

@@ -1,47 +0,0 @@
-package com.gh.common.util
-
-import com.gh.gamecenter.packagehelper.PackageRepository
-import com.gh.gamecenter.qa.entity.CommunitySelectEntity
-
-object CommunityHelper {
-
-    /**
-     * 为已开通的社区排序
-     * 排序规则为将本地存在已安装游戏或已关联游戏的社区置顶
-     */
-    fun sortOpenedCommunity(rawList: List<CommunitySelectEntity>?): ArrayList<CommunitySelectEntity> {
-        val sortedList = ArrayList<CommunitySelectEntity>()
-        rawList?.let {
-            for (game in rawList) {
-                var thisGameIsInstalled = false
-                for (installGame in PackageRepository.gameInstalled) {
-                    if (PackageHelper.downloadPackageNameBlackList.contains(installGame.packageName)) {
-                        continue
-                    }
-
-                    // 判断是否已安装
-                    if (installGame.id == game.game.id) {
-                        thisGameIsInstalled = true
-                        break
-                    }
-
-                    // 判断是否关联了别游戏
-                    for (relatedGameId in game.game.relation) {
-                        if (installGame.id == relatedGameId) {
-                            thisGameIsInstalled = true
-                            break
-                        }
-                    }
-                }
-
-                // 将已安装的置顶
-                if (thisGameIsInstalled) {
-                    sortedList.add(0, game)
-                } else {
-                    sortedList.add(game)
-                }
-            }
-        }
-        return sortedList
-    }
-}

app/src/main/java/com/gh/common/util/ConcernContentUtils.java

@@ -7,6 +7,8 @@ import android.widget.LinearLayout;
 import com.facebook.drawee.drawable.ScalingUtils;
 import com.facebook.drawee.view.SimpleDraweeView;
 import com.gh.gamecenter.ImageViewerActivity;
+import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.gamecenter.common.utils.ImageUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +33,7 @@ public class ConcernContentUtils {
                     ll = new LinearLayout(context);
                     ll.setOrientation(LinearLayout.HORIZONTAL);
                     for (int j = 0; j < 3; j++) {
-                        SimpleDraweeView draweeView = getImageView(context, list, entrance, index, width, 0);
+                        SimpleDraweeView draweeView = getImageView(context, list, index, width, 0);
                         imageViewList.add(draweeView);
                         int position = index;
                         draweeView.setOnClickListener(v -> {
@@ -45,7 +47,7 @@ public class ConcernContentUtils {
                     count -= 3;
                     break;
                 case 1:
-                    SimpleDraweeView draweeView = getImageView(context, list, entrance, index, width, 1);
+                    SimpleDraweeView draweeView = getImageView(context, list, index, width, 1);
                     imageViewList.add(draweeView);
                     int position1 = index;
                     draweeView.setOnClickListener(v -> {
@@ -60,7 +62,7 @@ public class ConcernContentUtils {
                     ll = new LinearLayout(context);
                     ll.setOrientation(LinearLayout.HORIZONTAL);
                     for (int j = 0; j < 2; j++) {
-                        SimpleDraweeView imageView = getImageView(context, list, entrance, index, width, 2);
+                        SimpleDraweeView imageView = getImageView(context, list, index, width, 2);
                         imageViewList.add(imageView);
                         int position2 = index;
                         imageView.setOnClickListener(v -> {
@@ -77,8 +79,11 @@ public class ConcernContentUtils {
         }
     }
 
-    private static SimpleDraweeView getImageView(final Context context, final List<String> list, final String entrance,
-                                                 final int position, int width, int type) {
+    private static SimpleDraweeView getImageView(final Context context,
+                                                 final List<String> list,
+                                                 final int position,
+                                                 int width,
+                                                 int type) {
         SimpleDraweeView imageView;
         LinearLayout.LayoutParams lparams;
         switch (type) {

app/src/main/java/com/gh/common/util/ConcernUtils.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.text.TextUtils
 import com.gh.gamecenter.eventbus.EBConcernChanged
 import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers

app/src/main/java/com/gh/common/util/DataCollectionUtils.java

@@ -3,7 +3,9 @@ package com.gh.common.util;
 import android.content.Context;
 import android.os.Build;
 
-import com.gh.common.constant.Constants;
+import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.common.utils.NetworkUtils;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.NewsDetailEntity;
 import com.gh.gamecenter.manager.DataCollectionManager;
@@ -49,7 +51,7 @@ public class DataCollectionUtils {
         map.put("platform", PlatformUtils.getInstance(context).getPlatformName(downloadEntity.getPlatform()));
         map.put("status", status);
         map.put("location", downloadEntity.getLocation());
-        map.put(EntranceUtils.KEY_ENTRANCE, downloadEntity.getEntrance());
+        map.put(EntranceConsts.KEY_ENTRANCE, downloadEntity.getEntrance());
         map.put("installed", downloadEntity.getInstalled());
         map.put("network", NetworkUtils.getConnectedType(context));
         DataCollectionManager.onEvent(context, "download", map);

app/src/main/java/com/gh/common/util/DataUtils.java

@@ -1,7 +1,6 @@
 package com.gh.common.util;
 
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.Application;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -10,17 +9,23 @@ import android.net.Uri;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
+import android.util.Log;
 
+import com.gh.base.GlobalActivityManager;
 import androidx.annotation.RequiresApi;
 
-import com.gh.common.AppExecutor;
-import com.gh.common.constant.Constants;
-import com.gh.common.exposure.meta.MetaUtil;
 import com.gh.gamecenter.BuildConfig;
+import com.gh.gamecenter.common.base.activity.BaseActivity;
+import com.gh.gamecenter.common.constant.Constants;
+import com.gh.gamecenter.common.exposure.meta.MetaUtil;
+import com.gh.gamecenter.common.retrofit.BiResponse;
+import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.core.utils.GsonUtils;
+import com.gh.gamecenter.core.utils.MtaHelper;
+import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.entity.IdCardEntity;
 import com.gh.gamecenter.entity.UserInfoEntity;
 import com.gh.gamecenter.provider.GhContentProvider;
-import com.gh.gamecenter.retrofit.BiResponse;
 import com.gh.gamecenter.retrofit.RetrofitManager;
 import com.gh.gid.GidCallback;
 import com.gh.gid.GidHelper;
@@ -34,6 +39,7 @@ import java.util.Map;
 import io.reactivex.schedulers.Schedulers;
 import io.sentry.Sentry;
 import io.sentry.android.core.SentryAndroid;
+import kotlin.Pair;
 
 /**
  * Created by LGT on 2016/6/15.
@@ -43,87 +49,16 @@ public class DataUtils {
 
     /**
      * 初始化各种统计工具，仅在release build（非debug）模式启用统计
-     *
-     * @param context
-     * @param channel
      */
     public static void init(final Application context, String channel) {
         if (CommonDebug.IS_DEBUG) {
             return;
         }
-
+    
         // 初始化 Sentry 约占用 90ms，这里切换到子线程初始化
         AppExecutor.getIoExecutor().execute(() -> initSentry(context, channel));
-
-        //TalkingData
-//        try {
-//            TCAgent.LOG_ON = false;
-//            TCAgent.init(context, Config.TALKINGDATA_APPID, channel);
-//            /**
-//             *
-//             * 不要启用！！！！不要启用，全部由{@link com.gh.base.AppUncaughtHandler}处理
-//             */
-//            TCAgent.setReportUncaughtExceptions(false);
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-
-        //MTA
-//        try {
-//            /**
-//             *
-//             * 不要启用！！！！全部由{@link com.gh.base.AppUncaughtHandler}处理
-//             */
-//            StatConfig.setAutoExceptionCaught(false);
-//
-//            StatCrashReporter crashReporter = StatCrashReporter.getStatCrashReporter(context);
-//            crashReporter.setJavaCrashHandlerStatus(false);
-////            crashReporter.setEnableInstantReporting(true);
-//
-//            StatConfig.setDebugEnable(false);
-//
-//            // 设置数据上报策略
-//            // 测试渠道的时候即时上传，方便查看日志
-//            if (Config.DEFAULT_CHANNEL.equals(HaloApp.getInstance().getChannel())) {
-//                StatConfig.setStatSendStrategy(StatReportStrategy.INSTANT);
-//            } else {
-//                StatConfig.setStatSendStrategy(StatReportStrategy.PERIOD);
-//                StatConfig.setSendPeriodMinutes(5);
-//            }
-//
-//            // 设置启用Tlink
-//            StatConfig.setTLinkStatus(true);
-//
-//            StatConfig.init(context);
-//            StatConfig.setInstallChannel(channel);
-//            StatConfig.setAntoActivityLifecycleStat(true);
-//            StatConfig.setAppVersion(PackageUtils.getVersionName());
-//
-//            // 开启收集服务
-//            StatService.startStatService(context, Config.MTA_APPKEY, com.tencent.stat.common.StatConstants.VERSION);
-//            StatService.registerActivityLifecycleCallbacks(context);
-//        } catch (MtaSDkException e) {
-//            e.printStackTrace();
-//        }
-
-        // init bugly
-//        try {
-//            CrashReport.setIsDevelopmentDevice(context, Config.DEFAULT_CHANNEL.equals(channel));
-//
-//            CrashReport.UserStrategy strategy = new CrashReport.UserStrategy(context);
-//            strategy.setEnableANRCrashMonitor(false);
-//            strategy.setEnableNativeCrashMonitor(false);
-//            strategy.setAppChannel(channel);
-//            strategy.setAppVersion(PackageUtils.getVersionName());
-//
-//            CrashReport.initCrashReport(context, Config.BUGLY_APPID, false, strategy);
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-
     }
-
+    
     private static void initSentry(Context context, String channel) {
         SentryAndroid.init(context, options -> {
             // Sentry 疯狂报 ANR (很大一部分还是莫名奇妙的 ANR)严重影响到其它闪退日志的收集
@@ -134,12 +69,12 @@ public class DataUtils {
             } else {
                 options.setAnrEnabled(false);
             }
-
+        
             options.setDebug(BuildConfig.DEBUG);
             options.setEnableSessionTracking(true);
             options.setEnvironment(BuildConfig.FLAVOR);
             options.setDsn("https://6b1caf0d17c1408e8680f3f73ff80bd0@sentry.shanqu.cc/22");
-
+        
             options.setBeforeSend((event, hint) -> {
                 if (BuildConfig.DEBUG) {
                     return null;
@@ -147,10 +82,21 @@ public class DataUtils {
                     return event;
                 }
             });
-        });
 
+            options.setBeforeBreadcrumb(((breadcrumb, hint) -> {
+                if ("ui.lifecycle".equals(breadcrumb.getCategory()) && "started".equals(breadcrumb.getData("state")) && GlobalActivityManager.INSTANCE.getCurrentActivity() instanceof BaseActivity) {
+                    Pair<String, String> businessId = ((BaseActivity) GlobalActivityManager.INSTANCE.getCurrentActivity()).getBusinessId();
+                    if (businessId != null) {
+                        breadcrumb.setData("businessId1", businessId.component1());
+                        breadcrumb.setData("businessId2", businessId.component2());
+                    }
+                }
+                return breadcrumb;
+            }));
+        });
+    
         Sentry.configureScope(scope -> {
-            if (BuildConfig.BUILD_TIME != 0L) {
+            if (com.gh.gamecenter.common.BuildConfig.BUILD_TIME != 0L) {
                 scope.setTag("alias", "内测版" + BuildConfig.VERSION_NAME);
             } else {
                 scope.setTag("alias", "正式版" + BuildConfig.VERSION_NAME);
@@ -159,14 +105,6 @@ public class DataUtils {
         });
     }
 
-    // MTA ->【次数统计】Key-Value参数的事件
-    public static void onMtaEvent(Context context, String eventId, String... kv) {
-//        if (CommonDebug.IS_DEBUG && (kv == null || kv.length % 2 != 0)) {
-//            throw new IllegalStateException("onEvent kv 必须不为空且数量为偶数");
-//        }
-        MtaHelper.onEvent(eventId, kv);
-    }
-
     public static void getGid() {
         GidHelper.getInstance().registerDevice(HaloApp.getInstance().getApplication(), new GidCallback() {
             @Override
@@ -223,114 +161,29 @@ public class DataUtils {
                             values.put(GhContentProvider.KEY_IS_ADULT, false);
                         }
 
-                        HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/certification"), values);
+                     new GhContentProvider().localInsert( HaloApp.getInstance().getApplication(),values);
+//                        HaloApp.getInstance().getContentResolver().insert(Uri.parse("content://com.gh.gamecenter.provider/certification"), values);
                     }
                 });
     }
 
-    public static void onEvent(Context var0, String var1, String var2) {
-//        Properties prop = new Properties();
-//        prop.setProperty(var1, var2);
-//        StatService.trackCustomKVEvent(var0, var1, prop);
-    }
+    /**
+     * 下次应用启动再上报
+     *
+     * @param context
+     * @param throwable
+     */
+    public static void reportException(Context context, Throwable throwable) {
 
-    public static void onPause(Activity var0) {
-//        StatService.onPause(var0);
-    }
+        CommonDebug.logMethodWithParams(context, "ERRMSG", throwable);
 
-    public static void onResume(Activity var0) {
-//        StatService.onResume(var0);
-    }
-
-    // 游戏启动
-    public static void onGameLaunchEvent(Context context, String gameName, String platform, String page) {
-        Map<String, Object> kv = new HashMap<>();
-        kv.put("版本", platform);
-        kv.put("页面", page);
-        onEvent(context, "游戏启动", gameName, kv);
-    }
-
-    public static void onEvent(Context var0, String var1, String var2, Map<String, Object> var3) {
-//        Properties prop = new Properties();
-//        prop.setProperty("label", var2);
-//        for (String key : var3.keySet()) {
-//            prop.setProperty(key, var3.get(key) + "");
-//        }
-//        StatService.trackCustomKVEvent(var0, var1, prop);
-    }
-
-    public static void trackTimeEvent(Context context, String eventId, int costTime, String... kv) {
-//
-//        Properties prop = new Properties();
-//        for (int i = 0; i < kv.length; i++) {
-//            if (i % 2 != 0 || i != 0) {
-//                String key = kv[i - 1];
-//                String value = kv[i];
-//                if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(value)) {
-//                    prop.setProperty(key, value);
-//                }
-//            }
-//        }
-//
-//        if (prop.size() == 0) return;
-//
-//        StatService.trackCustomKVTimeIntervalEvent(context, costTime, eventId, prop);
-    }
-
-    // 游戏下载
-    public static void onGameDownloadEvent(Context context, String gameName, String platform, String entrance, String status, String method) {
-        Map<String, Object> kv = new HashMap<>();
-
-        platform = PlatformUtils.getInstance(HaloApp.getInstance().getApplication()).getPlatformName(platform);
-
-        kv.put("版本", platform);
-        kv.put("用户机型", Build.MODEL);
-        kv.put("设备JNFJ", MetaUtil.getBase64EncodedIMEI());
-        kv.put("网络状态", DeviceUtils.getNetwork(HaloApp.getInstance().getApplication()));
-        kv.put("光环助手版本", BuildConfig.VERSION_NAME);
-        kv.put("位置", entrance);
-        kv.put("类型", method);
-        kv.put("厂商", Build.MANUFACTURER);
-        kv.put("Android版本", Build.VERSION.RELEASE);
-        onEvent(context, "游戏下载", gameName, kv);
-
-        Map<String, Object> kv2 = new HashMap<>();
-        kv2.put("状态", status);
-        kv2.put("位置", entrance);
-
-        if (status.equals("开始")) {
-            kv2.put("版本", entrance + "-开始");
-            kv2.put("游戏分平台", gameName + "-" + platform + "-开始");
-            kv2.put("光环助手版本", BuildConfig.VERSION_NAME + "-开始");
-        } else {
-            kv2.put("版本", platform);
-            kv2.put("游戏分平台", gameName + "-" + platform);
-            kv2.put("光环助手版本", BuildConfig.VERSION_NAME);
-        }
-
-        onEvent(context, "游戏下载位置", gameName, kv2);
-    }
-
-    // 游戏更新
-    public static void onGameUpdateEvent(Context context, String gameName, String paltform, String status) {
-        Map<String, Object> kv = new HashMap<>();
-        kv.put("版本", paltform);
-        kv.put("状态", status);
-        onEvent(context, "游戏更新", gameName, kv);
-    }
-
-    public static void onError(Context context, Throwable throwable) {
-        //bugly 作为默认处理异常的类库，已经上报了，此处不重复上报
+        // 上传错误数据
         try {
-//            CrashReport.postCatchedException(throwable);
+            DataCollectionUtils.uploadError(context, Log.getStackTraceString(throwable));
         } catch (Exception e) {
+            e.printStackTrace();
         }
 
-        //talkingdata
-        try {
-//            TCAgent.onError(context, throwable);
-        } catch (Exception e) {
-        }
     }
 
 }

app/src/main/java/com/gh/common/util/DetailDownloadUtils.java

@@ -4,7 +4,7 @@ import android.text.TextUtils;
 import android.view.View;
 
 import com.gh.common.constant.Config;
-import com.gh.common.constant.Constants;
+import com.gh.gamecenter.common.constant.Constants;
 import com.gh.common.repository.ReservationRepository;
 import com.gh.common.simulator.SimulatorGameManager;
 import com.gh.common.view.DownloadProgressBar;
@@ -13,6 +13,7 @@ import com.gh.common.xapk.XapkUnzipStatus;
 import com.gh.download.DownloadManager;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.adapter.viewholder.DetailViewHolder;
+import com.gh.gamecenter.core.utils.SPUtils;
 import com.gh.gamecenter.entity.LinkEntity;
 import com.gh.gamecenter.entity.PluginLocation;
 import com.gh.gamecenter.manager.PackagesManager;

app/src/main/java/com/gh/common/util/DeviceTokenUtils.kt

@@ -3,10 +3,10 @@ package com.gh.common.util
 import android.content.Context
 import android.os.Environment
 import android.preference.PreferenceManager
-import com.gh.common.exposure.meta.MetaUtil
+import com.gh.gamecenter.common.exposure.meta.MetaUtil
 import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.entity.TimeEntity
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils

app/src/main/java/com/gh/common/util/DialogUtils.java

@@ -49,20 +49,32 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.facebook.drawee.generic.GenericDraweeHierarchy;
 import com.facebook.drawee.view.SimpleDraweeView;
-import com.gh.common.AppExecutor;
 import com.gh.common.constant.Config;
-import com.gh.common.dialog.TrackableDialog;
-import com.gh.common.view.CustomLinkMovementMethod;
-import com.gh.common.view.DrawableView;
-import com.gh.common.view.FixLinearLayoutManager;
-import com.gh.common.view.LimitHeightLinearLayout;
-import com.gh.common.view.MaxHeightNestedScrollView;
-import com.gh.common.view.VerticalItemDecoration;
 import com.gh.gamecenter.R;
 import com.gh.gamecenter.SuggestionActivity;
 import com.gh.gamecenter.adapter.ReportReasonAdapter;
 import com.gh.gamecenter.adapter.viewholder.PrivacyPolicyItemViewHolder;
-import com.gh.gamecenter.databinding.DialogAlertDefaultBinding;
+import com.gh.gamecenter.common.base.TrackableDialog;
+import com.gh.gamecenter.common.callback.CancelListener;
+import com.gh.gamecenter.common.callback.ConfirmListener;
+import com.gh.gamecenter.common.callback.SimpleCallback;
+import com.gh.gamecenter.common.databinding.DialogAlertDefaultBinding;
+import com.gh.gamecenter.common.utils.ExtensionsKt;
+import com.gh.gamecenter.common.utils.ImageUtils;
+import com.gh.gamecenter.common.utils.NetworkUtils;
+import com.gh.gamecenter.common.view.CustomLinkMovementMethod;
+import com.gh.gamecenter.common.view.DrawableView;
+import com.gh.gamecenter.common.view.FixLinearLayoutManager;
+import com.gh.gamecenter.common.view.LimitHeightLinearLayout;
+import com.gh.gamecenter.common.view.MaxHeightNestedScrollView;
+import com.gh.gamecenter.common.view.VerticalItemDecoration;
+import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.core.utils.DisplayUtils;
+import com.gh.gamecenter.core.utils.EmptyCallback;
+import com.gh.gamecenter.core.utils.MtaHelper;
+import com.gh.gamecenter.core.utils.SpanBuilder;
+import com.gh.gamecenter.core.utils.StringUtils;
+import com.gh.gamecenter.core.utils.ToastUtils;
 import com.gh.gamecenter.databinding.DialogBindPhoneBinding;
 import com.gh.gamecenter.databinding.DialogEnergySignBinding;
 import com.gh.gamecenter.databinding.DialogOverseaConfirmationBinding;
@@ -197,30 +209,8 @@ public class DialogUtils {
         dialog.show();
     }
 
-    public static void showWarningDialog(Context context, String title, CharSequence msg, final ConfirmListener listener) {
-        if (!(context instanceof Activity)) {
-            return;
-        }
-        showWarningDialog(context, title, msg, "取消", "确定", listener, null);
-    }
 
-    public static void showWarningDialog(Context context, String title, CharSequence msg, String cancel, String confirm,
-                                         final ConfirmListener cmListener, final CancelListener clListener) {
 
-        showAlertDialog(context, title, msg, confirm, cancel, cmListener, clListener);
-    }
-
-    // 网络劫持时 打开QQ客户端，创建临时会话
-    public static void showQqSessionDialog(final Context context) {
-        String qq = "";
-        if (Config.getSettings() != null && Config.getSettings().getSupport() != null) {
-            qq = Config.getSettings().getSupport().getQq();
-        }
-        String finalQq = qq;
-        showWarningDialog(context, "警告", "您当前网络环境异常，下载地址可能被运营商恶意替换（网络劫持）" +
-                        "，如多次下载失败，请联系客服获取正确的下载地址（客服QQ：" + qq + "）"
-                , "取消", "前往QQ", () -> DirectUtils.directToQqConversation(context, finalQq), null);
-    }
 
     public static void checkDownload(Context context, String size, CheckDownloadCallBack callBack) {
         SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication());
@@ -274,7 +264,7 @@ public class DialogUtils {
     }
 
     public static void showNoConnectionDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
-        showWarningDialog(context, "下载提示", "网络异常，请检查手机网络状态", "连上WiFi后自动下载", "关闭", listener, cancelListener);
+        com.gh.gamecenter.common.utils.DialogUtils.showWarningDialog(context, "下载提示", "网络异常，请检查手机网络状态", "连上WiFi后自动下载", "关闭", listener, cancelListener);
     }
 
     public static void showDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
@@ -323,11 +313,11 @@ public class DialogUtils {
     }
 
     public static void showResumeDownloadDialog(Context context, ConfirmListener listener, CancelListener cancelListener) {
-        showWarningDialog(context, "下载提示", "当前正在使用移动网络，继续下载会消耗手机流量", "连上WiFi后自动下载", "继续下载", listener, cancelListener);
+        com.gh.gamecenter.common.utils.DialogUtils.showWarningDialog(context, "下载提示", "当前正在使用移动网络，继续下载会消耗手机流量", "连上WiFi后自动下载", "继续下载", listener, cancelListener);
     }
 
     public static void showDownloadDialog(Context context, ConfirmListener listener) {
-        showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", listener);
+        com.gh.gamecenter.common.utils.DialogUtils.showWarningDialog(context, "下载提示", "您当前使用的网络为2G/3G/4G，开始下载将会消耗移动流量，确定下载？", listener);
     }
 
     public static void showCancelDialog(Context context, final ConfirmListener listener, CancelListener cancelListener) {
@@ -421,93 +411,7 @@ public class DialogUtils {
         return showNewAlertDialog(context, title, message, negative, positive, null, gravity, shouldShowCloseBtn, clListener, cmListener);
     }
 
-    /**
-     * Material Design 风格弹窗
-     *
-     * @param context
-     * @param title      标题
-     * @param message    内容
-     * @param positive   确认按钮文本
-     * @param negative   取消按钮文本
-     * @param cmListener 确认按钮监听
-     * @param clListener 取消按钮监听
-     */
-    public static Dialog showAlertDialog(Context context, String title, CharSequence message
-            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
-        context = checkDialogContext(context);
 
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-        if (message.toString().contains("红包奖励")) {//将红包奖励四个字标红
-            String str = message.toString().substring(0, message.toString().indexOf("红包奖励")) + "<font color='#FF0000'>红包奖励</font>";
-            contentTv.setText(Html.fromHtml(str));
-        } else {
-            contentTv.setText(message);
-        }
-        titleTv.setText(title);
-        negativeTv.setText(negative);
-        positiveTv.setText(positive);
-
-        negativeTv.setOnClickListener(view -> {
-            if (clListener != null) {
-                clListener.onCancel();
-            }
-            dialog.dismiss();
-        });
-
-        positiveTv.setOnClickListener(view -> {
-            if (cmListener != null) {
-                cmListener.onConfirm();
-            }
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-        return dialog;
-    }
-
-    public static Dialog showAlertDialog(Context context, String title, Spanned message
-            , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
-        context = checkDialogContext(context);
-
-        final Dialog dialog = new Dialog(context, R.style.GhAlertDialog);
-
-        View contentView = LayoutInflater.from(context).inflate(R.layout.dialog_alert, null);
-        TextView contentTv = contentView.findViewById(R.id.dialog_content);
-        TextView titleTv = contentView.findViewById(R.id.dialog_title);
-        TextView negativeTv = contentView.findViewById(R.id.dialog_negative);
-        TextView positiveTv = contentView.findViewById(R.id.dialog_positive);
-        contentTv.setText(message);
-        titleTv.setText(title);
-        negativeTv.setText(negative);
-        positiveTv.setText(positive);
-
-        negativeTv.setOnClickListener(view -> {
-            if (clListener != null) {
-                clListener.onCancel();
-            }
-            dialog.dismiss();
-        });
-
-        positiveTv.setOnClickListener(view -> {
-            if (cmListener != null) {
-                cmListener.onConfirm();
-            }
-            dialog.dismiss();
-        });
-
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(contentView);
-        dialog.show();
-        return dialog;
-    }
 
     public static Dialog showDialogWithHtmlContent(Context context, String title, String content
             , String positive, String negative, final ConfirmListener cmListener, final CancelListener clListener) {
@@ -2115,7 +2019,7 @@ public class DialogUtils {
         dialog.show();
     }
 
-    public static void showBindPhoneDialog(Context context, ConfirmListener listener) {
+    public static Dialog showBindPhoneDialog(Context context, ConfirmListener listener) {
         context = checkDialogContext(context);
 
         final Dialog dialog = new Dialog(context, R.style.DialogWindowTransparent);
@@ -2133,6 +2037,7 @@ public class DialogUtils {
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.setContentView(binding.getRoot());
         dialog.show();
+        return dialog;
     }
 
     public static void showReceiveLibaoSuccessDialog(Context context, String title, String des, String libaoCode, ConfirmListener listener) {
@@ -2284,14 +2189,6 @@ public class DialogUtils {
         return AppManager.getInstance().currentActivity();
     }
 
-    public interface ConfirmListener {
-        void onConfirm();
-    }
-
-    public interface CancelListener {
-        void onCancel();
-    }
-
     public interface OptionCallback {
         void onClicked(String text);
     }

app/src/main/java/com/gh/common/util/DirectUtils.kt

@@ -9,25 +9,28 @@ import android.os.Build
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
-import com.gh.base.BaseActivity
-import com.gh.base.BaseActivity_TabLayout
-import com.gh.base.ToolBarActivity
-import com.gh.base.fragment.BaseFragment_TabLayout
-import com.gh.common.AppExecutor
+import com.gh.gamecenter.common.base.activity.BaseActivity
+import com.gh.gamecenter.common.base.activity.BaseActivity_TabLayout
+import com.gh.gamecenter.common.base.activity.ToolBarActivity
+import com.gh.gamecenter.common.base.fragment.BaseFragment_TabLayout
+import com.gh.gamecenter.core.AppExecutor
 import com.gh.common.constant.Config
-import com.gh.common.constant.Constants
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.exposure.ExposureEvent
 import com.gh.common.exposure.ExposureEvent.Companion.createEvent
 import com.gh.common.exposure.ExposureManager.log
-import com.gh.common.exposure.ExposureSource
 import com.gh.common.exposure.ExposureTraceUtils.appendTrace
 import com.gh.common.exposure.ExposureType
+import com.gh.gamecenter.common.constant.EntranceConsts.*
 import com.gh.common.util.EntranceUtils.*
 import com.gh.gamecenter.*
 import com.gh.gamecenter.amway.AmwayActivity
 import com.gh.gamecenter.catalog.CatalogActivity
 import com.gh.gamecenter.category.CategoryDirectoryActivity
 import com.gh.gamecenter.category2.CategoryV2Activity
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.utils.RunningUtils
 import com.gh.gamecenter.download.DownloadFragment.Companion.INDEX_UPDATE
 import com.gh.gamecenter.entity.*
 import com.gh.gamecenter.eventbus.EBSkip
@@ -54,7 +57,7 @@ import com.gh.gamecenter.qa.article.detail.ArticleDetailActivity
 import com.gh.gamecenter.qa.questions.newdetail.NewQuestionDetailActivity
 import com.gh.gamecenter.qa.subject.CommunitySubjectActivity
 import com.gh.gamecenter.qa.video.detail.ForumVideoDetailActivity
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.security.BindPhoneActivity
 import com.gh.gamecenter.servers.GameServerTestActivity
@@ -493,6 +496,11 @@ object DirectUtils {
         context.startActivity(UserHomeActivity.getIntent(context, userId ?: "", entrance, path))
     }
 
+    @JvmStatic
+    fun directToRealName(context: Context) {
+        context.startActivity(ShellActivity.getIntent(context, ShellActivity.Type.REAL_NAME_INFO, null))
+    }
+
     /**
      * 跳转至个人主页
      * @param position 定位到某个tab 0游戏 1发布
@@ -627,7 +635,7 @@ object DirectUtils {
         val subjectData = SubjectData(subjectId = id, subjectName = subjectName, isOrder = false)
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, SubjectActivity::class.java.name)
-        bundle.putParcelable(EntranceUtils.KEY_SUBJECT_DATA, subjectData)
+        bundle.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, subjectData)
         jumpActivity(context, bundle)
     }
 
@@ -643,7 +651,7 @@ object DirectUtils {
         content: String? = null,
         hintType: String? = null,
         isQaFeedback: Boolean = false,
-        qaContentId: String = "",
+        qaContentId: String? = "",
         entrance: String? = null
     ) {
         val bundle = Bundle()
@@ -746,7 +754,7 @@ object DirectUtils {
         if (url.contains("leave_web_page_handle_back_pressed=true")) {
             bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_BACK_PRESSED, true)
         }
-        bundle.putString(EntranceUtils.KEY_URL, url)
+        bundle.putString(EntranceConsts.KEY_URL, url)
         jumpActivity(context, bundle)
     }
 
@@ -836,7 +844,7 @@ object DirectUtils {
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
         bundle.putString(KEY_TO, LibaoDetailActivity::class.java.simpleName)
-        bundle.putString(EntranceUtils.KEY_ID, giftId)
+        bundle.putString(EntranceConsts.KEY_ID, giftId)
         HaloApp.put(LibaoEntity.TAG, null)
         jumpActivity(context, bundle)
     }
@@ -1705,10 +1713,11 @@ object DirectUtils {
      * 跳转至游戏单详情
      */
     @JvmStatic
-    fun directToGameCollectionDetail(context: Context, id: String, entrance: String? = null) {
+    fun directToGameCollectionDetail(context: Context, id: String, entrance: String? = null, path: String? = null) {
         if (id.isEmpty()) return
         val bundle = Bundle()
         bundle.putString(KEY_ENTRANCE, entrance ?: ENTRANCE_BROWSER)
+        bundle.putString(KEY_PATH, path)
         bundle.putString(KEY_TO, GameCollectionDetailActivity::class.java.name)
         bundle.putString(KEY_GAME_COLLECTION_ID, id)
         jumpActivity(context, bundle)

app/src/main/java/com/gh/common/util/DownloadDialogHelper.kt

@@ -2,6 +2,8 @@ package com.gh.common.util
 
 import android.content.Context
 import android.os.Build
+import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.gamecenter.core.utils.EmptyCallback
 import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.GameEntity
 

app/src/main/java/com/gh/common/util/DownloadHelper.kt

@@ -2,8 +2,9 @@ package com.gh.common.util
 
 import com.gh.common.filter.RegionSettingHelper
 import com.gh.download.DownloadManager
+import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.entity.GameEntity
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import io.reactivex.schedulers.Schedulers
@@ -35,13 +36,13 @@ object DownloadHelper {
                                 for (apk in response.getApk()) {
                                     if (packageName == apk.packageName) {
                                         DownloadManager.createDownload(HaloApp.getInstance().application,
-                                                apk, response, "", EntranceUtils.ENTRANCE_RECOMMEND, "", false, null)
+                                                apk, response, "", EntranceConsts.ENTRANCE_RECOMMEND, "", false, null)
                                         block.invoke()
                                     }
                                 }
                             } else if (response.getApk().size == 1) {
                                 DownloadManager.createDownload(HaloApp.getInstance().application,
-                                        response, "", EntranceUtils.ENTRANCE_RECOMMEND, "", false, null)
+                                        response, "", EntranceConsts.ENTRANCE_RECOMMEND, "", false, null)
                                 block.invoke()
                             }
                         }

app/src/main/java/com/gh/common/util/DownloadItemUtils.kt

@@ -11,7 +11,7 @@ import androidx.collection.ArrayMap
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.gh.common.constant.Config
-import com.gh.common.constant.Constants
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.dialog.CertificationDialog
 import com.gh.common.dialog.DeviceRemindDialog
 import com.gh.common.dialog.PackageCheckDialogFragment
@@ -29,6 +29,9 @@ import com.gh.gamecenter.DownloadManagerActivity
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder
+import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.LinkEntity
 import com.gh.gamecenter.entity.PluginLocation
@@ -114,8 +117,8 @@ object DownloadItemUtils {
             // 已预约
             holder.gameDownloadBtn.visibility = View.VISIBLE
             holder.gameDownloadBtn.text = "已预约"
-            holder.gameDownloadBtn.setTextColor(ContextCompat.getColor(holder.gameDes.context, R.color.text_subtitleDesc))
-            holder.gameDownloadBtn.setBackgroundResource(R.drawable.button_round_f5f5f5)
+            holder.gameDownloadBtn.setTextColor(R.color.text_subtitleDesc.toColor(holder.gameDownloadBtn.context))
+            holder.gameDownloadBtn.background = R.drawable.button_round_f5f5f5.toDrawable(holder.gameDownloadBtn.context)
             updateItemViewStatus(holder, false, null, null)
         }
     }
@@ -508,7 +511,7 @@ object DownloadItemUtils {
         allStateClickCallback: EmptyCallback?
     ) {
         val gamePermissionDialogFragment = (context as AppCompatActivity).supportFragmentManager.findFragmentByTag(
-            GamePermissionDialogFragment::class.java.simpleName
+            GamePermissionDialogFragment::class.java.name
         ) as GamePermissionDialogFragment?
         gamePermissionDialogFragment?.dismissAllowingStateLoss()
         if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) {
@@ -610,17 +613,23 @@ object DownloadItemUtils {
                 clickCallback?.onCallback()
                 RealNameHelper.checkIfAuth(view.context, gameEntity, object : EmptyCallback {
                     override fun onCallback() {
-                        GamePermissionDialogFragment.show(context, gameEntity, gameEntity.info) {
-                            PermissionHelper.checkStoragePermissionBeforeAction(context, object : EmptyCallback {
-                                override fun onCallback() {
-                                    CertificationDialog.showCertificationDialog(context, gameEntity) {
-                                        DialogUtils.showVersionNumberDialog(context, gameEntity) {
-                                            DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location)
-                                        }
+                        GamePermissionDialogFragment.show(context, gameEntity, gameEntity.info, object : ConfirmListener {
+                            override fun onConfirm() {
+                                PermissionHelper.checkStoragePermissionBeforeAction(context, object : EmptyCallback {
+                                    override fun onCallback() {
+                                        CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
+                                            override fun onConfirm() {
+                                                DialogUtils.showVersionNumberDialog(context, gameEntity, object : ConfirmListener {
+                                                    override fun onConfirm() {
+                                                        DownloadDialog.showDownloadDialog(view.context, gameEntity, traceEvent, entrance, location)
+                                                    }
+                                                })
+                                            }
+                                        })
                                     }
-                                }
-                            })
-                        }
+                                })
+                            }
+                        })
                     }
                 })
             }
@@ -646,52 +655,90 @@ object DownloadItemUtils {
             // 先弹下载弹窗(如果需要的话)
             RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback {
                 override fun onCallback() {
-                    GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
-                        BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback {
-                            override fun onCallback() {
-                                PackageCheckDialogFragment.show(context, gameEntity) {
-                                    DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
-                                        override fun onCallback() {
-                                            CertificationDialog.showCertificationDialog(context, gameEntity) {
-                                                DialogUtils.showOverseaDownloadDialog(context, gameEntity) {
-                                                    DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                                                        download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent)
-                                                    }
+                    GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener {
+                        override fun onConfirm() {
+                            BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback {
+                                override fun onCallback() {
+                                    PackageCheckDialogFragment.show(context, gameEntity, object : ConfirmListener {
+                                        override fun onConfirm() {
+                                            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
+                                                override fun onCallback() {
+                                                    CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
+                                                        override fun onConfirm() {
+                                                            DialogUtils.showOverseaDownloadDialog(context, gameEntity, object : ConfirmListener {
+                                                                override fun onConfirm() {
+                                                                    DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                                                                        download(
+                                                                            context,
+                                                                            gameEntity,
+                                                                            downloadBtn,
+                                                                            entrance,
+                                                                            location,
+                                                                            isSubscribe,
+                                                                            traceEvent
+                                                                        )
+                                                                    }
+                                                                }
+                                                            })
+                                                        }
+                                                    })
                                                 }
-                                            }
+                                            })
                                         }
                                     })
                                 }
-                            }
-                        })
-                    }
+                            })
+
+                        }
+                    })
                 }
             })
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
         } else if (str == context.getString(R.string.attempt)) {
             RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback {
                 override fun onCallback() {
-                    GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
-                        BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback {
-                            override fun onCallback() {
-                                PackageCheckDialogFragment.show(context, gameEntity) {
-                                    DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
-                                        override fun onCallback() {
-                                            CertificationDialog.showCertificationDialog(context, gameEntity) {
-                                                DialogUtils.showVersionNumberDialog(context, gameEntity) {
-                                                    DialogUtils.showOverseaDownloadDialog(context, gameEntity) {
-                                                        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                                                            download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent)
+                    GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener {
+                        override fun onConfirm() {
+                            BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback {
+                                override fun onCallback() {
+                                    PackageCheckDialogFragment.show(context, gameEntity, object : ConfirmListener {
+                                        override fun onConfirm() {
+                                            DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
+                                                override fun onCallback() {
+                                                    CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
+                                                        override fun onConfirm() {
+                                                            DialogUtils.showVersionNumberDialog(context, gameEntity, object : ConfirmListener {
+                                                                override fun onConfirm() {
+                                                                    DialogUtils.showOverseaDownloadDialog(
+                                                                        context,
+                                                                        gameEntity,
+                                                                        object : ConfirmListener {
+                                                                            override fun onConfirm() {
+                                                                                DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                                                                                    download(
+                                                                                        context,
+                                                                                        gameEntity,
+                                                                                        downloadBtn,
+                                                                                        entrance,
+                                                                                        location,
+                                                                                        isSubscribe,
+                                                                                        traceEvent
+                                                                                    )
+                                                                                }
+                                                                            }
+                                                                        })
+                                                                }
+                                                            })
                                                         }
-                                                    }
+                                                    })
                                                 }
-                                            }
+                                            })
                                         }
                                     })
                                 }
-                            }
-                        })
-                    }
+                            })
+                        }
+                    })
                 }
             })
             DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
@@ -704,11 +751,13 @@ object DownloadItemUtils {
             } else {
                 DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, object : EmptyCallback {
                     override fun onCallback() {
-                        CertificationDialog.showCertificationDialog(context, gameEntity) {
-                            DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                                plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent)
+                        CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
+                            override fun onConfirm() {
+                                DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                                    plugin(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent)
+                                }
                             }
-                        }
+                        })
                     }
                 })
             }
@@ -742,7 +791,6 @@ object DownloadItemUtils {
             if (entrance.contains("我的游戏")) {
                 MtaHelper.onEvent("我的游戏_启动", "启动", gameEntity.name)
             }
-            DataUtils.onGameLaunchEvent(context, gameEntity.name, gameEntity.getApk()[0].getPlatform(), location)
             PackageUtils.launchApplicationByPackageName(context, gameEntity.getApk()[0].packageName)
             EnergyTaskHelper.postEnergyTask("play_game", gameEntity.id, gameEntity.getApk()[0].packageName)
         } else if (str == context.getString(R.string.update)) {
@@ -778,7 +826,6 @@ object DownloadItemUtils {
     ) {
         val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size)
         if (TextUtils.isEmpty(msg)) {
-            DataUtils.onGameDownloadEvent(context, gameEntity.name, gameEntity.getApk()[0].getPlatform(), entrance, "下载开始", "下载")
             DownloadManager.createDownload(context, gameEntity, context.getString(R.string.download), entrance, location, isSubscribe, traceEvent)
             Utils.toast(context, gameEntity.name + "已加入下载队列")
             downloadBtn.setText(R.string.downloading)
@@ -797,7 +844,6 @@ object DownloadItemUtils {
     ) {
         val msg = FileUtils.isCanDownload(context, gameEntity.getApk()[0].size)
         if (TextUtils.isEmpty(msg)) {
-            DataUtils.onGameDownloadEvent(context, gameEntity.name, gameEntity.getApk()[0].getPlatform(), entrance, "下载开始", "插件化")
             DownloadManager.createDownload(context, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
             Utils.toast(context, gameEntity.name + "已加入下载队列")
             downloadBtn.setText(R.string.downloading)
@@ -844,8 +890,6 @@ object DownloadItemUtils {
         isSubscribe: Boolean,
         traceEvent: ExposureEvent?
     ) {
-        val apkEntity = gameEntity.getApk()[0]
-        DataUtils.onGameUpdateEvent(context, gameEntity.name, apkEntity.getPlatform(), "下载开始")
         DownloadManager.createDownload(context, gameEntity, "更新", entrance, location, isSubscribe, traceEvent)
     }
 }

app/src/main/java/com/gh/common/util/DownloadNotificationHelper.kt

@@ -8,11 +8,17 @@ import android.content.Context
 import android.content.Intent
 import android.os.Build
 import androidx.core.app.NotificationCompat
-import com.gh.common.AppExecutor
-import com.gh.common.constant.Constants
+import com.gh.gamecenter.core.AppExecutor
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.xapk.XapkInstaller
 import com.gh.common.xapk.XapkUnzipStatus
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.constant.EntranceConsts
+import com.gh.gamecenter.common.utils.getMetaExtra
+import com.gh.gamecenter.common.utils.isSimulatorGame
+import com.gh.gamecenter.common.utils.toJson
+import com.gh.gamecenter.common.utils.tryCatchInRelease
+import com.gh.gamecenter.core.utils.*
 import com.halo.assistant.HaloApp
 import com.lightgame.download.DownloadEntity
 import com.lightgame.download.DownloadStatus
@@ -49,8 +55,8 @@ object DownloadNotificationHelper {
 
         val intent = Intent()
         if (entity.status == DownloadStatus.done && xapkStatus != XapkUnzipStatus.FAILURE.name) {
-            intent.putExtra(EntranceUtils.KEY_DATA, entity.toJson())
-            intent.putExtra(EntranceUtils.KEY_PATH, entity.path)
+            intent.putExtra(EntranceConsts.KEY_DATA, entity.toJson())
+            intent.putExtra(EntranceConsts.KEY_PATH, entity.path)
             intent.action = ACTION_INSTALL
         } else {
             intent.action = ACTION_DOWNLOAD

app/src/main/java/com/gh/common/util/DownloadObserver.kt

@@ -1,25 +1,27 @@
 package com.gh.common.util
 
-import android.os.Build
 import android.preference.PreferenceManager
-import com.gh.base.BaseActivity
-import com.gh.common.constant.Constants
 import com.gh.common.exposure.ExposureUtils
-import com.gh.common.exposure.meta.MetaUtil
 import com.gh.common.simulator.SimulatorDownloadManager
 import com.gh.common.simulator.SimulatorGameManager
 import com.gh.common.xapk.XapkInstaller
 import com.gh.download.DownloadDataHelper
 import com.gh.download.DownloadManager
-import com.gh.gamecenter.BuildConfig
 import com.gh.gamecenter.R
 import com.gh.gamecenter.SuggestionActivity
+import com.gh.gamecenter.common.base.activity.BaseActivity
+import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.eventbus.EBShowDialog
+import com.gh.gamecenter.common.retrofit.Response
+import com.gh.gamecenter.common.utils.*
+import com.gh.gamecenter.core.utils.GsonUtils
+import com.gh.gamecenter.core.utils.MtaHelper
+import com.gh.gamecenter.core.utils.StringUtils
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.SimpleGameEntity
 import com.gh.gamecenter.entity.SimulatorEntity
 import com.gh.gamecenter.eventbus.EBDownloadStatus
-import com.gh.gamecenter.eventbus.EBShowDialog
-import com.gh.gamecenter.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.setting.GameDownloadSettingFragment
 import com.gh.gamecenter.suggest.SuggestType
@@ -201,7 +203,12 @@ object DownloadObserver {
                 when {
                     // TODO 插件化传 path 从 apk 中获取 packageName 的形式有可能出现拿不到 packageName 的情况
                     downloadEntity.isPluggable -> // 弹出插件化提示框
-                        EventBus.getDefault().post(EBShowDialog(BaseActivity.PLUGGABLE, downloadEntity.path))
+                        EventBus.getDefault().post(
+                            EBShowDialog(
+                                BaseActivity.PLUGGABLE,
+                                downloadEntity.path
+                            )
+                        )
                     downloadEntity.isPlugin -> Utils.toast(mApplication, downloadEntity.name + " - " + platform + " - 下载完成")
                     else -> Utils.toast(mApplication, downloadEntity.name + " - 下载完成")
                 }
@@ -245,9 +252,19 @@ object DownloadObserver {
                             } else {
                                 // 弹出卸载提示框
                                 if (downloadEntity.isPlugin) {
-                                    EventBus.getDefault().post(EBShowDialog(BaseActivity.PLUGGABLE, downloadEntity.path))
+                                    EventBus.getDefault().post(
+                                        EBShowDialog(
+                                            BaseActivity.PLUGGABLE,
+                                            downloadEntity.path
+                                        )
+                                    )
                                 } else {
-                                    EventBus.getDefault().post(EBShowDialog(BaseActivity.SIGNATURE_CONFLICT, downloadEntity.path))
+                                    EventBus.getDefault().post(
+                                        EBShowDialog(
+                                            BaseActivity.SIGNATURE_CONFLICT,
+                                            downloadEntity.path
+                                        )
+                                    )
                                 }
                             }
                         }
@@ -274,13 +291,15 @@ object DownloadObserver {
             if (downloadType == Constants.SIMULATOR_DOWNLOAD) {
                 val currentActivity = AppManager.getInstance().currentActivity()
                     ?: return
-                DialogUtils.showSimulatorParseErrorDialog(currentActivity, downloadEntity.gameId, downloadEntity.name) {
-                    val simulator = HaloApp.get(downloadEntity.name, true) as? SimulatorEntity
-                        ?: return@showSimulatorParseErrorDialog
-                    DownloadManager.getInstance().cancel(downloadEntity.url, true, true)
-                    SimulatorDownloadManager.getInstance()
-                        .showDownloadDialog(currentActivity, simulator, SimulatorDownloadManager.SimulatorLocation.SIMULATOR_GAME)
-                }
+                DialogUtils.showSimulatorParseErrorDialog(currentActivity, downloadEntity.gameId, downloadEntity.name,object :ConfirmListener{
+                    override fun onConfirm() {
+                        val simulator = HaloApp.get(downloadEntity.name, true) as? SimulatorEntity
+                            ?: return
+                        DownloadManager.getInstance().cancel(downloadEntity.url, true, true)
+                        SimulatorDownloadManager.getInstance()
+                            .showDownloadDialog(currentActivity, simulator, SimulatorDownloadManager.SimulatorLocation.SIMULATOR_GAME)
+                    }
+                })
             }
         }
     }
@@ -288,32 +307,17 @@ object DownloadObserver {
     // 统计下载完成事件
     private fun statDoneEvent(downloadEntity: DownloadEntity) {
         var type: ExposureUtils.DownloadType
-        val platform = PlatformUtils.getInstance(HaloApp.getInstance().application).getPlatformName(downloadEntity.platform)
-
-        val kv1 = HashMap<String, Any>()
-        kv1["版本"] = platform
-        kv1["状态"] = "下载完成"
-        kv1["用户机型"] = Build.MODEL
-        kv1["设备JNFJ"] = MetaUtil.getBase64EncodedIMEI()
-        kv1["网络状态"] = DeviceUtils.getNetwork(HaloApp.getInstance().application)
-        kv1["光环助手版本"] = BuildConfig.VERSION_NAME
         if (downloadEntity.isUpdate) {
             type = ExposureUtils.DownloadType.UPDATE
             if (downloadEntity.isPlugin) {
                 type = ExposureUtils.DownloadType.PLUGIN_UPDATE
             }
-            DataUtils.onEvent(mApplication, "游戏更新", downloadEntity.name, kv1)
         } else {
             type = ExposureUtils.DownloadType.DOWNLOAD
         }
 
         if (downloadEntity.isPluggable) {
-            val kv3 = HashMap<String, Any>()
-            kv3["下载"] = "下载完成"
-            kv3["版本"] = downloadEntity.platform
-            kv3["位置"] = downloadEntity.entrance ?: "null"
             type = ExposureUtils.DownloadType.PLUGIN_DOWNLOAD
-            DataUtils.onEvent(mApplication, "插件化", downloadEntity.name, kv3)
         }
         val isPlatformRecommend = java.lang.Boolean.parseBoolean(downloadEntity.getMetaExtra(Constants.IS_PLATFORM_RECOMMEND))
         ExposureUtils.logADownloadCompleteExposureEvent(

app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt

@@ -6,12 +6,18 @@ import android.view.View
 import android.widget.LinearLayout
 import android.widget.PopupWindow
 import android.widget.TextView
-import com.gh.common.constant.Constants
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.debugOnly
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.common.utils.tryCatchInRelease
+import com.gh.gamecenter.common.utils.tryWithDefaultCatch
+import com.gh.gamecenter.common.utils.PackageFlavorHelper
+import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.energy.EnergyCenterActivity
 import com.gh.gamecenter.entity.EnergyTaskCompleteEntity
 import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.retrofit.BiResponse
+import com.gh.gamecenter.common.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.lightgame.utils.AppManager
 import com.lightgame.utils.Utils

app/src/main/java/com/gh/common/util/EntranceUtils.java

@@ -1,5 +1,9 @@
 package com.gh.common.util;
 
+import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_NEXT_TO;
+import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_REQUIRE_REDIRECT;
+import static com.gh.gamecenter.common.constant.EntranceConsts.KEY_TO;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -11,13 +15,18 @@ import android.text.TextUtils;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
 
-import com.gh.common.avoidcallback.AvoidOnResultManager;
-import com.gh.common.avoidcallback.Callback;
+import com.gh.gamecenter.common.base.activity.ToolBarActivity;
 import com.gh.gamecenter.BuildConfig;
 import com.gh.gamecenter.MainActivity;
-import com.gh.gamecenter.NormalActivity;
 import com.gh.gamecenter.SplashScreenActivity;
-import com.gh.gamecenter.normal.NormalFragment;
+import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager;
+import com.gh.gamecenter.common.avoidcallback.Callback;
+import com.gh.gamecenter.common.base.fragment.ToolbarFragment;
+import com.gh.gamecenter.common.constant.EntranceConsts;
+import com.gh.gamecenter.core.utils.ClassUtils;
+import com.gh.gamecenter.core.utils.GsonUtils;
+import com.gh.gamecenter.core.utils.RunningUtils;
+import com.gh.gamecenter.core.utils.SPUtils;
 import com.halo.assistant.HaloApp;
 import com.lightgame.utils.Utils;
 
@@ -27,247 +36,8 @@ import org.json.JSONObject;
 import java.util.Iterator;
 import java.util.Set;
 
-
-/**
- * @author CsHeng
- * @Date 2017/4/25
- * @Time 16:39
- */
-
 public class EntranceUtils {
 
-    public static final String KEY_TO = "to";
-    public static final String KEY_NEXT_TO = "next_to";
-    public static final String KEY_NEWSID = "newsId";
-    public static final String KEY_GAMEID = "gameId";
-    public static final String KEY_GAME_ID = "game_id";
-    public static final String KEY_ID = "id";
-    public static final String KEY_URL = "url";
-    public static final String KEY_BUNDLE = "bundle";
-    public static final String KEY_GAMENAME = "gameName";
-    public static final String KEY_PACKAGE_MD5 = "package_md5";
-    public static final String HOST_ARTICLE = "article";
-    public static final String HOST_INVOKE_ONLY = "invoke_only";
-    public static final String HOST_UPLOAD_VIDEO = "upload_video";//上传视频
-    public static final String HOST_UPLOAD_VIDEO_NEW = "upload_video_new"; // 上传视频新(AKA 发视频)
-    public static final String HOST_VIDEO_SINGLE = "video_single";//指定视频-不能划动
-    public static final String HOST_VIDEO_MORE = "video_more";//指定视频-能划动
-    public static final String HOST_VIDEO_STREAMING_HOME = "video_streaming_home";//视频流-首页
-    public static final String HOST_VIDEO_STREAMING_DESC = "video_streaming_desc";//视频流-游戏介绍进入
-    public static final String HOST_VIDEO_COLLECTION = "video_collection";//视频合集
-    public static final String HOST_VIDEO_DETAIL = "video_detail";
-    public static final String HOST_USERHOME = "userhome";//个人主页
-    public static final String HOST_VIDEO = "video";
-    public static final String HOST_FORUM = "forum";
-    public static final String HOST_CATEGORY = "category";//分类
-    public static final String HOST_COLUMN_COLLECTION = "column_collection";//专题合集
-    public static final String HOST_COMMUNITY_QUESTION_LABEL_DETAIL = "community_question_label_detail";//问题标签详情
-    public static final String HOST_COMMUNITY_COLUMN_DETAIL = "community_column_detail";//专栏详情
-    public static final String HOST_BLOCK = "block";//板块
-    public static final String HOST_SERVER_BLOCK = "server";//开服表板块
-    public static final String HOST_AMWAY_BLOCK = "amway";//安利墙板块
-    public static final String HOST_GAME_CALENDAR = "game_calendar";// 指定游戏的开服表页面
-    public static final String HOST_HISTORY_APK = "history_apk"; // 历史版本页面
-    public static final String HOST_HELP = "help";//Q&A
-    public static final String HOST_HELP_COLLECTION = "help_collection";//Q&A合集
-    public static final String HOST_GAME_UPLOAD = "game_upload";//游戏上传
-    public static final String HOST_GAME_ZONE = "game_zone";//游戏专区
-    public static final String HOST_COMMUNITY_ARTICLE = "community_article";
-    public static final String HOST_COMMUNITY_COLUMN = "community_column";
-    public static final String HOST_GAME = "game";
-    public static final String HOST_GAME_DOWNLOAD = "game_download";
-    public static final String HOST_GAME_NEWS = "game_news";
-    public static final String HOST_COLUMN = "column";
-    public static final String HOST_WEB = "web";
-    public static final String HOST_QQ = "qq";
-    public static final String HOST_QQ_GROUP = "qqgroup";
-    public static final String HOST_QQ_QUN = "qqqun";
-    public static final String HOST_DOWNLOAD = "download";
-    public static final String HOST_UPDATE = "update";
-    public static final String HOST_LINK = "link";
-    public static final String HOST_LIBAO = "libao";
-    public static final String HOST_COMMUNITY = "community";
-    public static final String HOST_SUGGESTION = "suggestion";
-    public static final String HOST_ANSWER = "answer";
-    public static final String HOST_QUESTION = "question";
-    public static final String HOST_TOOLBOX = "toolbox";
-    public static final String HOST_FORUM_DETAIL = "forum_detail";
-    public static final String HOST_GAME_RATING_DETAIL = "game_rating_detail";
-    public static final String HOST_HELP_AND_FEEDBACK = "help_and_feedback";
-    public static final String HOST_LAUNCH_SIMULATOR_GAME = "launch_simulator_game";
-    public static final String HOST_HELP_DETAIL = "help_detail";
-    public static final String HOST_GAME_COLLECTION_DETAIL = "game_collection_detail";
-    public static final String HOST_GAME_COLLECTION_SQUARE = "game_collection_square";
-    public static final String HOST_GAME_COLLECTION_EDIT = "game_collection_edit";
-    public static final String KEY_DATA = "data";
-    public static final String KEY_MESSAGE = "message";
-    public static final String KEY_MESSAGE_ID = "message_id";
-    public static final String KEY_TYPE = "type";
-    public static final String KEY_LINK = "link";
-    public static final String KEY_NAME = "name";
-    public static final String KEY_POSITION = "position";
-    public static final String KEY_SUB_POSITION = "sub_position";
-    public static final String KEY_ENTRANCE = "entrance";
-    public static final String KEY_ENTRANCE_LINK = "entrance_link";
-    public static final String KEY_TARGET = "target";
-    public static final String ENTRANCE_BROWSER = "(浏览器)";
-    public static final String ENTRANCE_WELCOME = "(启动弹窗)";
-    public static final String ENTRANCE_UMENG = "(友盟推送)";
-    public static final String ENTRANCE_MIPUSH = "(小米推送)";
-    public static final String ENTRANCE_DOWNLOAD = "(下载跳转)";
-    public static final String ENTRANCE_RECOMMEND = "(落地页)";
-    public static final String ENTRANCE_BLOCK_RECOMMEND = "(推荐入口)";
-    public static final String ENTRANCE_AMWAY = "(安利墙)";
-    public static final String KEY_SUGGEST_HINT_TYPE = "suggestHintType";
-    public static final String KEY_PACKAGENAME = "packageName";
-    public static final String KEY_PLATFORM = "platform";
-    public static final String KEY_GAME_NAME = "game_name";
-    public static final String KEY_VERSION = "version";
-    public static final String KEY_CONTENT = "content";
-    public static final String KEY_PLUGIN = "plugin";
-    public static final String KEY_LOCATION = "location";
-    public static final String KEY_CURRENTITEM = "currentItem";
-    public static final String KEY_COMMENTID = "commentId";
-    public static final String KEY_COMMENT_ID = "comment_id";
-    public static final String KEY_SHOW_KEYBOARD_IF_NEEDED = "show_key_board_if_needed";
-    public static final String KEY_PATH = "path";
-    public static final String KEY_LOCAL_PATH = "local_path";
-    public static final String KEY_OUTER_INFO = "outerInfo";
-    public static final String KEY_OLDERUSER = "isOldUser";
-    public static final String KEY_SEARCHKEY = "searchKey";
-    public static final String KEY_HINT = "hint";
-    public static final String KEY_GAME = "game";
-    public static final String KEY_GAME_ICON_URL = "gameIconUrl";
-    public static final String KEY_SHARECONTENT = "shareContent";
-    public static final String KEY_SUGGESTTYPE = "suggestType";
-    public static final String KEY_PROLIST = "provinceList";
-    public static final String KEY_ORDER = "order";
-    public static final String KEY_TAGTYPE = "tagType";
-    public static final String KEY_ANSWER_ID = "answerId";
-    public static final String KEY_ANSWER_CONTENT = "answerContent";
-    public static final String KEY_QUESTIONS_ID = "questionsId";
-    public static final String KEY_QUESTIONS_TITLE = "questionsTitle";
-    public static final String KEY_ANSWER_OPEN_IN_NEW_PAGE = "openInNewPage";
-    public static final String KEY_QUESTIONS_PATCH = "questionsPatch";
-    public static final String KEY_INVITE_SEARCH_KEY = "inviteSearchKey";
-    public static final String KEY_MESSAGE_TYPE = "messageType";
-    public static final String KEY_QUESTIONS_SEARCH_KEY = "questionsSearchKey";
-    public static final String KEY_SHOW_COMMENT = "showComment";
-    public static final String KEY_SHOW_ANSWER_COMMENT = "showAnswerComment";
-    public static final String KEY_RECOMMENDS_CONTENTS = "isRecommendsContents";
-    public static final String KEY_VERSION_UPDATE = "versionUpdate";
-    public static final String KEY_CHECK_QUESTION_CONCERN = "check_question_concern";
-    public static final String KEY_IS_COLUMN_COLLECTION = "is_column_collection";//是专题合集
-    public static final String KEY_DRAFT_ID = "draft_id";
-    public static final String KEY_KAIFU_LIST = "kaifuList";
-    public static final String KEY_CATEGORY = "category";
-    public static final String KEY_CATEGORY_ID = "category_id";
-    public static final String KEY_CATEGORY_TITLE = "category_title";
-    public static final String KEY_CATEGORY_INIT_TITLE = "category_init_title";
-    public static final String KEY_BLOCK_DATA = "blockData";
-    public static final String KEY_ASK_TAG = "askTag";
-    public static final String KEY_SCROLL_TO_LIBAO = "libao";
-    public static final String KEY_SCROLL_TO_SERVER = "scroll_to_server";
-    public static final String KEY_ASK_COLUMN_TAG = "askColumnTag";
-    public static final String KEY_COMMUNITY_ID = "community_id";
-    public static final String KEY_COMMUNITY_NAME = "community_name";
-    public static final String KEY_COMMUNITY_DATA = "communityData";
-    public static final String KEY_TRACE_EVENT = "trace_event";
-    public static final String KEY_SUBJECT_DATA = "subjectData";
-    public static final String KEY_SUBJECT_TYPE = "subjectType";
-    public static final String KEY_USER_ID = "user_id";
-    public static final String KEY_QUESTION_TAG = "question_tag";
-    public static final String KEY_COLUMN_ID = "column_id";
-    public static final String KEY_AUTO_DOWNLOAD = "auto_download";
-    public static final String KEY_HIDE_SUGGEST_HINT = "hide_suggest_hint";
-    public static final String KEY_HIDE_USELESS_INFO = "hide_useless_info";
-    public static final String KEY_COMMUNITY_ARTICLE_ID = "communityArticleId";
-    public static final String KEY_ARTICLE_COMMENT_ID = "articleCommentId";
-    public static final String KEY_SHOW_ARTICLE_COMMENT = "showArticleComment";
-    public static final String KEY_SCROLL_TO_COMMENT_AREA = "scroll_to_comment_area";
-    public static final String KEY_RATING_STAR_COUNT = "ratingStarCount";
-    public static final String KEY_QUESTION_MODERATOR_PATCH = "questionModeratorPatch";
-    public static final String KEY_SKIP_GAME_COMMENT = "skipGameComment";
-    public static final String KEY_OPEN_PLATFORM_WINDOW = "openPlatformWindow";
-    public static final String KEY_OPEN_KEYBOARD = "openKeyboard";
-    public static final String KEY_PATH_VIDEO = "pathVideo";
-    public static final String KEY_VIDEO_ID = "videoId";
-    public static final String KEY_DIRECT_COMMENT = "directComment";
-    public static final String KEY_SORT = "sort";
-    public static final String KEY_AMWAY = "amway";
-    public static final String KEY_SKIP_SUCCESS_PAGE = "skipSuccessPage";
-    public static final String KEY_COLLECTION_ID = "collectionId";
-    public static final String KEY_NAVIGATION_TITLE = "navigationTitle";
-    public static final String KEY_IMAGE_CROP_RATIO = "imageCropRatio";
-    public static final String KEY_OPEN_VIDEO_STREAMING = "openVideoStreaming";
-    public static final String KEY_REFERER = "referer";
-    public static final String KEY_UUID = "uuid";
-    public static final String KEY_IS_HOME_VIDEO = "isHomeVideo";
-    public static final String KEY_IS_HOME = "isHome";
-    public static final String KEY_TAB_COUNT = "tab_count";
-    public static final String KEY_WEB_SHARE = "webShare";
-    public static final String KEY_ACTIVITY_NAME = "activityName";//活动名称
-    public static final String KEY_PAGINATION_TYPE = "paginationType";//活动分页方式
-    public static final String KEY_REQUIRE_REDIRECT = "require_redirect"; // 标记需要再跳转
-    public static final String KEY_FIELD_ID = "field_id"; // 专区板块id
-    public static final String KEY_SECTION_NAME = "section_name"; // 专区专题名
-    public static final String KEY_COLUMNNAME = "columnName";
-    public static final String KEY_QA_ID = "qaId";
-    public static final String KEY_QA_CONTENT_ID = "qaContentId";
-    public static final String KEY_QA_CATEGORY_NAME = "qaCategoryName";
-    public static final String KEY_QA_TITLE = "qa_title";
-    public static final String KEY_QA_COLLECTION_ID = "qaCollectionId";
-    public static final String KEY_SHOW_EDIT_DRAFT = "showEditDraft";
-    public static final String KEY_ARTICLE_OPEN_IN_NEW_PAGE = "openArticleInNewPage";
-    public static final String KEY_ONLY_CREATE_DRAFT = "onlyCreateDraft";
-    public static final String KEY_KAIFU_SELECT_TIME = "kaifuSelectTime";
-    public static final String KEY_POSTER_PATH = "posterPath";
-    public static final String KEY_BLACK_THEME = "blackTheme";
-    public static final String KEY_FROM_LOGIN = "fromLogin";
-    public static final String KEY_CHANGE_PHONE = "changePhone";
-    public static final String KEY_CONFLICT_PHONE = "conflictPhone";
-    public static final String KEY_CONFLICT_USER = "conflictUser";
-    public static final String KEY_EXPOSURE_SOURCE = "exposure_source";
-    public static final String KEY_BBS_ID = "bbs_id";
-    public static final String KEY_DIAGNOSIS = "diagnosis";
-    public static final String KEY_SIMULATOR = "simulator";
-    public static final String KEY_MARKET_DETAILS = "market_details";
-    public static final String KEY_CATALOG_ID = "catalogId";
-    public static final String KEY_PRIMARY_CATALOG_ID = "primaryCatalogId";
-    public static final String KEY_PRIMARY_CATALOG_NAME = "primaryCatalogName";
-    public static final String KEY_CATALOG_TITLE = "catalog_title";
-    public static final String KEY_CATALOG_INIT_TITLE = "catalog_init_title";
-    public static final String KEY_CATEGORY_LIST = "categoty_list";
-    public static final String KEY_IS_FREE = "is_free";
-    public static final String KEY_IS_SIGN = "is_sign";
-    public static final String KEY_IS_FORCED_TO_CERTIFICATE = "is_forced_to_certificate";
-    public static final String KEY_IS_FORCED_TO_CERTIFICATE_BUT_WITH_BACKDOOR = "is_forced_to_certificate_but_with_backdoor";
-    public static final String KEY_IS_CHOOSE_APK = "is_choose_apk";
-    public static final String KEY_TAB_INDEX = "tab_index";
-    public static final String KEY_IS_CATEGORY_V2 = "is_category_v2";
-    public static final String KEY_SUB_CATEGORY_ID = "sub_category_id";
-    public static final String KEY_IS_QA_FEEDBACK = "is_qa_feedback";
-    public static final String KEY_IS_CLICK_RECEIVE_BTN = "is_click_receive_btn";
-    public static final String KEY_SHOW_QUICK_LOGIN = "show_quick_login";
-    public static final String KEY_VIDEO_LIST = "video_list";
-    public static final String KEY_CHOOSE_FORUM_TYPE = "choose_forum_type";
-    public static final String KEY_CHOOSE_MAX_COUNT = "choose_max_count";
-    public static final String KEY_COMMENT_COUNT = "comment_count";
-    public static final String KEY_IS_COMMENT_CONVERSATION = "is_comment_conversation";
-    public static final String KEY_PARENT_TAG = "parent_tag";
-    public static final String KEY_BLOCK_ID = "block_id";
-    public static final String KEY_BLOCK_NAME = "block_name";
-    public static final String KEY_INSERT_GAME_COLLECTION = "insert_game_collection";
-    public static final String KEY_INSERT_BBS_VIDEO = "insert_bbs_video";
-    public static final String KEY_IS_FROM_SQUARE = "is_from_square";
-    public static final String KEY_FORUM_NAME = "forum_name";//版块名称
-    public static final String KEY_GAME_COLLECTION_TITLE = "game_collection_title";//游戏单标题
-    public static final String KEY_GAME_COLLECTION_ID = "game_collection_id";//游戏单ID
-    public static final String KEY_ASSIST_RES = "assist_res";
-    public static final String KEY_LAST_SELECTED_POSITION = "last_selected_position";
-    public static final String KEY_RECOMMEND_ID = "recommend_id";
-    public static final String KEY_LAST_PAGE_DATA = "last_page_data";
-
     public static void jumpActivity(Context context, Bundle bundle) {
         bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
 
@@ -278,8 +48,8 @@ public class EntranceUtils {
             String to = bundle.getString(KEY_TO);
             Class<?> clazz = ClassUtils.forName(to);
             if (clazz == null) clazz = MainActivity.class;
-            if (NormalFragment.class.isAssignableFrom(clazz)) { // 兼容NormalFragment
-                NormalActivity.startFragmentNewTask(context, (Class<? extends NormalFragment>) clazz, bundle);
+            if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
+                ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) clazz, bundle);
             } else {
                 Intent intent1 = new Intent(context, clazz);
                 intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -296,7 +66,6 @@ public class EntranceUtils {
         }
     }
 
-
     public static void jumpActivity(Context context, Bundle nextToBundle, Bundle bundle, Callback callback) {
         bundle.putBoolean(KEY_REQUIRE_REDIRECT, true);
 
@@ -307,8 +76,8 @@ public class EntranceUtils {
             String to = bundle.getString(KEY_TO);
             Class<?> clazz = ClassUtils.forName(to);
             if (clazz == null) clazz = MainActivity.class;
-            if (NormalFragment.class.isAssignableFrom(clazz)) { // 兼容NormalFragment
-                NormalActivity.startFragmentNewTask(context, (Class<? extends NormalFragment>) clazz, bundle);
+            if (ToolbarFragment.class.isAssignableFrom(clazz)) { // 兼容ToolbarFragment
+                ToolBarActivity.startFragmentNewTask(context, (Class<? extends ToolbarFragment>) clazz, bundle);
             } else {
                 Intent intent1 = new Intent(context, clazz);
                 //TODO:添加FLAG_ACTIVITY_NEW_TASK会导致一跳转页面callback就被调用
@@ -326,11 +95,10 @@ public class EntranceUtils {
             context.startActivity(SplashScreenActivity.getSplashScreenIntent(context, bundle));
         }
     }
-
     public static void saveShortcut(String activityName, @Nullable Bundle bundle) {
         if (BuildConfig.DEBUG) {
             if (activityName.contains("MainActivity")) {
-                SPUtils.setString(EntranceUtils.KEY_BUNDLE, "");
+                SPUtils.setString(EntranceConsts.KEY_BUNDLE, "");
                 return;
             }
 
@@ -340,10 +108,10 @@ public class EntranceUtils {
                 json.put(KEY_TO, activityName);
                 json = getJsonFromBundle(bundle, json, null);
                 Utils.toast(HaloApp.getInstance().getApplication(), "保存捷径成功");
-                SPUtils.setString(EntranceUtils.KEY_BUNDLE, json.toString());
+                SPUtils.setString(EntranceConsts.KEY_BUNDLE, json.toString());
             } catch (Exception e) {
                 e.printStackTrace();
-                SPUtils.setString(EntranceUtils.KEY_BUNDLE, "");
+                SPUtils.setString(EntranceConsts.KEY_BUNDLE, "");
             }
         }
     }
@@ -398,13 +166,13 @@ public class EntranceUtils {
 
             Bundle bundle = new Bundle();
             try {
-                JSONObject jsonObject = new JSONObject(SPUtils.getString(EntranceUtils.KEY_BUNDLE));
+                JSONObject jsonObject = new JSONObject(SPUtils.getString(EntranceConsts.KEY_BUNDLE));
                 getBundleFromJson(bundle, jsonObject, null);
             } catch (Exception e) {
                 e.printStackTrace();
             }
 
-            jumpActivity(activity, bundle);
+            EntranceUtils.jumpActivity(activity, bundle);
         }
     }
 
@@ -448,7 +216,6 @@ public class EntranceUtils {
     }
 
     public static boolean hasShortcut() {
-        return !TextUtils.isEmpty(SPUtils.getString(EntranceUtils.KEY_BUNDLE));
+        return !TextUtils.isEmpty(SPUtils.getString(EntranceConsts.KEY_BUNDLE));
     }
-
 }

app/src/main/java/com/gh/common/util/EnvHelper.kt

@@ -1,40 +0,0 @@
-package com.gh.common.util
-
-import com.gh.common.constant.Constants
-import com.gh.gamecenter.BuildConfig
-
-object EnvHelper {
-
-    // API 环境是否为测试环境
-    @JvmStatic
-    val isDevEnv: Boolean by lazy {
-        SPUtils.getBoolean(Constants.SP_IS_DEV_ENV, false)
-    }
-
-    @JvmStatic
-    fun getHost(): String {
-        return if (!PackageFlavorHelper.IS_TEST_FLAVOR) {
-            BuildConfig.API_HOST
-        } else {
-            if (isDevEnv) {
-                BuildConfig.DEV_API_HOST
-            } else {
-                BuildConfig.API_HOST
-            }
-        }
-    }
-
-    @JvmStatic
-    fun getNewHost(): String {
-        return if (!PackageFlavorHelper.IS_TEST_FLAVOR) {
-            BuildConfig.NEW_API_HOST
-        } else {
-            if (isDevEnv) {
-                BuildConfig.NEW_DEV_API_HOST
-            } else {
-                BuildConfig.NEW_API_HOST
-            }
-        }
-    }
-
-}

app/src/main/java/com/gh/common/util/ErrorHelper.kt

@@ -2,9 +2,11 @@ package com.gh.common.util
 
 import android.content.Context
 import com.gh.common.constant.Config
-import com.gh.common.constant.Constants
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.common.constant.Constants
+import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.gamecenter.common.utils.toObject
 import com.gh.gamecenter.entity.ErrorEntity
 import com.lightgame.utils.Utils
 import retrofit2.HttpException

app/src/main/java/com/gh/common/util/FloatingBackViewManager.kt

@@ -5,6 +5,8 @@ import android.os.Build
 import android.view.Gravity
 import android.widget.TextView
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.utils.dip2px
+import com.gh.gamecenter.core.utils.DisplayUtils
 import com.gh.gamecenter.energy.EnergyCenterActivity
 import com.lightgame.utils.Util_System_Keyboard
 import com.lzf.easyfloat.EasyFloat

app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt

@@ -5,7 +5,7 @@ import android.content.Context
 import android.text.TextUtils
 import androidx.appcompat.app.AppCompatActivity
 import com.gh.common.DefaultJsApi
-import com.gh.common.constant.Constants
+import com.gh.gamecenter.common.constant.Constants
 import com.gh.common.dialog.CertificationDialog
 import com.gh.common.exposure.ExposureEvent
 import com.gh.common.exposure.ExposureManager
@@ -13,22 +13,28 @@ import com.gh.common.exposure.ExposureSource
 import com.gh.common.exposure.ExposureType
 import com.gh.common.history.HistoryHelper
 import com.gh.common.repository.ReservationRepository
-import com.gh.common.runOnUiThread
-import com.gh.common.view.dsbridge.CompletionHandler
+import com.gh.gamecenter.core.runOnUiThread
+import com.gh.gamecenter.common.view.dsbridge.CompletionHandler
 import com.gh.download.DownloadManager
 import com.gh.download.dialog.DownloadDialog
 import com.gh.gamecenter.R
 import com.gh.gamecenter.WebActivity
+import com.gh.gamecenter.common.callback.ConfirmListener
+import com.gh.gamecenter.common.utils.observableToMain
+import com.gh.gamecenter.common.utils.singleToMain
+import com.gh.gamecenter.common.utils.DialogHelper
+import com.gh.gamecenter.core.utils.*
 import com.gh.gamecenter.entity.ApkEntity
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.PluginLocation
 import com.gh.gamecenter.gamedetail.dialog.GamePermissionDialogFragment
 import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.retrofit.EmptyResponse
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.common.retrofit.EmptyResponse
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.gh.gamecenter.teenagermode.TeenagerModeActivity
-import com.gh.gamecenter.user.ApiResponse
+import com.gh.gamecenter.common.retrofit.ApiResponse
+import com.gh.gamecenter.common.utils.DataLogUtils
 import com.lightgame.download.FileUtils
 
 /**
@@ -165,24 +171,32 @@ object GameActivityDownloadHelper {
         } else {
             val str = GameUtils.getDownloadBtnText(context, gameEntity, PluginLocation.only_game)
             if (str == context.getString(R.string.download)) {
-                GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
-                    CertificationDialog.showCertificationDialog(context, gameEntity) {
-                        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                            download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
-                        }
-                    }
-                }
-                DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
-            } else if (str == context.getString(R.string.attempt)) {
-                RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback {
-                    override fun onCallback() {
-                        GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) {
-                            CertificationDialog.showCertificationDialog(context, gameEntity) {
+                GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener {
+                    override fun onConfirm() {
+                        CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
+                            override fun onConfirm() {
                                 DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
                                     download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
                                 }
                             }
-                        }
+                        })
+                    }
+                })
+                DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
+            } else if (str == context.getString(R.string.attempt)) {
+                RealNameHelper.checkIfAuth(context, gameEntity, object : EmptyCallback {
+                    override fun onCallback() {
+                        GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info, object : ConfirmListener {
+                            override fun onConfirm() {
+                                CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
+                                    override fun onConfirm() {
+                                        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                                            download(context, gameEntity, apk, isSubscribe, entrance, location, traceEvent)
+                                        }
+                                    }
+                                })
+                            }
+                        })
                     }
                 })
                 DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance)
@@ -190,11 +204,13 @@ object GameActivityDownloadHelper {
                 if (gameEntity.pluggableCollection != null) {
                     DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location)
                 } else {
-                    CertificationDialog.showCertificationDialog(context, gameEntity) {
-                        DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
-                            plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
+                    CertificationDialog.showCertificationDialog(context, gameEntity, object : ConfirmListener {
+                        override fun onConfirm() {
+                            DialogUtils.checkDownload(context, apk.size) { isSubscribe: Boolean ->
+                                plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent)
+                            }
                         }
-                    }
+                    })
                 }
             } else if (str == context.getString(R.string.install) || str == context.getString(R.string.launch)) {
                 ToastUtils.toast("${gameEntity.name}已加入下载队列")
@@ -259,9 +275,11 @@ object GameActivityDownloadHelper {
     ) {
         val msg = FileUtils.isCanDownload(context, apk.size)
         if (TextUtils.isEmpty(msg)) {
-            DataUtils.onGameDownloadEvent(context, gameEntity.name, apk.getPlatform(), entrance, "下载开始", "下载")
-            DownloadManager.createDownload(context, apk, gameEntity, context.getString(
-                R.string.download), entrance, location, isSubscribe, traceEvent)
+            DownloadManager.createDownload(
+                context, apk, gameEntity, context.getString(
+                    R.string.download
+                ), entrance, location, isSubscribe, traceEvent
+            )
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
             ToastUtils.toast(msg)
@@ -280,7 +298,6 @@ object GameActivityDownloadHelper {
     ) {
         val msg = FileUtils.isCanDownload(context, apk.size)
         if (TextUtils.isEmpty(msg)) {
-            DataUtils.onGameDownloadEvent(context, gameEntity.name, apk.getPlatform(), entrance, "下载开始", "插件化")
             DownloadManager.createDownload(context, apk, gameEntity, "插件化", entrance, location, isSubscribe, traceEvent)
             ToastUtils.toast("${gameEntity.name}已加入下载队列")
         } else {
@@ -298,7 +315,6 @@ object GameActivityDownloadHelper {
         isSubscribe: Boolean,
         traceEvent: ExposureEvent?
     ) {
-        DataUtils.onGameUpdateEvent(context, gameEntity.name, apk.getPlatform(), "下载开始")
         DownloadManager.createDownload(context, apk, gameEntity, "更新", entrance, location, isSubscribe, traceEvent)
         ToastUtils.toast("${gameEntity.name}已加入下载队列")
     }
@@ -367,7 +383,8 @@ object GameActivityDownloadHelper {
                 if (PackageUtils.isInstalled(context, apk.packageName)) {
                     // 是否可更新
                     if (PackageUtils.isCanUpdate(apk, event.gameId)
-                        || PackageUtils.isNonPluginUpdatable(apk, gameEntity)) {
+                        || PackageUtils.isNonPluginUpdatable(apk, gameEntity)
+                    ) {
                         handler.complete(false)
                     } else {
                         // 已安装且无更新

app/src/main/java/com/gh/common/util/GameCollectionSquareBrowseTaskHelper.kt

@@ -9,14 +9,16 @@ import android.view.Gravity
 import android.view.View
 import android.widget.ImageView
 import android.widget.ProgressBar
-import com.gh.base.CurrentActivityHolder
-import com.gh.base.GHThreadFactory
-import com.gh.common.runOnUiThread
-import com.gh.gamecenter.NormalActivity
+import com.gh.gamecenter.common.base.activity.ToolBarActivity
 import com.gh.gamecenter.R
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.utils.singleToMain
+import com.gh.gamecenter.common.utils.tryWithDefaultCatch
+import com.gh.gamecenter.core.GHThreadFactory
+import com.gh.gamecenter.core.runOnUiThread
+import com.gh.gamecenter.core.utils.CurrentActivityHolder
 import com.gh.gamecenter.gamecollection.detail.GameCollectionDetailActivity
 import com.gh.gamecenter.gamecollection.square.GameCollectionSquareActivity
-import com.gh.gamecenter.retrofit.BiResponse
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lzf.easyfloat.EasyFloat
@@ -159,7 +161,7 @@ object GameCollectionSquareBrowseTaskHelper {
     private fun isTopActivityGameCollectionRelated(activity: Activity): Boolean {
         return isGameCollectionSquare(activity)
                 || (activity is GameCollectionDetailActivity
-                && activity.intent.getBundleExtra(NormalActivity.NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_FORM_BROWSE_TASK) == true)
+                && activity.intent.getBundleExtra(ToolBarActivity.NORMAL_FRAGMENT_BUNDLE)?.getBoolean(KEY_IS_FORM_BROWSE_TASK) == true)
     }
 
     private fun isGameCollectionSquare(activity: Activity, checkIsFromTask: Boolean = true): Boolean {

app/src/main/java/com/gh/common/util/GameSubstituteRepositoryHelper.kt

@@ -2,11 +2,16 @@ package com.gh.common.util
 
 import android.annotation.SuppressLint
 import android.text.TextUtils
+import com.gh.gamecenter.core.utils.SPUtils
+import com.gh.gamecenter.common.utils.doOnMainProcessOnly
+import com.gh.gamecenter.common.utils.toJson
+import com.gh.gamecenter.common.utils.toObject
+import com.gh.gamecenter.core.utils.MtaHelper
 import com.gh.gamecenter.entity.GameEntity
 import com.gh.gamecenter.entity.SubjectEntity
 import com.gh.gamecenter.manager.UserManager
-import com.gh.gamecenter.retrofit.BiResponse
-import com.gh.gamecenter.retrofit.Response
+import com.gh.gamecenter.common.retrofit.BiResponse
+import com.gh.gamecenter.common.retrofit.Response
 import com.gh.gamecenter.retrofit.RetrofitManager
 import com.halo.assistant.HaloApp
 import com.lightgame.utils.Utils

app/src/main/java/com/gh/common/util/GameUtils.java

@@ -5,7 +5,7 @@ import android.graphics.Color;
 import android.text.TextUtils;
 import android.widget.TextView;
 
-import com.gh.common.AppExecutor;
+import com.gh.gamecenter.core.AppExecutor;
 import com.gh.common.constant.Config;
 import com.gh.common.simulator.SimulatorGameManager;
 import com.gh.download.DownloadManager;
@@ -157,12 +157,7 @@ public class GameUtils {
             return context.getString(R.string.update);
         } else if (installCount != 0) {
             return context.getString(R.string.launch);
-        } else if (
-                "demo".equals(gameEntity.getDownloadStatus())
-//                gameEntity.getVersionNumber().contains("无版号")
-//                        && Config.isGameDomeSwitchOpen()
-//                        && !SimulatorGameManager.isSimulatorGame(gameEntity)
-        ) {
+        } else if ("demo".equals(gameEntity.getDownloadStatus())) {
             return context.getString(R.string.attempt);
         } else {
             return context.getString(R.string.download);

app/src/main/java/com/gh/common/util/GameViewUtils.java

@@ -12,9 +12,10 @@ import android.widget.TextView;
 
 import androidx.core.content.ContextCompat;
 
-import com.gh.common.AppExecutor;
-import com.gh.common.view.DrawableView;
+import com.gh.gamecenter.core.AppExecutor;
+import com.gh.gamecenter.common.view.DrawableView;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.core.utils.DisplayUtils;
 import com.gh.gamecenter.entity.TagStyleEntity;
 
 import java.text.ParseException;