diff --git a/app/src/main/java/com/gh/common/provider/MainProviderImpl.kt b/app/src/main/java/com/gh/common/provider/MainProviderImpl.kt index 91c1a5495b..c84cb7337d 100644 --- a/app/src/main/java/com/gh/common/provider/MainProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/MainProviderImpl.kt @@ -1,10 +1,8 @@ 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.MainActivity -import com.gh.gamecenter.WebActivity import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.core.provider.IMainProvider diff --git a/app/src/main/java/com/gh/common/provider/UsageStatsHelperProviderImpl.kt b/app/src/main/java/com/gh/common/provider/UsageStatsHelperProviderImpl.kt index ca54e6eb37..25c8078276 100644 --- a/app/src/main/java/com/gh/common/provider/UsageStatsHelperProviderImpl.kt +++ b/app/src/main/java/com/gh/common/provider/UsageStatsHelperProviderImpl.kt @@ -5,7 +5,6 @@ import android.os.Build import androidx.annotation.RequiresApi import com.alibaba.android.arouter.facade.annotation.Route import com.gh.common.util.UsageStatsHelper -import com.gh.common.util.WechatBindHelper import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.core.provider.IUsageStatsHelperProvider 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 d150ae8d82..82fbaeb306 100644 --- a/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java +++ b/app/src/main/java/com/gh/common/util/DetailDownloadUtils.java @@ -274,11 +274,7 @@ public class DetailDownloadUtils { break; case waiting: viewHolder.mDownloadPb.setText(R.string.waiting); - if (downloadEntity.isPluggable() && PackagesManager.INSTANCE.isInstalled(downloadEntity.getPackageName())) { - viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.WAITING); - } else { - viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.WAITING); - } + viewHolder.mDownloadPb.setButtonStyle(DownloadButton.ButtonStyle.WAITING); break; case done: if (SimulatorGameManager.isSimulatorGame(viewHolder.gameEntity)) { 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 71ba98de45..318422ba8e 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.kt @@ -316,7 +316,9 @@ object DownloadItemUtils { DownloadStatus.cancel -> { GameUtils.setDownloadBtnStatus(context, gameEntity, downloadBtn, pluginLocation) } - else -> {} + else -> { + // do nothing + } } } } else { @@ -847,10 +849,8 @@ object DownloadItemUtils { val isInstalledOldSimulator = SimulatorGameManager.isOldSimulatorInstalled(context) var simulator = gameEntity.simulator val newSimulator = Config.getNewSimulatorEntitySetting() - if (!isInstalledOldSimulator && newSimulator != null) {//在没有安装旧的模拟器且有配置新版模拟器 才使用新版模拟器 否则还是用以前旧的 - if (newSimulator.active) { - simulator = newSimulator - } + if (!isInstalledOldSimulator && newSimulator != null && newSimulator.active) {//在没有安装旧的模拟器且有配置新版模拟器 才使用新版模拟器 否则还是用以前旧的 + simulator = newSimulator } if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(gameEntity) && !isInstalled && !isInstalledNewSimulator) { SimulatorDownloadManager.getInstance().showDownloadDialog( diff --git a/app/src/main/java/com/gh/common/util/MessageShareUtils.java b/app/src/main/java/com/gh/common/util/MessageShareUtils.java index d3799b86f2..09fdbef8c4 100644 --- a/app/src/main/java/com/gh/common/util/MessageShareUtils.java +++ b/app/src/main/java/com/gh/common/util/MessageShareUtils.java @@ -313,47 +313,44 @@ public class MessageShareUtils { } public void shareTextFromWeb(Activity activity, String text, String type) { - switch (type) { - case "qq": - Utils.toast(mContext, "分享跳转中..."); - if (ShareUtils.isQQClientAvailable(activity)) { - Intent intent = new Intent(); - intent.setAction(Intent.ACTION_SEND); - intent.putExtra(Intent.EXTRA_TEXT, text); - intent.setType("text/plain"); - intent.setPackage("com.tencent.mobileqq"); - intent.setClassName("com.tencent.mobileqq", "com.tencent.mobileqq.activity.JumpActivity"); - try { - activity.startActivity(intent); - } catch (Exception e) { - Utils.toast(mContext, "分享失败"); - } - } else { - Utils.toast(mContext, "请安装QQ客户端"); + if ("qq".equals(type)) { + Utils.toast(mContext, "分享跳转中..."); + if (ShareUtils.isQQClientAvailable(activity)) { + Intent intent = new Intent(); + intent.setAction(Intent.ACTION_SEND); + intent.putExtra(Intent.EXTRA_TEXT, text); + intent.setType("text/plain"); + intent.setPackage("com.tencent.mobileqq"); + intent.setClassName("com.tencent.mobileqq", "com.tencent.mobileqq.activity.JumpActivity"); + try { + activity.startActivity(intent); + } catch (Exception e) { + Utils.toast(mContext, "分享失败"); } - break; - case "wechat": - Utils.toast(mContext, "分享跳转中..."); + } else { + Utils.toast(mContext, "请安装QQ客户端"); + } + } else if ("wechat".equals(type)) { + Utils.toast(mContext, "分享跳转中..."); - if (!mIWXAPI.isWXAppInstalled() && !PermissionHelper.isGetInstalledListPermissionDisabled(mContext)) { - Utils.toast(mContext, mContext.getString(R.string.share_no_wechat_hint)); - return; - } + if (!mIWXAPI.isWXAppInstalled() && !PermissionHelper.isGetInstalledListPermissionDisabled(mContext)) { + Utils.toast(mContext, mContext.getString(R.string.share_no_wechat_hint)); + return; + } - WXTextObject textObj = new WXTextObject(); - textObj.text = text; + WXTextObject textObj = new WXTextObject(); + textObj.text = text; - WXMediaMessage msg = new WXMediaMessage(); - msg.mediaObject = textObj; - msg.description = text; + WXMediaMessage msg = new WXMediaMessage(); + msg.mediaObject = textObj; + msg.description = text; - SendMessageToWX.Req req = new SendMessageToWX.Req(); - req.transaction = buildTransaction("text"); - req.message = msg; - req.scene = SendMessageToWX.Req.WXSceneSession; + SendMessageToWX.Req req = new SendMessageToWX.Req(); + req.transaction = buildTransaction("text"); + req.message = msg; + req.scene = SendMessageToWX.Req.WXSceneSession; - mIWXAPI.sendReq(req); - break; + mIWXAPI.sendReq(req); } } diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java index 654b1c376e..e0b4e1c426 100644 --- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java +++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java @@ -359,10 +359,8 @@ public class DetailViewHolder { boolean isInstalledOldSimulator = SimulatorGameManager.isOldSimulatorInstalled(mViewHolder.context); SimulatorEntity simulator = mGameEntity.getSimulator(); SimulatorEntity newSimulator = Config.getNewSimulatorEntitySetting(); - if (!isInstalledOldSimulator && newSimulator != null) { - if (newSimulator.getActive()) { - simulator = newSimulator; - } + if (!isInstalledOldSimulator && newSimulator != null && newSimulator.getActive()) { + simulator = newSimulator; } if (downloadEntity != null && SimulatorGameManager.isSimulatorGame(mGameEntity) && !isInstalled && !isInstalledNewSimulator) { diff --git a/app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerActivity.kt b/app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerActivity.kt index 3927ea1a9d..0ec58de3ee 100644 --- a/app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/cloudarchive/CloudArchiveManagerActivity.kt @@ -59,10 +59,8 @@ class CloudArchiveManagerActivity : BaseActivity_TabLayout() { private val dataWatcher = object : DataWatcher() { override fun onDataChanged(downloadEntity: DownloadEntity) { - if (downloadEntity.gameId == mViewModel.gameId) { - if (mGameEntity?.getApk()?.size == 1) { - updateDownloadBtn(downloadEntity, mBinding.downloadBtn, mGameEntity) - } + if (downloadEntity.gameId == mViewModel.gameId && mGameEntity?.getApk()?.size == 1) { + updateDownloadBtn(downloadEntity, mBinding.downloadBtn, mGameEntity) } } diff --git a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java index ce80c28b95..cef383ff41 100644 --- a/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java +++ b/app/src/main/java/com/gh/gamecenter/download/GameDownloadFragmentAdapter.java @@ -285,10 +285,6 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { notifyItemChanged(mDownloadedList.isEmpty() ? 0 : 1 + mDownloadedList .size()); DownloadManager.getInstance().resume(downloadEntity, true); -// Message msg = Message.obtain(); -// msg.what = DownloadConfig.CONTINUE_DOWNLOAD_TASK; -// msg.obj = url; -// DownloadManager.getInstance().sendMessageDelayed(msg, 1000); } }); }); @@ -321,10 +317,6 @@ class GameDownloadFragmentAdapter extends BaseRecyclerAdapter { viewHolder.binding.dmItemTvSpeed.setTextColor(ContextCompat.getColor(mContext, R.color.text_subtitleDesc)); statusMap.put(url, DownloadStatus.pause.getStatus()); notifyItemChanged(mDownloadedList.isEmpty() ? 0 : 1 + mDownloadedList.size()); -// Message msg = Message.obtain(); -// msg.what = DownloadConfig.PAUSE_DOWNLOAD_TASK; -// msg.obj = url; -// DownloadManager.getInstance().sendMessageDelayed(msg, 1000); DownloadManager.getInstance().pause(downloadEntity.getUrl()); break; diff --git a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeBindPhoneActivity.kt b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeBindPhoneActivity.kt index e81c101819..7990122c45 100644 --- a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeBindPhoneActivity.kt +++ b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/activity/ComposeBindPhoneActivity.kt @@ -219,10 +219,8 @@ class ComposeBindPhoneActivity : ComposeBaseActivity() { private fun initObserver() { mViewModel.nextLiveData.observe(this) { mShowCaptcha = true - if (BuildConfig.DEBUG || BuildConfig.BUILD_TIME != 0L) { - if (!SPUtils.getBoolean(Constants.SP_HAS_COMPLETE_INVITE_CODE)) { - mShowInviteCode = true - } + if ((BuildConfig.DEBUG || BuildConfig.BUILD_TIME != 0L) && !SPUtils.getBoolean(Constants.SP_HAS_COMPLETE_INVITE_CODE)) { + mShowInviteCode = true } mBindPhoneBtnEnable = false mBindPhoneBtnText = "完成" 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 e6b2c2f2e2..671485dc6f 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 @@ -474,9 +474,15 @@ class ComposeSettingActivity : ComposeBaseActivity() { Utils.toast(this@ComposeSettingActivity, "缓存清除成功") } - override fun onError(e: Throwable) {} - override fun onSubscribe(d: Disposable) {} - override fun onNext(t: Any) {} + override fun onError(e: Throwable) { + // do nothing + } + override fun onSubscribe(d: Disposable) { + // do nothing + } + override fun onNext(t: Any) { + // do nothing + } }) } diff --git a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/viewmodel/ComposeBindPhoneViewModel.kt b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/viewmodel/ComposeBindPhoneViewModel.kt index 72ab07d6c5..032bd3ed0e 100644 --- a/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/viewmodel/ComposeBindPhoneViewModel.kt +++ b/module_setting_compose/src/main/java/com/gh/gamecenter/setting/compose/viewmodel/ComposeBindPhoneViewModel.kt @@ -37,7 +37,7 @@ class ComposeBindPhoneViewModel(application: Application) : AndroidViewModel(app params["mobile"] = phoneNum val jsonObject = JSONObject(params as Map<*, *>) jsonObject.put("device", device) - val body: RequestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) + val body: RequestBody = RequestBody.create(MediaType.parse(APPLICATION_JSON), jsonObject.toString()) api.bindPhone(1, body) .subscribeOn(Schedulers.io()) @@ -88,7 +88,7 @@ class ComposeBindPhoneViewModel(application: Application) : AndroidViewModel(app } val jsonObject = JSONObject(params as Map<*, *>) jsonObject.put("device", device) - val body: RequestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) + val body: RequestBody = RequestBody.create(MediaType.parse(APPLICATION_JSON), jsonObject.toString()) api.bindPhone(2, body) .subscribeOn(Schedulers.io()) @@ -132,7 +132,7 @@ class ComposeBindPhoneViewModel(application: Application) : AndroidViewModel(app params["mobile"] = phoneNum val jsonObject = JSONObject(params as Map<*, *>) jsonObject.put("device", device) - val body: RequestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) + val body: RequestBody = RequestBody.create(MediaType.parse(APPLICATION_JSON), jsonObject.toString()) api.reBindPhone(1, body) .subscribeOn(Schedulers.io()) @@ -184,7 +184,7 @@ class ComposeBindPhoneViewModel(application: Application) : AndroidViewModel(app } val jsonObject = JSONObject(params as Map<*, *>) jsonObject.put("device", device) - val body: RequestBody = RequestBody.create(MediaType.parse("application/json"), jsonObject.toString()) + val body: RequestBody = RequestBody.create(MediaType.parse(APPLICATION_JSON), jsonObject.toString()) api.reBindPhone(2, body) .subscribeOn(Schedulers.io()) @@ -219,4 +219,8 @@ class ComposeBindPhoneViewModel(application: Application) : AndroidViewModel(app } }) } + + companion object { + private const val APPLICATION_JSON = "application/json" + } } \ No newline at end of file