From 8b69e47999f888ded41a2d32abfc342f3b2af359 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Mon, 20 Nov 2023 16:36:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=20GameEntity=20?= =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E5=AD=97=E6=AE=B5=E5=92=8C=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E7=A7=BB=E9=99=A4=20Config=20=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E4=BF=AE=E5=A4=8D=E7=9B=B8=E5=85=B3=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20https://jira.shanqu.cc/browse/GHZS-4274?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/common/chain/CertificationHandler.kt | 18 -- .../java/com/gh/common/constant/Config.java | 135 +---------- .../gh/common/databind/BindingAdapters.java | 4 - .../gh/common/dialog/CertificationDialog.kt | 220 ------------------ .../com/gh/common/history/HistoryHelper.kt | 1 - .../gh/common/provider/ConfigProviderImpl.kt | 4 - .../gh/common/util/DetailDownloadUtils.java | 3 +- .../com/gh/common/util/DownloadItemUtils.kt | 7 +- .../common/util/GameActivityDownloadHelper.kt | 43 ++-- .../java/com/gh/common/util/PackageUtils.java | 8 +- .../dialog/DownloadDialogItemViewHolder.kt | 44 ++-- .../com/gh/gamecenter/SplashScreenActivity.kt | 1 - .../gh/gamecenter/SplashScreenViewModel.kt | 13 -- .../gamecenter/adapter/GameNewsAdapter.java | 1 - .../adapter/viewholder/DetailViewHolder.kt | 2 - .../download/InstalledGameViewModel.kt | 1 - .../gh/gamecenter/entity/HistoryGameEntity.kt | 2 - .../com/gh/gamecenter/entity/SubjectEntity.kt | 3 - .../fragment/MainWrapperFragment.kt | 10 +- .../gh/gamecenter/game/GameFragmentAdapter.kt | 16 +- .../gamedetail/dialog/GameDetailMoreDialog.kt | 8 +- .../com/gh/gamecenter/info/InfoViewModel.java | 1 - .../gh/gamecenter/info/OriginalViewModel.java | 1 - .../gh/gamecenter/info/StrategyAdapter.java | 1 - .../newsdetail/NewsDetailAdapter.java | 1 - .../qa/entity/EditorInsertEntity.kt | 2 - .../retrofit/service/ApiService.java | 6 - .../gh/gamecenter/subject/SubjectViewModel.kt | 5 +- .../game/GameNewsSearchResultFragment.java | 1 - .../main/res/layout/dialog_sertification.xml | 106 --------- .../feedback/provider/ConfigProviderImpl.kt | 4 - .../feedback/provider/ConfigProviderImpl.kt | 4 - .../gh/gamecenter/common/constant/Config.kt | 22 -- .../gamecenter/common/constant/Constants.java | 2 - .../core/provider/IConfigProvider.kt | 1 - .../feature/entity/AuthDialogEntity.kt | 21 -- .../gamecenter/feature/entity/GameEntity.kt | 212 ++++++----------- .../feature/entity/SettingsEntity.kt | 34 --- .../entity/SimulatorGameRecordEntity.kt | 3 - .../feedback/provider/ConfigProviderImpl.kt | 4 - .../message/provider/ConfigProviderImpl.kt | 4 - .../setting/view/SettingsFragment.kt | 13 -- .../src/main/res/layout/fragment_setting.xml | 20 -- .../src/main/res/values/strings.xml | 1 - .../setting/provider/ConfigProviderImpl.kt | 4 - .../activity/ComposeSettingActivity.kt | 10 - 46 files changed, 126 insertions(+), 901 deletions(-) delete mode 100644 app/src/main/java/com/gh/common/chain/CertificationHandler.kt delete mode 100644 app/src/main/java/com/gh/common/dialog/CertificationDialog.kt delete mode 100644 app/src/main/res/layout/dialog_sertification.xml delete mode 100644 module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/AuthDialogEntity.kt diff --git a/app/src/main/java/com/gh/common/chain/CertificationHandler.kt b/app/src/main/java/com/gh/common/chain/CertificationHandler.kt deleted file mode 100644 index 070505b083..0000000000 --- a/app/src/main/java/com/gh/common/chain/CertificationHandler.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.gh.common.chain - -import android.content.Context -import com.gh.common.dialog.CertificationDialog -import com.gh.gamecenter.feature.entity.GameEntity - -class CertificationHandler : DownloadChainHandler() { - - override fun handleRequest(context: Context, gameEntity: GameEntity, asVGame: Boolean) { - CertificationDialog.showCertificationDialog(context, gameEntity) { - if (hasNext()) { - getNext()?.handleRequest(context, gameEntity, asVGame) - } else { - processEndCallback?.invoke(asVGame, null) - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java index b5fa944512..d0dfb2494e 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -8,7 +8,6 @@ import android.text.TextUtils; import androidx.annotation.Nullable; -import com.gh.common.util.AdHelper; import com.gh.common.util.PackageHelper; import com.gh.common.util.PackageUtils; import com.gh.gamecenter.BuildConfig; @@ -26,21 +25,18 @@ import com.gh.gamecenter.entity.GameGuidePopupEntity; import com.gh.gamecenter.entity.NewApiSettingsEntity; import com.gh.gamecenter.entity.NewSettingsEntity; import com.gh.gamecenter.entity.VSetting; -import com.gh.gamecenter.feature.entity.NewsEntity; import com.gh.gamecenter.feature.entity.SettingsEntity; import com.gh.gamecenter.feature.entity.SimulatorEntity; import com.gh.gamecenter.feature.utils.ContentBlockedHelper; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.vspace.VHelper; import com.halo.assistant.HaloApp; -import com.lightgame.utils.Utils; import org.greenrobot.eventbus.EventBus; import org.json.JSONException; import org.json.JSONObject; import java.io.IOException; -import java.util.List; import java.util.Locale; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -76,51 +72,10 @@ public class Config { private static GameGuidePopupEntity mGameGuidePopupEntity; private static SharedPreferences mDefaultSharedPreferences; - public static final String FIX_DOWNLOAD_KEY = "isFixDownload"; - public static final String FIX_PLUGIN_KEY = "isFixPlugin"; - public static final int VIDEO_PAGE_SIZE = 21; // 视频列表大多都是一行3个 public static boolean isShow() { - if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) return false; - - if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true; - - if (!isExistDownloadFilter()) return false; - - for (SettingsEntity.Download entity : getSettings().getDownload()) { - if ("all".equals(entity.getGame())) { - if (entity.getPluginfy() && "normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) { - return true; - } - } - } - return false; - } - - - public static boolean isShowDownload(String gameId) { - - if (getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true; - - if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter()) - return false; - - for (SettingsEntity.Download entity : getSettings().getDownload()) { - if (gameId.equals(entity.getGame())) { - if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) { - return true; - } else { - return false; - } - } else if ("all".equals(entity.getGame())) { - if ("normal".equals(entity.getPolicy()) && filterTime(entity.getTime())) { - return true; - } - } - } - - return false; + return !SPUtils.getBoolean(Constants.SP_TEENAGER_MODE); } /** @@ -136,74 +91,10 @@ public class Config { return mNewApiSettingsEntity.getInstall().getVpnRequired().getShouldShowVpnOption(); } - public static boolean isShowPlugin(String gameId) { - SharedPreferences preferences = getPreferences(); - boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false); - if (isFixPlugin) return true; - - if (TextUtils.isEmpty(gameId) || !isExistDownloadFilter()) - return false; - - for (SettingsEntity.Download entity : getSettings().getDownload()) { - if (gameId.equals(entity.getGame())) { - if (entity.getPluginfy() && filterTime(entity.getTime())) { - return true; - } else { - return false; - } - } - - if ("all".equals(entity.getGame())) { - if (entity.getPluginfy() && filterTime(entity.getTime())) { - preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply(); - return true; - } - } - } - - return false; - } - - public static boolean isShowPlugin() { - SharedPreferences preferences = getPreferences(); - boolean isFixPlugin = preferences.getBoolean(FIX_PLUGIN_KEY, false); - if (isFixPlugin) return true; - - if (!isExistDownloadFilter()) - return false; - - for (SettingsEntity.Download entity : getSettings().getDownload()) { - if ("all".equals(entity.getGame())) { - if (entity.getPluginfy() && filterTime(entity.getTime())) { - preferences.edit().putBoolean(FIX_PLUGIN_KEY, true).apply(); - return true; - } - } - } - - return false; - } - - private static boolean filterTime(SettingsEntity.Download.TimeEntity timeEntity) { - long end = timeEntity.getEnd(); - long start = timeEntity.getStart(); - long curTime = Utils.getTime(HaloApp.getInstance().getApplication()); - - if ((start == 0 || curTime >= start) && (end == 0 || curTime <= end)) { - return true; - } - - return false; - } - public static void setSettings(SettingsEntity settingsEntity) { getPreferences().edit().putString(SETTINGS_KEY, GsonUtils.toJson(settingsEntity)).apply(); mSettingsEntity = settingsEntity; - // 更新设置状态 - mSettingsEntity.showArticleEntrance(); - mSettingsEntity.showCommunityEntrance(); - // 加载完设置后刷新下 PackageHelper.initList(); } @@ -331,27 +222,6 @@ public class Config { return mGameGuidePopupEntity; } - private static boolean isExistDownloadFilter() { - if (getSettings() == null || getSettings().getDownload() == null || getSettings().getDownload().size() == 0) { - return false; - } else { - return true; - } - } - - public static void filterPluginArticle(List list) { - if (isShowPlugin() || list == null) return; - - for (int i = 0; i < list.size(); i++) { - NewsEntity newsEntity = list.get(i); - String title = newsEntity.getTitle(); - if (!TextUtils.isEmpty(title) && title.contains("插件")) { - list.remove(i); - i--; - } - } - } - public static SharedPreferences getPreferences() { if (mDefaultSharedPreferences == null) { mDefaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance().getApplication()); @@ -382,9 +252,6 @@ public class Config { GsonUtils.toJson(response.getSuggestion())); edit.apply(); - if (!getPreferences().getBoolean(Config.FIX_DOWNLOAD_KEY, false) && Config.isShow()) { - getPreferences().edit().putBoolean(Config.FIX_DOWNLOAD_KEY, true).apply(); - } if (!SPUtils.getBoolean(Constants.SP_TEENAGER_MODE)) { EventBus.getDefault().post(new EBReuse("Refresh")); } diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java index 1746347638..321006b1fd 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -15,7 +15,6 @@ import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import com.gh.common.chain.BrowserInstallHandler; -import com.gh.common.chain.CertificationHandler; import com.gh.common.chain.DownloadChainBuilder; import com.gh.common.chain.DownloadChainHandler; import com.gh.common.chain.CheckDownloadHandler; @@ -119,7 +118,6 @@ public class BindingAdapters { // 判断是否显示按钮 if (gameEntity != null - && Config.isShowDownload(gameEntity.getId()) && !"光环助手".equals(gameEntity.getName())) { progressBar.setVisibility(View.VISIBLE); } else { @@ -166,7 +164,6 @@ public class BindingAdapters { builder.addHandler(new BrowserInstallHandler()); builder.addHandler(new PackageCheckHandler()); builder.addHandler(new DownloadDialogHelperHandler()); - builder.addHandler(new CertificationHandler()); builder.addHandler(new VersionNumberHandler()); builder.addHandler(new LandPageAddressHandler()); builder.addHandler(new OverseaDownloadHandler()); @@ -195,7 +192,6 @@ public class BindingAdapters { DownloadChainBuilder builder = new DownloadChainBuilder(); builder.addHandler(new UnsupportedFeatureHandler()); builder.addHandler(new GamePermissionHandler()); - builder.addHandler(new CertificationHandler()); builder.addHandler(new VersionNumberHandler()); builder.setProcessEndCallback((asVGame, isSubscribe) -> { diff --git a/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt b/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt deleted file mode 100644 index 48647a7985..0000000000 --- a/app/src/main/java/com/gh/common/dialog/CertificationDialog.kt +++ /dev/null @@ -1,220 +0,0 @@ -package com.gh.common.dialog - -import android.annotation.SuppressLint -import android.app.Activity -import android.app.Dialog -import android.content.Context -import android.content.Intent -import android.graphics.Color -import android.graphics.Paint -import android.graphics.drawable.ColorDrawable -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.widget.CheckBox -import android.widget.TextView -import androidx.appcompat.app.AppCompatActivity -import com.gh.gamecenter.common.avoidcallback.AvoidOnResultManager -import com.gh.gamecenter.common.avoidcallback.Callback -import com.gh.gamecenter.common.constant.Constants -import com.gh.common.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.common.utils.SensorsBridge -import com.gh.gamecenter.core.utils.GsonUtils -import com.gh.gamecenter.core.utils.SPUtils -import com.gh.gamecenter.feature.entity.AuthDialogEntity -import com.gh.gamecenter.feature.entity.AuthDialogLevel -import com.gh.gamecenter.feature.entity.GameEntity -import com.gh.gamecenter.login.user.UserManager -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 gameEntity: GameEntity, - val listener: ConfirmListener -) : - Dialog(context, R.style.GhAlertDialog) { - - private lateinit var view: View - private lateinit var detailedDesTv: TextView - private lateinit var noRemindAgainCb: CheckBox - private lateinit var actionLeftTv: TextView - private lateinit var actionRightTv: TextView - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) - view = LayoutInflater.from(context).inflate(R.layout.dialog_sertification, null) - setContentView(view) - detailedDesTv = view.findViewById(R.id.detailedDesTv) - noRemindAgainCb = view.findViewById(R.id.noRemindAgainCb) - actionLeftTv = view.findViewById(R.id.actionLeftTv) - actionRightTv = view.findViewById(R.id.actionRightTv) - - detailedDesTv.paint.flags = Paint.UNDERLINE_TEXT_FLAG - detailedDesTv.paint.isAntiAlias = true - - detailedDesTv.setOnClickListener { - DirectUtils.directToWebView(context, authDialogEntity.link) - } - - when (authDialogEntity.level) { - AuthDialogLevel.MUST_PASS.value -> { - actionLeftTv.text = "暂不下载" - actionRightTv.text = "去实名认证" - noRemindAgainCb.visibility = View.GONE - actionLeftTv.setOnClickListener { - SensorsBridge.trackVerificationPopupClick(actionLeftTv.text.toString()) - dismiss() - } - actionRightTv.setOnClickListener { - SensorsBridge.trackVerificationPopupClick(actionRightTv.text.toString()) - if (UserManager.getInstance().isLoggedIn) { - gotoAuthPage() - } else { - gotoLoginPage() - } - } - } - AuthDialogLevel.ALWAYS_HINT.value -> { - actionLeftTv.text = "去实名认证" - actionRightTv.text = "继续下载" - noRemindAgainCb.visibility = View.GONE - actionLeftTv.setOnClickListener { - SensorsBridge.trackVerificationPopupClick(actionLeftTv.text.toString()) - if (UserManager.getInstance().isLoggedIn) { - gotoAuthPage() - } else { - gotoLoginPage() - } - } - actionRightTv.setOnClickListener { - SensorsBridge.trackVerificationPopupClick(actionRightTv.text.toString()) - listener.onConfirm() - dismiss() - } - } - AuthDialogLevel.OPTIONAL_HINT.value -> { - actionLeftTv.text = "去实名认证" - actionRightTv.text = "继续下载" - noRemindAgainCb.visibility = View.VISIBLE - actionLeftTv.setOnClickListener { - SensorsBridge.trackVerificationPopupClick(actionLeftTv.text.toString()) - if (noRemindAgainCb.isChecked) { - SPUtils.setBoolean(gameEntity.id, true) - } - if (UserManager.getInstance().isLoggedIn) { - gotoAuthPage() - } else { - gotoLoginPage() - } - } - actionRightTv.setOnClickListener { - SensorsBridge.trackVerificationPopupClick(actionRightTv.text.toString()) - if (noRemindAgainCb.isChecked) { - SPUtils.getBoolean(gameEntity.id, true) - } - listener.onConfirm() - dismiss() - } - } - } - - SensorsBridge.trackVerificationDialogShow( - gameId = gameEntity.id, - gameName = gameEntity.name ?: "", - gameType = gameEntity.categoryChinese, - articleType = "", - verificationType = "游戏实名" - ) - } - - //跳转登录页面 - private fun gotoLoginPage() { - val currentActivity = AppManager.getInstance().currentActivity() ?: return - - CheckLoginUtils.checkLogin( - currentActivity as AppCompatActivity, - null, true, "实名认证弹窗" - ) { - if (UserManager.getInstance().isAuth) { - listener.onConfirm() - dismiss() - } - } - } - - //跳转实名认证页面 - private fun gotoAuthPage() { - val currentActivity = AppManager.getInstance().currentActivity() ?: return - - AvoidOnResultManager.getInstance(currentActivity as AppCompatActivity) - .startForResult( - ShellActivity.getIntent( - context, - ShellActivity.Type.REAL_NAME_INFO, - ).apply { - putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, "游戏实名") - putExtra(EntranceConsts.KEY_GAME_ID, gameEntity.id) - }, object : Callback { - override fun onActivityResult(resultCode: Int, data: Intent?) { - if (resultCode == Activity.RESULT_OK && data != null) { - val isAuthSuccess = - data.getBooleanExtra(UserInfoEditFragment.AUTH_SUCCESS, false) - if (isAuthSuccess) { - listener.onConfirm() - dismiss() - } - } - } - }) - } - - - companion object { - @JvmStatic - fun showCertificationDialog(context: Context, game: GameEntity, listener: ConfirmListener) { - //1.先判断是否登录 是执行2 否执行3 - //2.判断是否实名认证 是终止 否执行3 - //3.判断是否需要弹出认证弹窗接口 - if (UserManager.getInstance().isLoggedIn) { - if (UserManager.getInstance().isAuth) {//已实名认证 - listener.onConfirm() - } else { - authDialog(context, game, listener) - } - } else { - authDialog(context, game, listener) - } - } - - @SuppressLint("CheckResult") - private fun authDialog(context: Context, game: GameEntity, listener: ConfirmListener) { - var authDialog: AuthDialogEntity? = null - if (game.authDialog != null) { - authDialog = game.authDialog - } - if (authDialog == null) { - val datas = SPUtils.getString(Constants.SP_AUTH_DIALOG) - val type = object : TypeToken>() {}.type - val authDialogs = GsonUtils.gson.fromJson>(datas, type) - if (!authDialogs.isNullOrEmpty()) { - authDialog = authDialogs.find { it.gameCategory == game.category } - } - } - val isCloseAuthDialog = SPUtils.getBoolean(game.id, false) - if (authDialog != null && (authDialog.level != AuthDialogLevel.OPTIONAL_HINT.value || !isCloseAuthDialog)) { - val dialog = CertificationDialog(context, authDialog, game, listener) - dialog.show() - } else { - listener.onConfirm() - } - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/history/HistoryHelper.kt b/app/src/main/java/com/gh/common/history/HistoryHelper.kt index 64a30ae0b0..3e2a952b68 100644 --- a/app/src/main/java/com/gh/common/history/HistoryHelper.kt +++ b/app/src/main/java/com/gh/common/history/HistoryHelper.kt @@ -71,7 +71,6 @@ object HistoryHelper { historyGame.iconFloat = gameEntity.iconFloat historyGame.name = gameEntity.name historyGame.tagStyle = gameEntity.tagStyle - historyGame.tag = gameEntity.getTag() historyGame.subtitle = gameEntity.subtitle historyGame.subtitleStyle = gameEntity.subtitleStyle return historyGame diff --git a/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt b/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt index 1534e4fb94..676f776c57 100644 --- a/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/ConfigProviderImpl.kt @@ -100,10 +100,6 @@ class ConfigProviderImpl : IConfigProvider { return Config.getNightModeSetting()?.setting ?: false } - override fun isShowPlugin(gameId: String): Boolean { - return Config.isShowPlugin(gameId) - } - override fun init(context: Context?) { // Do nothing } diff --git a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java index 20234c4bde..07037c43cf 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -367,8 +367,7 @@ public class DetailDownloadUtils { String downloadAddWord = gameEntity.getDownloadAddWord(); // 不满足条件的部分游戏隐藏下载按钮 - if (Config.isShowDownload(gameEntity.getId()) - && !"光环助手".equals(gameEntity.getName())) { + if (!"光环助手".equals(gameEntity.getName())) { viewHolder.getDownloadBottom().setVisibility(View.VISIBLE); } else { viewHolder.getDownloadBottom().setVisibility(View.GONE); diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt index 812e2a1263..483c90aae4 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt @@ -219,7 +219,7 @@ object DownloadItemUtils { pluginLocation: PluginLocation? = PluginLocation.only_game ) { // 控制是否显示下载按钮 - downloadBtn.goneIf(!Config.isShowDownload(gameEntity.id) || context.getString(R.string.app_name) == gameEntity.name) + downloadBtn.goneIf(context.getString(R.string.app_name) == gameEntity.name) // 青少年模式或者需要特殊处理显示查看 if (SPUtils.getBoolean(Constants.SP_TEENAGER_MODE) || gameEntity.isSpecialDownload()) { downloadBtn.text = "查看" @@ -912,7 +912,6 @@ object DownloadItemUtils { DownloadChainBuilder().apply { addHandler(GamePermissionHandler()) addHandler(CheckStoragePermissionHandler()) - addHandler(CertificationHandler()) addHandler(VersionNumberHandler()) } .setProcessEndCallback { _, _ -> @@ -954,7 +953,6 @@ object DownloadItemUtils { addHandler(BrowserInstallHandler()) addHandler(PackageCheckHandler()) addHandler(DownloadDialogHelperHandler()) - addHandler(CertificationHandler()) addHandler(OverseaDownloadHandler()) addHandler(LandPageAddressHandler()) addHandler(CheckDownloadHandler()) @@ -973,7 +971,6 @@ object DownloadItemUtils { addHandler(BrowserInstallHandler()) addHandler(PackageCheckHandler()) addHandler(DownloadDialogHelperHandler()) - addHandler(CertificationHandler()) addHandler(VersionNumberHandler()) addHandler(LandPageAddressHandler()) addHandler(OverseaDownloadHandler()) @@ -991,7 +988,6 @@ object DownloadItemUtils { addHandler(GamePermissionHandler()) addHandler(PackageCheckHandler()) addHandler(DownloadDialogHelperHandler()) - addHandler(CertificationHandler()) addHandler(VersionNumberHandler()) addHandler(LandPageAddressHandler()) addHandler(OverseaDownloadHandler()) @@ -1010,7 +1006,6 @@ object DownloadItemUtils { } else { DownloadChainBuilder().apply { addHandler(DownloadDialogHelperHandler()) - addHandler(CertificationHandler()) addHandler(CheckDownloadHandler()) } .setProcessEndCallback { _, isSubscribe -> diff --git a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt index 99414c4740..b2d13211a3 100644 --- a/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt +++ b/app/src/main/java/com/gh/common/util/GameActivityDownloadHelper.kt @@ -6,7 +6,6 @@ import android.text.TextUtils import androidx.appcompat.app.AppCompatActivity import com.gh.common.DefaultJsApi import com.gh.common.constant.Config -import com.gh.common.dialog.CertificationDialog import com.gh.common.exposure.ExposureManager import com.gh.common.history.HistoryHelper import com.gh.common.repository.ReservationRepository @@ -262,10 +261,14 @@ object GameActivityDownloadHelper { traceEvent: ExposureEvent ) { GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) { - CertificationDialog.showCertificationDialog(context, gameEntity) { - DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name, gameEntity.categoryChinese) { isSubscribe: Boolean -> - download(context, gameEntity, apk, false, isSubscribe, entrance, location, traceEvent) - } + DialogUtils.checkDownload( + context, + apk.size, + gameEntity.id, + gameEntity.name, + gameEntity.categoryChinese + ) { isSubscribe: Boolean -> + download(context, gameEntity, apk, false, isSubscribe, entrance, location, traceEvent) } } DataLogUtils.uploadGameLog(context, gameEntity.id, gameEntity.name, entrance) @@ -282,16 +285,14 @@ object GameActivityDownloadHelper { ) { VHelper.validateVSpaceBeforeAction(context, gameEntity) { GamePermissionDialogFragment.show((context as AppCompatActivity), gameEntity, gameEntity.info) { - CertificationDialog.showCertificationDialog(context, gameEntity) { - DialogUtils.checkDownload( - context, - apk.size, - gameEntity.id, - gameEntity.name, - gameEntity.categoryChinese - ) { isSubscribe: Boolean -> - download(context, gameEntity, apk, true, isSubscribe, entrance, location, traceEvent) - } + DialogUtils.checkDownload( + context, + apk.size, + gameEntity.id, + gameEntity.name, + gameEntity.categoryChinese + ) { isSubscribe: Boolean -> + download(context, gameEntity, apk, true, isSubscribe, entrance, location, traceEvent) } } } @@ -309,10 +310,14 @@ object GameActivityDownloadHelper { if (gameEntity.pluggableCollection != null) { DownloadDialog.showDownloadDialog(context, gameEntity, traceEvent, entrance, location) } else { - CertificationDialog.showCertificationDialog(context, gameEntity) { - DialogUtils.checkDownload(context, apk.size, gameEntity.id, gameEntity.name, gameEntity.categoryChinese) { isSubscribe: Boolean -> - plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent) - } + DialogUtils.checkDownload( + context, + apk.size, + gameEntity.id, + gameEntity.name, + gameEntity.categoryChinese + ) { isSubscribe: Boolean -> + plugin(context, gameEntity, apk, entrance, location, isSubscribe, traceEvent) } } } diff --git a/app/src/main/java/com/gh/common/util/PackageUtils.java b/app/src/main/java/com/gh/common/util/PackageUtils.java index c48339a8f3..20636c8ff3 100644 --- a/app/src/main/java/com/gh/common/util/PackageUtils.java +++ b/app/src/main/java/com/gh/common/util/PackageUtils.java @@ -151,14 +151,8 @@ public class PackageUtils { } } - // 镜像游戏，使用镜像 Apk 替换掉原来的 ApkNormal - if (RegionSettingHelper.shouldThisGameDisplayMirrorInfo(gameEntity.getId())) { - gameEntity.setApkNormal(gameEntity.getApk()); - } - // 非插件游戏更新 - for (ApkEntity apkEntity : gameEntity.getApkNormal()) { - + for (ApkEntity apkEntity : gameEntity.getApk()) { // ghVersion 不存在即是非插件游戏 if (TextUtils.isEmpty(apkEntity.getGhVersion())) { int versionCodeFromRequest = apkEntity.getVersionCode(); diff --git a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt index 77209b1cd5..60844b373e 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt @@ -7,7 +7,6 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView import com.gh.common.constant.Config -import com.gh.common.dialog.CertificationDialog import com.gh.common.dialog.DeviceRemindDialog import com.gh.common.dialog.PackageCheckDialogFragment import com.gh.common.util.* @@ -343,33 +342,28 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas context as AppCompatActivity, gameEntity ) { - CertificationDialog.showCertificationDialog( + DialogUtils.checkDownload( context, - gameEntity - ) { - DialogUtils.checkDownload( + apkEntity.size, + gameEntity.id, + gameEntity.name, + gameEntity.categoryChinese + ) { isSubscribe -> + DownloadManager.createDownload( context, - apkEntity.size, - gameEntity.id, - gameEntity.name, - gameEntity.categoryChinese - ) { isSubscribe -> - DownloadManager.createDownload( - context, - apkEntity, - gameEntity, - false, - false, - entrance, - location, - isSubscribe, traceEvent - ) + apkEntity, + gameEntity, + false, + false, + entrance, + location, + isSubscribe, traceEvent + ) - DeviceRemindDialog.showDeviceRemindDialog( - context, - gameEntity - ) - } + DeviceRemindDialog.showDeviceRemindDialog( + context, + gameEntity + ) } } } diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt index 011a4bad7b..b70f4eca4e 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.kt @@ -262,7 +262,6 @@ class SplashScreenActivity : BaseActivity() { runOnIoThread { mViewModel?.deviceDialogSetting() mViewModel?.filterDetailTags() - mViewModel?.authDialog() mViewModel?.postMark(mIsNewForThisVersion) mViewModel?.regulationTestStatus() checkAndPostUsageStats() diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenViewModel.kt b/app/src/main/java/com/gh/gamecenter/SplashScreenViewModel.kt index 051157ee0e..9c0fb63e8d 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenViewModel.kt @@ -13,7 +13,6 @@ import com.gh.gamecenter.common.retrofit.Response import com.gh.gamecenter.common.utils.toRequestBody import com.gh.gamecenter.core.utils.GsonUtils import com.gh.gamecenter.core.utils.SPUtils -import com.gh.gamecenter.feature.entity.AuthDialogEntity import com.gh.gamecenter.entity.DeviceDialogEntity import com.gh.gamecenter.retrofit.RetrofitManager import com.halo.assistant.HaloApp @@ -77,18 +76,6 @@ class SplashScreenViewModel(application: Application) : AndroidViewModel(applica }) } - /** - * 获取游戏实名认证弹窗 - */ - fun authDialog() { - mApi.authDialog() - .subscribe(object : Response?>() { - override fun onResponse(response: List?) { - super.onResponse(response) - SPUtils.setString(Constants.SP_AUTH_DIALOG, GsonUtils.toJson(response)) - } - }) - } /** * 判断新老用户 diff --git a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java index 13077a281f..e0638c6d3d 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/GameNewsAdapter.java @@ -110,7 +110,6 @@ public class GameNewsAdapter extends BaseRecyclerAdapter { @Override public List apply(List list) { // 去除重复数据 - Config.filterPluginArticle(list); return NewsUtils.removeDuplicateData(mNewsList, list); } }) diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.kt b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.kt index c01d91ccdb..820f7a93c4 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.kt +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.kt @@ -615,7 +615,6 @@ class DetailViewHolder( builder.addHandler(BrowserInstallHandler()) builder.addHandler(PackageCheckHandler()) builder.addHandler(DownloadDialogHelperHandler()) - builder.addHandler(CertificationHandler()) builder.addHandler(VersionNumberHandler()) builder.addHandler(LandPageAddressHandler()) builder.addHandler(OverseaDownloadHandler()) @@ -624,7 +623,6 @@ class DetailViewHolder( download(asVGame, isSubscribe as Boolean) } } else { - builder.addHandler(CertificationHandler()) builder.addHandler(VersionNumberHandler()) builder.setProcessEndCallback { _: Boolean?, _: Any? -> DownloadDialog.showDownloadDialog( diff --git a/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt b/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt index 76070878c6..117efebb89 100644 --- a/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/download/InstalledGameViewModel.kt @@ -120,7 +120,6 @@ class InstalledGameViewModel(application: Application) : AndroidViewModel(applic for (entity in gameList) { if (entity.id == id) { val newEntity = entity.copy() - newEntity.isLibaoExists = entity.isLibaoExists // 下载管理不显示镜像游戏，不然会有奇怪的问题 if (entity.shouldUseMirrorInfo()) { diff --git a/app/src/main/java/com/gh/gamecenter/entity/HistoryGameEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/HistoryGameEntity.kt index b192cc8f48..f19bb9fdd1 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/HistoryGameEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/HistoryGameEntity.kt @@ -43,8 +43,6 @@ data class HistoryGameEntity( gameEntity.subtitleStyle = subtitleStyle gameEntity.name = name gameEntity.tagStyle = tagStyle - gameEntity.isLibaoExists = isLibaoExist - gameEntity.setTag(tag) return gameEntity } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt index 02b7c6462c..74b4d734e9 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt @@ -112,9 +112,6 @@ data class SubjectEntity( } fun getFilterName(): String { - if (!TextUtils.isEmpty(name) && !Config.isShowPlugin()) { - name = name?.replace("插件", "游戏") - } return if (name == null) "" else name!! } } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.kt index 1c62e50ea7..1206823161 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/fragment/MainWrapperFragment.kt @@ -21,7 +21,6 @@ import com.facebook.drawee.view.SimpleDraweeView import com.facebook.fresco.animation.drawable.AnimatedDrawable2 import com.facebook.fresco.animation.drawable.BaseAnimationListener import com.facebook.imagepipeline.image.ImageInfo -import com.gh.common.constant.Config import com.gh.common.prioritychain.* import com.gh.common.util.* import com.gh.common.util.LogUtils @@ -796,14 +795,7 @@ class MainWrapperFragment : BaseFragment_ViewPager_Checkable(), OnBackPressedLis @Subscribe(threadMode = ThreadMode.MAIN) fun onEventMainThread(reuse: EBReuse) { - if ("Refresh" == reuse.type) { - val settings = Config.getSettings() - if (settings != null && !settings.showCommunityEntrance()) { - mBinding.mainTabCommunity.visibility = View.GONE - } else { - mBinding.mainTabCommunity.visibility = View.VISIBLE - } - } else if (Constants.EB_REALNAME_RESULT == reuse.type) { + if (Constants.EB_REALNAME_RESULT == reuse.type) { updateRealNameErrorContainer() } } diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index e624dbcf6c..cf9040ee15 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -930,7 +930,7 @@ class GameFragmentAdapter( SensorsBridge.trackEvent("RecommendedLocationClick", json { "position" to clickedPosition - "Recommended_location_name" to if (Config.isShowPlugin()) entity.name else entity.nameNormal + "Recommended_location_name" to entity.name "location" to "版块" "block_name" to blockData?.text "block_id" to blockData?.link @@ -1071,12 +1071,12 @@ class GameFragmentAdapter( source = listOf( ExposureSource( "推荐入口", - if (Config.isShowPlugin()) entity.name ?: "" else entity.nameNormal ?: "" + entity.name ?: "" ) ) ) event.payload.controlType = "推荐入口" - event.payload.controlName = if (Config.isShowPlugin()) entity.name else entity.nameNormal + event.payload.controlName = entity.name event.payload.controlLinkType = entity.type event.payload.controlLinkName = entity.text entity.exposureEvent = event @@ -1124,19 +1124,19 @@ class GameFragmentAdapter( ImageUtils.display(entranceIcon4, if (subjectDigestList.size > 3) subjectDigestList[3].icon else "") ImageUtils.display(entranceIcon5, if (subjectDigestList.size > 4) subjectDigestList[4].icon else "") entranceName1.text = if (subjectDigestList.isNotEmpty()) { - if (Config.isShowPlugin()) subjectDigestList[0].name else subjectDigestList[0].nameNormal + subjectDigestList[0].name } else "推荐入口" entranceName2.text = if (subjectDigestList.size > 1) { - if (Config.isShowPlugin()) subjectDigestList[1].name else subjectDigestList[1].nameNormal + subjectDigestList[1].name } else "推荐入口" entranceName3.text = if (subjectDigestList.size > 2) { - if (Config.isShowPlugin()) subjectDigestList[2].name else subjectDigestList[2].nameNormal + subjectDigestList[2].name } else "推荐入口" entranceName4.text = if (subjectDigestList.size > 3) { - if (Config.isShowPlugin()) subjectDigestList[3].name else subjectDigestList[3].nameNormal + subjectDigestList[3].name } else "推荐入口" entranceName5.text = if (subjectDigestList.size > 4) { - if (Config.isShowPlugin()) subjectDigestList[4].name else subjectDigestList[4].nameNormal + subjectDigestList[4].name } else "推荐入口" } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt index 462e7778a1..cf84fdcada 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameDetailMoreDialog.kt @@ -122,13 +122,7 @@ class GameDetailMoreDialog : BaseDraggableDialogFragment() { private fun getShareUtils(): ShareUtils { val url = getShareUrl() val shareUtils = ShareUtils.getInstance(requireContext()) - var shareEntrance: ShareUtils.ShareEntrance = ShareUtils.ShareEntrance.game - val tagList = mGameEntity?.getTag() ?: arrayListOf() - for (s in tagList) { - if ("官方版" != s) { - shareEntrance = ShareUtils.ShareEntrance.plugin - } - } + val shareEntrance: ShareUtils.ShareEntrance = ShareUtils.ShareEntrance.game shareUtils.shareParamsDetail( requireActivity(), url, mGameEntity?.icon ?: "", mGameEntity?.name ?: "", diff --git a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java index 4ae26abae7..4aac64d866 100644 --- a/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/info/InfoViewModel.java @@ -74,7 +74,6 @@ public class InfoViewModel extends ListViewModel { @Override protected List filterData(@NonNull List list) { - Config.filterPluginArticle(list); return list; } } diff --git a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java index 1a46a8f3df..1a89c82d60 100644 --- a/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java +++ b/app/src/main/java/com/gh/gamecenter/info/OriginalViewModel.java @@ -75,7 +75,6 @@ public class OriginalViewModel extends ListViewModel { @Override protected List filterData(@NonNull List list) { - Config.filterPluginArticle(list); return list; } } diff --git a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java index 97ceb4f25d..01632d5051 100644 --- a/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/info/StrategyAdapter.java @@ -130,7 +130,6 @@ class StrategyAdapter extends BaseRecyclerAdapter { .getApi() .getArticleList(UrlFilterUtils.getFilterQuery("type_group", "攻略"), mPage) .map(newsEntities -> { - Config.filterPluginArticle(newsEntities); return NewsUtils.removeDuplicateData(mNewsList, newsEntities); }) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java index befbb414b2..b99316763e 100644 --- a/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/newsdetail/NewsDetailAdapter.java @@ -651,7 +651,6 @@ public class NewsDetailAdapter extends BaseRecyclerAdapter { .subscribe(new Response>() { @Override public void onResponse(List response) { - Config.filterPluginArticle(response); // 去除与当前文章重复的文章 for (int i = 0, size = response.size(); i < size; i++) { if (mNewsDetailEntity.getId().equals(response.get(i).getId())) { diff --git a/app/src/main/java/com/gh/gamecenter/qa/entity/EditorInsertEntity.kt b/app/src/main/java/com/gh/gamecenter/qa/entity/EditorInsertEntity.kt index 3cd6d2e788..445e5f5831 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/entity/EditorInsertEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/entity/EditorInsertEntity.kt @@ -17,7 +17,6 @@ class EditorInsertEntity( var title: String? = "", var brief: String? = "", var icon: String? = "", - var tags: List? = null ) : Parcelable { companion object { @@ -50,7 +49,6 @@ class EditorInsertEntity( entity.id = game.id entity.type = "game" entity.title = game.name - entity.tags = game.getTag() entity.icon = game.icon return entity } diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index c8cd9ed0a8..d808121858 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -104,7 +104,6 @@ import com.gh.gamecenter.feature.entity.AnswerEntity; import com.gh.gamecenter.feature.entity.ApkEntity; import com.gh.gamecenter.feature.entity.ArticleDraftEntity; import com.gh.gamecenter.feature.entity.ArticleEntity; -import com.gh.gamecenter.feature.entity.AuthDialogEntity; import com.gh.gamecenter.feature.entity.AvatarBorderEntity; import com.gh.gamecenter.feature.entity.BackgroundImageEntity; import com.gh.gamecenter.feature.entity.CommentEntity; @@ -1972,11 +1971,6 @@ public interface ApiService { @POST("articles/{article_id}:stat_visit") Observable postArticleVisit(@Path("article_id") String articleId); - /** - * 获取游戏实名认证弹窗 - */ - @GET("games/auth_dialogs") - Observable> authDialog(); /** * 获取游戏大事件 diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt index 8c529f9bad..65da734b3d 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt @@ -51,10 +51,7 @@ class SubjectViewModel( .observeOn(AndroidSchedulers.mainThread()) .subscribe(object : JSONObjectResponse() { override fun onResponse(response: JSONObject) { - var name = response.getString("name") - if (!TextUtils.isEmpty(name) && !Config.isShowPlugin()) { - name = name.replace("插件", "游戏") - } + val name = response.getString("name") subjectData?.subjectName = name subjectNameLD.postValue(name) loadSubjectType() diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java index 8dbade5f41..c2cc52a12b 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java @@ -171,7 +171,6 @@ public class GameNewsSearchResultFragment extends ToolbarFragment { .getSearchNews(EnvHelper.getHost() + "articles:search?keyword=" + mSearchKey + "&view=digest&filter=" + UrlFilterUtils.getFilterQuery("game_id", mGameId) + "&page=" + mPage) .map(list -> { - Config.filterPluginArticle(list); // 去掉重复数据 return NewsUtils.removeDuplicateData(mNewsEntities, list); }) diff --git a/app/src/main/res/layout/dialog_sertification.xml b/app/src/main/res/layout/dialog_sertification.xml deleted file mode 100644 index 4b44cdf385..0000000000 --- a/app/src/main/res/layout/dialog_sertification.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/feature/floating-window/src/demo/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt b/feature/floating-window/src/demo/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt index d8897541d6..992aae09eb 100644 --- a/feature/floating-window/src/demo/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt +++ b/feature/floating-window/src/demo/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt @@ -100,10 +100,6 @@ class ConfigProviderImpl : IConfigProvider { return false } - override fun isShowPlugin(gameId: String): Boolean { - return false - } - override fun init(context: Context?) { // Do nothing } diff --git a/feature/new_feedback/src/feedback/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt b/feature/new_feedback/src/feedback/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt index a0657b846f..28fb1cd6d7 100644 --- a/feature/new_feedback/src/feedback/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt +++ b/feature/new_feedback/src/feedback/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt @@ -100,10 +100,6 @@ class ConfigProviderImpl : IConfigProvider { return false } - override fun isShowPlugin(gameId: String): Boolean { - return false - } - override fun init(context: Context?) { // Do nothing } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/constant/Config.kt b/module_common/src/main/java/com/gh/gamecenter/common/constant/Config.kt index c7bc495186..ee05ed3bd2 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/constant/Config.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/constant/Config.kt @@ -7,11 +7,6 @@ import com.gh.gamecenter.core.utils.SPUtils.setString object Config { - const val FIX_DOWNLOAD_KEY = "isFixDownload" - const val FIX_PLUGIN_KEY = "isFixPlugin" - const val FIX_ARTICLE_KEY = "isFixArticle" - const val FIX_COMMUNITY_KEY = "isFixCommunity" - const val DEFAULT_CHANNEL = "GH_TEST3" const val DEFAULT_CHANNEL_FOR_RELEASE = "GH_LOST" // 正式包的缺省渠道，避免因渠道丢失而回落到测试渠道 private var mDefaultSharedPreferences: SharedPreferences? = null @@ -43,21 +38,4 @@ object Config { return mDefaultSharedPreferences!! } - fun isExistHideFunction(): Boolean { - if (!getPreferences().getBoolean(FIX_DOWNLOAD_KEY, false)) return true - if (!getPreferences().getBoolean(FIX_PLUGIN_KEY, false)) return true - if (!getPreferences().getBoolean(FIX_COMMUNITY_KEY, false)) return true - if (!getPreferences().getBoolean(FIX_ARTICLE_KEY, false)) return true - return false - } - - fun fixHideFunction() { - getPreferences().edit().run { - putBoolean(FIX_DOWNLOAD_KEY, true) - putBoolean(FIX_ARTICLE_KEY, true) - putBoolean(FIX_COMMUNITY_KEY, true) - putBoolean(FIX_PLUGIN_KEY, true) - apply() - } - } } \ No newline at end of file diff --git a/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java b/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java index 945b7e7145..520e0d8e44 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java @@ -145,8 +145,6 @@ public class Constants { public static final String SP_NO_REMIND_AGAIN = "no_remind_again"; //游戏详情过滤标签数据 public static final String SP_FILTER_TAGS = "filter_tags"; - //实名认证弹窗分类数据 - public static final String SP_AUTH_DIALOG = "auth_dialog"; //我的光环小红点提示 public static final String SP_GH_RED_POINT_REMIND = "gh_red_point_remind"; //论坛首页引导 diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt index 8de1b409d4..75887e3f0c 100644 --- a/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IConfigProvider.kt @@ -26,5 +26,4 @@ interface IConfigProvider : IProvider { fun getQuickLoginAppKey(): String fun getWeiboAppKey(): String fun getNightModeSetting(): Boolean - fun isShowPlugin(gameId: String):Boolean } \ No newline at end of file diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/AuthDialogEntity.kt b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/AuthDialogEntity.kt deleted file mode 100644 index 872cae9593..0000000000 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/AuthDialogEntity.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.gh.gamecenter.feature.entity - -import android.os.Parcelable -import com.google.gson.annotations.SerializedName -import kotlinx.parcelize.Parcelize - -@Parcelize -data class AuthDialogEntity( - @SerializedName("_id") - var id: String = "", - var link: String = "", - @SerializedName("game_category") - var gameCategory: String = "",//online (网络游戏) , local (单机游戏)， welfare (福利游戏) - var level: String = ""//MUST_PASS:提示且认证通过 ALWAYS_HINT:仅提示且不可关闭 OPTIONAL_HINT:仅提示且可关闭 -) : Parcelable - -enum class AuthDialogLevel(val value: String) { - MUST_PASS("MUST_PASS"), - ALWAYS_HINT("ALWAYS_HINT"), - OPTIONAL_HINT("OPTIONAL_HINT"), -} \ No newline at end of file diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameEntity.kt b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameEntity.kt index 5aa6b37a16..a596cf80c0 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameEntity.kt +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameEntity.kt @@ -22,6 +22,9 @@ import kotlinx.parcelize.IgnoredOnParcel import kotlinx.parcelize.Parcelize import java.util.* +/** + * 关联的后端数据库结构说明 ... + */ @Parcelize data class GameEntity( @SerializedName("_id") @@ -30,15 +33,17 @@ data class GameEntity( private var mIcon: String? = null, @SerializedName("ori_icon") private var mRawIcon: String? = null, + @SerializedName("icon_subscript") + var mIconSubscript: String? = null, @SerializedName("name") private var mName: String? = null, // 将 name 变成私有 mName 调用 name 时直接拼接成 mName + nameSuffix @SerializedName("name_suffix") var nameSuffix: String = "", @SerializedName("subtitle") - private var mSubtitle: String = "", + private var mSubtitle: String = "", // 副标题 @SerializedName("subtitle_style") private var mSubtitleStyle: TagStyleEntity? = null, - @SerializedName("advance_download") + @SerializedName("advance_download") // 预下载 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/1839 private var mAdvanceDownload: Boolean = false, @SerializedName("brief") private var mBrief: String? = null, @@ -48,19 +53,15 @@ data class GameEntity( @SerializedName("appointment_button") var reserveStatus: String = "", // 预约状态供用户预约列表使用，值存在的话，有两种值 -> appointment(已预约), download(已上线) - // 插件标签 - private var tag: ArrayList? = null, private var apk: ArrayList? = null, - @SerializedName("apk_normal") - private var apkNormal: ArrayList? = null, @SerializedName("apk_search") - var apkSearch: ArrayList? = null, - + private var mApkSearch: ArrayList? = null, @SerializedName("apk_index") - var apkIndex: ArrayList? = null, + private var mApkIndex: ArrayList? = null, + // 多版本相关的东西 https://git.shanqu.cc/pm/halo/halo-app-issues/-/issues/819#note_43755 var collection: ArrayList = ArrayList(), - var slide: String? = null, + // 开测表相关的东西 var test: TestEntity? = null, @SerializedName("d_button_add_word") @@ -68,13 +69,16 @@ data class GameEntity( var image: String? = null, var type: String? = null, - var isPluggable: Boolean = false, + var isPluggable: Boolean = false, // 是否是在插件化区域中 + + // 通用跳转相关的东西 var link: String? = null, var text: String? = "", @SerializedName("link_community", alternate = ["community"]) var community: CommunityEntity? = CommunityEntity(), var display: Display? = null, + // 下载弹窗相关的东西 @SerializedName("apk_link") var apkLink: ArrayList? = null, @@ -90,12 +94,6 @@ data class GameEntity( @SerializedName("download_off_dialog") private var mDownloadOffDialog: Dialog? = null, - @SerializedName("libao_exists") - var isLibaoExists: Boolean = false, - - @SerializedName("server_remark") - var serverRemark: String? = null, - @SerializedName("server_type") var serverType: String? = null, @@ -105,9 +103,6 @@ data class GameEntity( @SerializedName("server") var serverEntity: ServerCalendarEntity? = null, - @SerializedName("server_genre") - var serverGenre: String? = null, - @SerializedName("remaining_server") var serverRemaining: List? = null, @@ -130,20 +125,6 @@ data class GameEntity( @SerializedName(value = "new_tag_style") private var mTagStyle: ArrayList = ArrayList(), var des: String? = null, - // 用来标记在专题中的序号，仅用于曝光记录 - var sequence: Int? = -1, - // 用来标记在外部页面中的序号，仅用于曝光记录，具体细节可见 https://git.ghzs.com/pm/halo-app-issues/-/issues/1087 - var outerSequence: Int? = -1, - // 用来标记平台名称，仅用于曝光记录 - var platform: String? = null, - - // 用来标记下载的类型，仅用于曝光记录 - @SerializedName("download_type") - var downloadType: String? = "", - - // 用来标记下载完成的类型，仅用于曝光记录 - @SerializedName("download_complete_type") - var downloadCompleteType: String? = "", // 用于开服表标记是否为置顶项目 @SerializedName("is_fixed_top") @@ -160,11 +141,6 @@ data class GameEntity( @SerializedName("download_dialog") var downloadDialog: ArrayList? = arrayListOf(), - var auth: Auth? = null, - - @SerializedName("auth_dialog") - var authDialog: AuthDialogEntity? = null, - @SerializedName("is_related") var isRelated: Boolean = false, @@ -191,18 +167,9 @@ data class GameEntity( //首页设置 @SerializedName("home_setting") val homeSetting: HomeSetting = HomeSetting(), - var linkType: String = "", @SerializedName("index_plugin") var indexPlugin: String = "open", - // 游戏版本 （本地字段），供下载统计使用 - var gameVersion: String = "", - - // icon 角标 - @SerializedName("icon_subscript") - var mIconSubscript: String? = null, - - @SerializedName("info") var info: GameInfo? = null, @SerializedName("permission_dialog_status") @@ -228,10 +195,8 @@ data class GameEntity( // 是否支持不安装直接评论 @SerializedName("direct_comment") var directComment: Boolean = false, - // xxx人想玩 @SerializedName("h5_link") private var mH5Link: LinkEntity? = null, - val visit: Int = 0, @SerializedName("played_time") var playedTime: Long = 0, @SerializedName("played_game_id") @@ -246,7 +211,7 @@ data class GameEntity( var pluginDesc: String = "", //插件功能描述 var pluggableCollection: GameCollectionEntity? = null, //插件化包所在的合集 @SerializedName("assign_remark") - val assignRemark: AssignRemark = AssignRemark(), + val assignRemark: AssignRemark = AssignRemark(), // 特殊样式显示的配置 @SerializedName("zone_setting") var zone: ZoneEntity = ZoneEntity(), @SerializedName("comment_description") @@ -293,19 +258,6 @@ data class GameEntity( @SerializedName("column_image") var columnImage: String = "", - // 本地字段，使用镜像信息 - var useMirrorInfo: Boolean = false, - - // 本地字段，最后打开时间 - var lastPlayedTime: Long = 0, - - // 本地字段，曝光用 - var displayContent: String = "", - var isPlatformRecommend: Boolean = false, - // 从启动弹窗跳转到对应游戏列表时候记录的启动弹窗数据 (ugly ugly ugly) - var welcomeDialogId: String? = null, - var welcomeDialogTitle: String? = null, - @SerializedName("google_status") var gAppsSwitch: String? = "", // 是否需要谷歌框架，目前只用在畅玩游戏里使用 @@ -330,6 +282,51 @@ data class GameEntity( @SerializedName("mirror_server") val mirrorServer: GameDetailServer? = null, + // 消息ID，用于首页求加速上架提醒弹窗 + @SerializedName("message_private_id") + var messageId: String = "", + + // 游戏ID，仅用于QQ小游戏 + @SerializedName("appid") + var qqMiniGameAppId: String = "", + // 状态(1：下架 2：秒玩)，仅用于QQ小游戏 + @SerializedName("app_status") + var qqMiniGameAppStatus: Int = 0, + @SerializedName("first_setting") + var firstSetting: FirstSetting? = null, + + // 本地字段 + // 用来标记在专题中的序号，仅用于曝光记录 + var sequence: Int? = -1, + // 用来标记在外部页面中的序号，仅用于曝光记录，具体细节可见 https://git.ghzs.com/pm/halo-app-issues/-/issues/1087 + var outerSequence: Int? = -1, + // 用来标记平台名称，仅用于曝光记录 + var platform: String? = null, + + // 用来标记下载的类型，仅用于曝光记录 + @SerializedName("download_type") + var downloadType: String? = "", + + // 用来标记下载完成的类型，仅用于曝光记录 + @SerializedName("download_complete_type") + var downloadCompleteType: String? = "", + + // 游戏版本 （本地字段），供下载统计使用 + var gameVersion: String = "", + + // 本地字段，使用镜像信息 + var useMirrorInfo: Boolean = false, + + // 本地字段，最后打开时间 + var lastPlayedTime: Long = 0, + + // 本地字段，曝光用 + var displayContent: String = "", + var isPlatformRecommend: Boolean = false, + // 从启动弹窗跳转到对应游戏列表时候记录的启动弹窗数据 (ugly ugly ugly) + var welcomeDialogId: String? = null, + var welcomeDialogTitle: String? = null, + // 专题id，用于曝光使用 var subjectId: String? = null, // 专题名字，用于曝光使用 @@ -351,34 +348,6 @@ data class GameEntity( var gameAdSourceId: String = "", //游戏详情大家都在玩推荐类型：标签推荐/下载推荐/安装推荐，用于曝光使用 var recommendType: String = "", - - // 消息ID，用于首页求加速上架提醒弹窗 - @SerializedName("message_private_id") - var messageId: String = "", - - // 游戏ID，仅用于QQ小游戏 - @SerializedName("appid") - var qqMiniGameAppId: String = "", - // 状态(1：下架 2：秒玩)，仅用于QQ小游戏 - @SerializedName("app_status") - var qqMiniGameAppStatus: Int = 0, - // 支持base_lib依赖库的最低版本，仅用于QQ小游戏 - @SerializedName("baselibMiniVersion") - var qqMiniGameBaselibMiniVersion: String = "", - // 是否支持内购，仅用于QQ小游戏 - @SerializedName("paymentState") - var qqMiniGamePaymentState: Boolean = false, - // 是否支持广告，仅用于QQ小游戏 - @SerializedName("adState") - var qqMiniGameAdState: Boolean = false, - // 应用支持平台（0：android单端，1：android&ios双端），仅用于QQ小游戏 - @SerializedName("appPlatform") - var qqMiniGamePlatform: Int = 0, - // 客户端打开小游戏需要的链接，仅用于QQ小游戏 - @SerializedName("appidLink") - var qqMiniGameAppIdLink: String = "", - @SerializedName("first_setting") - var firstSetting: FirstSetting? = null ) : Parcelable { constructor(id: String?) : this() { @@ -660,30 +629,15 @@ data class GameEntity( welcomeDialogTitle = appProvider?.get(Constants.WELCOME_DIALOG_LINK_TITLE, false) as? String } - fun getTag(): ArrayList { - if (tag == null) tag = ArrayList() - val configProvider = ARouter.getInstance().build(RouteConsts.provider.config).navigation() as? IConfigProvider - if (configProvider?.isShowPlugin(id) == false) return ArrayList() - return tag!! - } - - fun setTag(tag: ArrayList?) { - this.tag = tag - } - fun getApk(): ArrayList { if (mValidApkList == null || shouldApkReCheckMirrorInfo()) { if (shouldUseMirrorInfo()) return obtainMirrorData()?.getApk() ?: arrayListOf() var rawApk = apk ?: ArrayList() - val configProvider = - ARouter.getInstance().build(RouteConsts.provider.config).navigation() as? IConfigProvider - if (configProvider?.isShowPlugin(id) == false) { - rawApk = getApkNormal() - } else if (gameLocation == GameLocation.INDEX && apkIndex != null) { - rawApk = apkIndex!! - } else if (gameLocation == GameLocation.SEARCH && apkSearch != null) { - rawApk = apkSearch!! + if (gameLocation == GameLocation.INDEX && mApkIndex != null) { + rawApk = mApkIndex!! + } else if (gameLocation == GameLocation.SEARCH && mApkSearch != null) { + rawApk = mApkSearch!! } mValidApkList = rawApk @@ -714,24 +668,12 @@ data class GameEntity( this.apk = apk } - fun getApkNormal(): ArrayList { - if (apkNormal == null) { - apkNormal = ArrayList() - } - return apkNormal!! - } - - fun setApkNormal(apkNormal: ArrayList?) { - this.apkNormal = apkNormal - } - /** - * 丢弃 apk 以外的 apkNormal、apkIndex、apkSearch、apkLink + * 丢弃 apk 以外的 apkIndex、apkSearch、apkLink */ fun dropOtherApk() { - apkNormal = arrayListOf() - apkIndex = arrayListOf() - apkSearch = arrayListOf() + mApkIndex = arrayListOf() + mApkSearch = arrayListOf() apkLink = arrayListOf() mValidApkList = null } @@ -948,12 +890,6 @@ data class GameEntity( return apkList[0].format == Constants.XAPK_APKS_FORMAT } - fun isNonSplitXApk(): Boolean { - val apkList = getApk() - if (apkList.isEmpty()) return false - return apkList[0].format == Constants.XAPK_FORMAT - } - fun isUseDefaultServerStyle(): Boolean { return if (serverLabel == null) { false @@ -1028,14 +964,11 @@ data class GameEntity( entity.iconSubscript = iconSubscript entity.name = name entity.tagStyle = tagStyle - entity.isLibaoExist = isLibaoExists - entity.tag = tag entity.simulatorType = simulatorType entity.simulator = simulator entity.category = category ?: "" entity.isRecentlyPlayed = isRecentlyPlayed entity.apk = getApk() - entity.apkNormal = getApkNormal() return entity } @@ -1141,15 +1074,6 @@ data class GameEntity( val endTime: Long = 0 ) : Parcelable - @Parcelize - class Auth( - val switch: String? = null, // 开关 - @SerializedName("time_start") - val timeStart: String? = "", // 开始时间 - @SerializedName("time_end") - val timeEnd: String? = "" // 结束时间 - ) : Parcelable - @Parcelize data class ContentTag( val custom: List = listOf(), diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/SettingsEntity.kt b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/SettingsEntity.kt index c11d809203..aa3f70a604 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/SettingsEntity.kt +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/SettingsEntity.kt @@ -1,23 +1,17 @@ package com.gh.gamecenter.feature.entity -import android.preference.PreferenceManager -import com.gh.gamecenter.common.constant.Config import com.gh.gamecenter.common.entity.CommunityEntity import com.gh.gamecenter.common.entity.Display import com.gh.gamecenter.common.entity.LinkEntity -import com.gh.gamecenter.feature.HaloApp import com.gh.gamecenter.feature.exposure.ExposureEvent import com.google.gson.annotations.SerializedName class SettingsEntity( - var download: List? = listOf(), var suggestion: Suggestion? = null, var search: Search? = null, var community: CommunityEntity? = null, var image: Image? = null, var support: Support? = null, - @SerializedName("community_entrance") - private var communityEntrance: String? = "", @SerializedName("game_comment_blacklist") var gameCommentBlackList: List? = listOf(), @SerializedName("game_download_blacklist") @@ -38,34 +32,6 @@ class SettingsEntity( var webviewDownloadUrl: String = "",//webview下载地址 ) { - fun showCommunityEntrance(): Boolean { - val preferences = - PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance()) - val isFixCommunity = - preferences.getBoolean(Config.FIX_COMMUNITY_KEY, false) - if (isFixCommunity) return true - - if ("on" == communityEntrance) { - preferences.edit().putBoolean(Config.FIX_COMMUNITY_KEY, true).apply() - return true - } - return false - } - - fun showArticleEntrance(): Boolean { - val preferences = - PreferenceManager.getDefaultSharedPreferences(HaloApp.getInstance()) - val isFixArticle = - preferences.getBoolean(Config.FIX_ARTICLE_KEY, false) - if (isFixArticle) return true - - if ("on" == articleEntrance) { - preferences.edit().putBoolean(Config.FIX_ARTICLE_KEY, true).apply() - return true - } - return false - } - class Support( var qq: String? = "", @SerializedName("qq-group") diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/SimulatorGameRecordEntity.kt b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/SimulatorGameRecordEntity.kt index 24e58cc85d..bc3ac97762 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/SimulatorGameRecordEntity.kt +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/SimulatorGameRecordEntity.kt @@ -39,14 +39,11 @@ data class SimulatorGameRecordEntity( gameEntity.iconSubscript = iconSubscript gameEntity.name = name gameEntity.tagStyle = tagStyle - gameEntity.isLibaoExists = isLibaoExist - gameEntity.setTag(tag) gameEntity.simulatorType = simulatorType gameEntity.simulator = simulator gameEntity.category = category gameEntity.isRecentlyPlayed = isRecentlyPlayed gameEntity.setApk(apk) - gameEntity.setApkNormal(apkNormal) return gameEntity } } \ No newline at end of file diff --git a/module_feedback/src/feedback/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt b/module_feedback/src/feedback/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt index 0a82c85ae3..99828882c6 100644 --- a/module_feedback/src/feedback/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt +++ b/module_feedback/src/feedback/java/com/gh/gamecenter/feedback/provider/ConfigProviderImpl.kt @@ -101,10 +101,6 @@ class ConfigProviderImpl : IConfigProvider { return false } - override fun isShowPlugin(gameId: String): Boolean { - return false - } - override fun init(context: Context?) { // Do nothing } diff --git a/module_message/src/message/java/com/gh/gamecenter/message/provider/ConfigProviderImpl.kt b/module_message/src/message/java/com/gh/gamecenter/message/provider/ConfigProviderImpl.kt index 5289bcf647..6fd0a19df3 100644 --- a/module_message/src/message/java/com/gh/gamecenter/message/provider/ConfigProviderImpl.kt +++ b/module_message/src/message/java/com/gh/gamecenter/message/provider/ConfigProviderImpl.kt @@ -100,10 +100,6 @@ class ConfigProviderImpl : IConfigProvider { return false } - override fun isShowPlugin(gameId: String): Boolean { - return false - } - override fun init(context: Context?) { // Do nothing } diff --git a/module_setting/src/main/java/com/gh/gamecenter/setting/view/SettingsFragment.kt b/module_setting/src/main/java/com/gh/gamecenter/setting/view/SettingsFragment.kt index bde1f06131..7fa6738537 100644 --- a/module_setting/src/main/java/com/gh/gamecenter/setting/view/SettingsFragment.kt +++ b/module_setting/src/main/java/com/gh/gamecenter/setting/view/SettingsFragment.kt @@ -111,19 +111,6 @@ class SettingsFragment : ToolbarFragment() { UserViewModel::class.java ) - // 未打开下载按钮，显示修复下载按钮 - if (Config.isExistHideFunction()) { - mBinding.settingCvFix.visibility = View.VISIBLE - mBinding.settingCvFix.setOnClickListener { - Config.fixHideFunction() - toast(getString(R.string.fix_successfully_toast)) - EventBus.getDefault().post(EBReuse("Refresh")) - val mainActivity = - ARouter.getInstance().build(RouteConsts.provider.mainActivity).navigation() as? IMainProvider - mainActivity?.skipToMainActivity(requireContext(), 0) - } - } - mViewModel.cacheSizeLiveData.observe(this) { mBinding.cacheItem.contentTv.text = it } diff --git a/module_setting/src/main/res/layout/fragment_setting.xml b/module_setting/src/main/res/layout/fragment_setting.xml index f8aea3fccb..7c43dc1dfd 100644 --- a/module_setting/src/main/res/layout/fragment_setting.xml +++ b/module_setting/src/main/res/layout/fragment_setting.xml @@ -10,26 +10,6 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - - - - - 深色模式跟随系统切换 视频播放 游戏下载 - 一键修复 下载完成自动安装游戏 安装完成自动关注游戏 切换安装方式 diff --git a/module_setting/src/setting/java/com/gh/gamecenter/setting/provider/ConfigProviderImpl.kt b/module_setting/src/setting/java/com/gh/gamecenter/setting/provider/ConfigProviderImpl.kt index f1870d2047..de671a3bf9 100644 --- a/module_setting/src/setting/java/com/gh/gamecenter/setting/provider/ConfigProviderImpl.kt +++ b/module_setting/src/setting/java/com/gh/gamecenter/setting/provider/ConfigProviderImpl.kt @@ -99,10 +99,6 @@ class ConfigProviderImpl : IConfigProvider { return false } - override fun isShowPlugin(gameId: String): Boolean { - return false - } - override fun init(context: Context?) { // Do nothing } diff --git a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeSettingActivity.kt b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeSettingActivity.kt index 833b0a1e9c..0fe55eb3fd 100644 --- a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeSettingActivity.kt +++ b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeSettingActivity.kt @@ -111,16 +111,6 @@ class ComposeSettingActivity : ComposeBaseActivity() { backgroundColor = HaloTheme.colors.background ) { Column(modifier = Modifier.verticalScroll(rememberScrollState())) { - if (Config.isExistHideFunction()) { - OneKeyFixButton { - Config.fixHideFunction() - Utils.toast(this@ComposeSettingActivity, "修复成功") - EventBus.getDefault().post(EBReuse("Refresh")) - val mainActivity = ARouter.getInstance().build(RouteConsts.provider.mainActivity) - .navigation() as? IMainProvider - mainActivity?.skipToMainActivity(this@ComposeSettingActivity, 0) - } - } Space(8.dp) SettingItem(getString(R.string.setting_security), showArrow = true) { ifLogin("设置-账号与安全-请先登录") {