From 4f6969a70af6e61876f5f40176c78f1e72cd96d9 Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 26 Feb 2021 16:48:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=B2=97=E7=B3=99=E7=9A=84?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=8E=A5=E5=8F=A3=E4=B8=8EUI?= =?UTF-8?q?=E7=BB=86=E8=8A=82=E5=BE=85=E8=A1=A5=E5=85=85=20https://git.ghz?= =?UTF-8?q?s.com/pm/halo-app-issues/-/issues/1132?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + .../com/gh/common/constant/Constants.java | 7 + .../gh/common/databind/BindingAdapters.java | 17 ++- .../java/com/gh/common/util/DialogHelper.kt | 3 + .../com/gh/common/util/DownloadItemUtils.java | 31 ++-- .../com/gh/common/util/PackageInstaller.kt | 9 +- .../java/com/gh/download/PackageObserver.kt | 3 + .../dialog/DownloadDialogItemViewHolder.kt | 35 +++-- .../download/server/BrowserInstallHelper.kt | 125 ++++++++++++++++ .../com/gh/download/server/DownloadServer.kt | 31 ++++ .../java/com/gh/gamecenter/ShellActivity.kt | 10 +- .../adapter/viewholder/DetailViewHolder.java | 16 +- .../gamedetail/GameDetailFragment.kt | 32 +++- .../assistant/fragment/SettingsFragment.java | 18 +++ .../fragment/SwitchInstallMethodFragment.kt | 53 +++++++ .../ic_install_method_arrow.png | Bin 0 -> 535 bytes .../ic_install_method_close.png | Bin 0 -> 652 bytes .../ic_install_method_hint.webp | Bin 0 -> 1106 bytes .../ic_install_method_select.webp | Bin 0 -> 968 bytes .../ic_install_method_selected.png | Bin 0 -> 1622 bytes .../main/res/layout/detail_download_item.xml | 68 ++++++++- app/src/main/res/layout/fragment_setting.xml | 34 +++++ .../layout/fragment_switch_install_method.xml | 139 ++++++++++++++++++ app/src/main/res/values/colors.xml | 4 + app/src/main/res/values/strings.xml | 1 + dependencies.gradle | 1 + 26 files changed, 584 insertions(+), 54 deletions(-) create mode 100644 app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt create mode 100644 app/src/main/java/com/gh/download/server/DownloadServer.kt create mode 100644 app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_install_method_arrow.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_install_method_close.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_install_method_hint.webp create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_install_method_select.webp create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_install_method_selected.png create mode 100644 app/src/main/res/layout/fragment_switch_install_method.xml diff --git a/app/build.gradle b/app/build.gradle index 722f3eb769..846eb157b3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -344,6 +344,7 @@ dependencies { implementation "com.github.PhilJay:MPAndroidChart:${chart}" implementation "com.github.hsiafan:apk-parser:$apkParser" + implementation "org.nanohttpd:nanohttpd:$nanohttpd" implementation project(':libraries:LGLibrary') // implementation project(':libraries:MTA') diff --git a/app/src/main/java/com/gh/common/constant/Constants.java b/app/src/main/java/com/gh/common/constant/Constants.java index 6c41de907c..0154ada354 100644 --- a/app/src/main/java/com/gh/common/constant/Constants.java +++ b/app/src/main/java/com/gh/common/constant/Constants.java @@ -146,6 +146,13 @@ public class Constants { public static final String SP_XAPK_UNZIP_ACTIVITY = "xapk_unzip_activity"; public static final String SP_XAPK_URL = "xapk_url"; + // 使用浏览器安装开关 + public static final String SP_USE_BROWSER_TO_INSTALL = "use_browser_to_install"; + // 游戏详情页底部使用浏览器安装提示 + public static final String SP_SHOULD_SHOW_GAMEDETAIL_USE_BROWSER_TO_INSTALL_HINT = "should_show_gamedetail_use_browser_to_install_hint"; + // 第一次普通安装推荐使用浏览器安装提示 + public static final String SP_SHOULD_SHOW_USE_BROWSER_TO_INSTALL_HINT = "should_show_use_browser_to_install_hint"; + //首页视频播放进度 public static final String SP_HOME_VIDEO_PLAY_RECORD = "home_video_play_record"; 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 5671d3a8ff..3be59ee53b 100644 --- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java +++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java @@ -52,6 +52,7 @@ import com.gh.common.view.DrawableView; import com.gh.common.view.GameIconView; import com.gh.download.DownloadManager; import com.gh.download.dialog.DownloadDialog; +import com.gh.download.server.BrowserInstallHelper; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; @@ -456,13 +457,15 @@ public class BindingAdapters { return; } } - PackageCheckDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity.getPackageDialog(), () -> { - DownloadDialogHelper.findAvailableDialogAndShow(v.getContext(), gameEntity, apk, () -> { - CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> { - DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> { - DialogUtils.showOverseaDownloadDialog(v.getContext(), gameEntity, () -> { - DialogUtils.checkDownload(v.getContext(), apk.getSize(), - isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location)); + BrowserInstallHelper.showBrowserInstallHintDialog(v.getContext(), () -> { + PackageCheckDialogFragment.show((AppCompatActivity) v.getContext(), gameEntity.getPackageDialog(), () -> { + DownloadDialogHelper.findAvailableDialogAndShow(v.getContext(), gameEntity, apk, () -> { + CertificationDialog.showCertificationDialog(v.getContext(), gameEntity, () -> { + DialogUtils.showVersionNumberDialog(v.getContext(), gameEntity, () -> { + DialogUtils.showOverseaDownloadDialog(v.getContext(), gameEntity, () -> { + DialogUtils.checkDownload(v.getContext(), apk.getSize(), + isSubscribe -> download(progressBar, gameEntity, traceEvent, isSubscribe, entrance, location)); + }); }); }); }); diff --git a/app/src/main/java/com/gh/common/util/DialogHelper.kt b/app/src/main/java/com/gh/common/util/DialogHelper.kt index 35e9ed4484..c43b74061a 100644 --- a/app/src/main/java/com/gh/common/util/DialogHelper.kt +++ b/app/src/main/java/com/gh/common/util/DialogHelper.kt @@ -2,6 +2,8 @@ package com.gh.common.util import android.app.Dialog import android.content.Context +import android.graphics.Color +import android.graphics.drawable.ColorDrawable import android.view.LayoutInflater import android.view.View import android.view.Window @@ -129,6 +131,7 @@ object DialogHelper { dialog.requestWindowFeature(Window.FEATURE_NO_TITLE) dialog.setContentView(contentView) + dialog.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT)) dialog.show() return dialog } diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java index c205c7db67..4486f75335 100644 --- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java +++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java @@ -28,6 +28,7 @@ import com.gh.common.xapk.XapkInstaller; import com.gh.common.xapk.XapkUnzipStatus; import com.gh.download.DownloadManager; import com.gh.download.dialog.DownloadDialog; +import com.gh.download.server.BrowserInstallHelper; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; @@ -586,12 +587,14 @@ public class DownloadItemUtils { if (str.equals(context.getString(R.string.download))) { // 先弹下载弹窗(如果需要的话) - PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity.getPackageDialog(), () -> { - DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> { - CertificationDialog.showCertificationDialog(context, gameEntity, () -> { - DialogUtils.showOverseaDownloadDialog(context, gameEntity, () -> { - DialogUtils.checkDownload(context, apk.getSize(), - isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent)); + BrowserInstallHelper.showBrowserInstallHintDialog(context, () -> { + PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity.getPackageDialog(), () -> { + DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> { + CertificationDialog.showCertificationDialog(context, gameEntity, () -> { + DialogUtils.showOverseaDownloadDialog(context, gameEntity, () -> { + DialogUtils.checkDownload(context, apk.getSize(), + isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent)); + }); }); }); }); @@ -599,13 +602,15 @@ public class DownloadItemUtils { DataLogUtils.uploadGameLog(context, gameEntity.getId(), gameEntity.getName(), entrance); } else if (str.equals(context.getString(R.string.attempt))) { - PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity.getPackageDialog(), () -> { - DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> { - CertificationDialog.showCertificationDialog(context, gameEntity, () -> { - DialogUtils.showVersionNumberDialog(context, gameEntity, () -> { - DialogUtils.showOverseaDownloadDialog(context, gameEntity, () -> { - DialogUtils.checkDownload(context, apk.getSize(), - isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent)); + BrowserInstallHelper.showBrowserInstallHintDialog(context, () -> { + PackageCheckDialogFragment.show((AppCompatActivity) context, gameEntity.getPackageDialog(), () -> { + DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apk, () -> { + CertificationDialog.showCertificationDialog(context, gameEntity, () -> { + DialogUtils.showVersionNumberDialog(context, gameEntity, () -> { + DialogUtils.showOverseaDownloadDialog(context, gameEntity, () -> { + DialogUtils.checkDownload(context, apk.getSize(), + isSubscribe -> download(context, gameEntity, downloadBtn, entrance, location, isSubscribe, traceEvent)); + }); }); }); }); diff --git a/app/src/main/java/com/gh/common/util/PackageInstaller.kt b/app/src/main/java/com/gh/common/util/PackageInstaller.kt index 0e1c4b8ea4..0cc7246f90 100644 --- a/app/src/main/java/com/gh/common/util/PackageInstaller.kt +++ b/app/src/main/java/com/gh/common/util/PackageInstaller.kt @@ -11,6 +11,7 @@ import androidx.core.content.FileProvider import com.gh.common.constant.Constants import com.gh.common.dialog.InstallPermissionDialogFragment import com.gh.common.xapk.XapkInstaller +import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.BuildConfig import com.halo.assistant.HaloApp import com.lightgame.download.DownloadEntity @@ -21,7 +22,6 @@ import java.io.File object PackageInstaller { - /** * 为了兼容java代码 */ @@ -70,6 +70,13 @@ object PackageInstaller { @JvmStatic fun install(context: Context, pkgPath: String) { try { + + // 判断是否需要使用浏览器来进行安装 + if (BrowserInstallHelper.shouldUseBrowserToInstall()) { + BrowserInstallHelper.downloadFile(pkgPath) + return + } + if (PackageUtils.isCanLaunchSetup(context, pkgPath)) { HaloApp.put(Constants.LAST_INSTALL_GAME, pkgPath) diff --git a/app/src/main/java/com/gh/download/PackageObserver.kt b/app/src/main/java/com/gh/download/PackageObserver.kt index d76589f915..1dd3df2530 100644 --- a/app/src/main/java/com/gh/download/PackageObserver.kt +++ b/app/src/main/java/com/gh/download/PackageObserver.kt @@ -7,6 +7,7 @@ import com.gh.common.constant.Constants import com.gh.common.loghub.LoghubUtils import com.gh.common.runOnIoThread import com.gh.common.util.* +import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.entity.GameDigestEntity import com.gh.gamecenter.eventbus.EBPackage import com.gh.gamecenter.manager.UserManager @@ -74,6 +75,8 @@ object PackageObserver { if ("安装" == busFour.type) { mPackageViewModel.addInstalledGame(packageName) + BrowserInstallHelper.onApkInstalled(mDownloadEntity?.path) + if (mDownloadEntity != null) { if (mDownloadEntity.isPluggable) { val kv6: MutableMap = HashMap() 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 0e063b813a..acd056ec75 100644 --- a/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt +++ b/app/src/main/java/com/gh/download/dialog/DownloadDialogItemViewHolder.kt @@ -13,6 +13,7 @@ import com.gh.common.exposure.ExposureEvent import com.gh.common.util.* import com.gh.common.util.DirectUtils.directToLinkPage import com.gh.download.DownloadManager +import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.DownloadManagerActivity import com.gh.gamecenter.R import com.gh.gamecenter.databinding.DownloadDialogItemBinding @@ -278,23 +279,27 @@ class DownloadDialogItemViewHolder(val binding: DownloadDialogItemBinding) : Bas // todo 有时间存储判断统一处理 val msg = FileUtils.isCanDownload(context, apkEntity.size) if (msg.isNullOrEmpty()) { - DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apkEntity, object : EmptyCallback { + BrowserInstallHelper.showBrowserInstallHintDialog(context, object : EmptyCallback { override fun onCallback() { - PackageCheckDialogFragment.show(context as AppCompatActivity, gameEntity.packageDialog, DialogUtils.ConfirmListener { - CertificationDialog.showCertificationDialog(context, gameEntity, DialogUtils.ConfirmListener { - DialogUtils.checkDownload(context, apkEntity.size) { isSubscribe -> - DownloadManager.createDownload( - context, - apkEntity, - gameEntity, - downloadMethod, - entrance, - location, - isSubscribe, traceEvent) + DownloadDialogHelper.findAvailableDialogAndShow(context, gameEntity, apkEntity, object : EmptyCallback { + override fun onCallback() { + PackageCheckDialogFragment.show(context as AppCompatActivity, gameEntity.packageDialog, DialogUtils.ConfirmListener { + CertificationDialog.showCertificationDialog(context, gameEntity, DialogUtils.ConfirmListener { + DialogUtils.checkDownload(context, apkEntity.size) { isSubscribe -> + DownloadManager.createDownload( + context, + apkEntity, + gameEntity, + downloadMethod, + entrance, + location, + isSubscribe, traceEvent) - DeviceRemindDialog.showDeviceRemindDialog(context, gameEntity) - } - }) + DeviceRemindDialog.showDeviceRemindDialog(context, gameEntity) + } + }) + }) + } }) } }) diff --git a/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt b/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt new file mode 100644 index 0000000000..587df04697 --- /dev/null +++ b/app/src/main/java/com/gh/download/server/BrowserInstallHelper.kt @@ -0,0 +1,125 @@ +package com.gh.download.server + +import android.content.Context +import com.gh.common.constant.Constants +import com.gh.common.util.DialogHelper +import com.gh.common.util.DirectUtils +import com.gh.common.util.EmptyCallback +import com.gh.common.util.SPUtils +import com.gh.gamecenter.ShellActivity +import com.halo.assistant.HaloApp +import com.lightgame.utils.Utils +import java.io.File + +object BrowserInstallHelper { + + private const val PORT = 32321 + + private val mServer by lazy { DownloadServer(PORT) } + private val mFileNameSet by lazy { hashSetOf() } + private val mContext by lazy { HaloApp.getInstance().application } + + fun downloadFile(filePath: String) { + val fileName = filePath.substringAfterLast(File.separator).removeSuffix(DownloadServer.APK_SUFFIX) + + if (!mServer.isAlive) startServer() + + mFileNameSet.add(fileName) + DirectUtils.directToExternalBrowser(mContext, "http://127.0.0.1:$PORT/$fileName") + } + + @JvmStatic + fun shouldUseBrowserToInstall(): Boolean { + if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL)) { + return true + } + + return false + } + + fun shouldShowUseBrowserToInstallHint(): Boolean { + return if (isUseBrowserToInstallEnabled()) { + if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL)) { + false + } else { + !SPUtils.getBoolean(Constants.SP_SHOULD_SHOW_USE_BROWSER_TO_INSTALL_HINT) + } + } else { + false + } + } + + fun shouldShowGameDetailUseBrowserToInstallHint(): Boolean { + return if (isUseBrowserToInstallEnabled()) { + if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL)) { + false + } else { + SPUtils.getBoolean(Constants.SP_SHOULD_SHOW_GAMEDETAIL_USE_BROWSER_TO_INSTALL_HINT, true) + } + } else { + false + } + } + + fun hideGameDetailUseBrowserToInstallHint() { + SPUtils.setBoolean(Constants.SP_SHOULD_SHOW_GAMEDETAIL_USE_BROWSER_TO_INSTALL_HINT, false) + } + + @JvmStatic + fun showBrowserInstallHintDialog(context: Context, callback: EmptyCallback) { + if (!shouldShowUseBrowserToInstallHint()) { + callback.onCallback() + return + } + SPUtils.setBoolean(Constants.SP_SHOULD_SHOW_USE_BROWSER_TO_INSTALL_HINT, false) + DialogHelper.showRoundedCornerDialog( + context, + "温馨提示", + "当前安装方式为助手安装，下载安装游戏需要验证账户密码或指纹。如需免密码安装，可选择切换安装方式为“浏览器安装”", + "修改路径：我的光环-设置-切换安装方式", + "切换安装方式", + "继续下载", + { + val intent = ShellActivity.getIntent(context, ShellActivity.Type.SWITCH_INSTALL_METHOD, null) + context.startActivity(intent) + }, + { + callback.onCallback() + } + ) + } + + /** + * 浏览器安装的后台开关 + */ + @JvmStatic + fun isUseBrowserToInstallEnabled(): Boolean { + return true + } + + fun onApkInstalled(path: String?) { + path?.let { + val fileName = path.substringAfterLast(File.separator).removeSuffix(DownloadServer.APK_SUFFIX) + // 更新下载名称 set，确定是否需要关闭下载服务 + mFileNameSet.remove(fileName) + stopServerIfNeeded() + } + } + + private fun startServer() { + try { + mServer.start() + } catch (e: Exception) { + e.printStackTrace() + Utils.toast(mContext, "浏览器下载服务开启失败") + } + } + + private fun stopServerIfNeeded() { + // 下载的文件都下载完了 + if (mFileNameSet.size == 0) { + mServer.stop() + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/download/server/DownloadServer.kt b/app/src/main/java/com/gh/download/server/DownloadServer.kt new file mode 100644 index 0000000000..ebaafb41cc --- /dev/null +++ b/app/src/main/java/com/gh/download/server/DownloadServer.kt @@ -0,0 +1,31 @@ +package com.gh.download.server + +import com.halo.assistant.HaloApp +import com.lightgame.download.FileUtils +import fi.iki.elonen.NanoHTTPD +import java.io.File + +class DownloadServer(port: Int) : NanoHTTPD(port) { + + override fun serve(fileName: String?, + method: Method?, + headers: MutableMap?, + parms: MutableMap?, + files: MutableMap?): Response { + val filePath = FileUtils.getDownloadDir(HaloApp.getInstance()) + fileName + APK_SUFFIX + val file = File(filePath) + + return if (file.exists()) { + val fileType = FileUtils.getFileMimeType(HaloApp.getInstance().applicationContext, filePath) + ?: "application/vnd.android.package-archive" + newFixedLengthResponse(Response.Status.OK, fileType, file.inputStream(), file.length()) + } else { + newFixedLengthResponse("找不到文件") + } + } + + companion object { + const val APK_SUFFIX = ".apk" + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/ShellActivity.kt b/app/src/main/java/com/gh/gamecenter/ShellActivity.kt index f969c603d8..e78f1c75dd 100644 --- a/app/src/main/java/com/gh/gamecenter/ShellActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/ShellActivity.kt @@ -8,6 +8,7 @@ import com.gh.base.ToolBarActivity import com.gh.base.fragment.BaseFragment import com.gh.common.util.EntranceUtils import com.gh.gamecenter.amway.AmwaySuccessFragment +import com.halo.assistant.fragment.SwitchInstallMethodFragment /** * ShellActivity 用来包裹那些几乎没有交互且运营也不会想要知道页面访问量的静态 fragment (如安利墙的评论提交成功页面) @@ -28,12 +29,11 @@ class ShellActivity : ToolBarActivity() { when (intentType) { Type.AMWAY_SUCCESS -> startFragment(AmwaySuccessFragment().with(bundle)) + Type.SWITCH_INSTALL_METHOD -> startFragment(SwitchInstallMethodFragment()) } } - override fun getLayoutId(): Int { - return R.layout.activity_shell - } + override fun getLayoutId() = R.layout.activity_shell private fun startFragment(fragment: BaseFragment) { mFragment = fragment @@ -43,6 +43,7 @@ class ShellActivity : ToolBarActivity() { companion object { const val INTENT_TYPE = "intent_type" + @JvmStatic fun getIntent(context: Context, type: Type, extraParcelable: Parcelable? = null): Intent { val intent = Intent(context, ShellActivity::class.java) intent.putExtra(INTENT_TYPE, type.value) @@ -52,7 +53,8 @@ class ShellActivity : ToolBarActivity() { } enum class Type(val value: String) { - AMWAY_SUCCESS("amway_success"); + AMWAY_SUCCESS("amway_success"), + SWITCH_INSTALL_METHOD("switch_install_method"); companion object { fun fromString(typeString: String): Type { 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 44643f7a3f..26766a5d2f 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 @@ -35,6 +35,7 @@ import com.gh.common.util.StringUtils; import com.gh.common.view.DownloadProgressBar; import com.gh.download.DownloadManager; import com.gh.download.dialog.DownloadDialog; +import com.gh.download.server.BrowserInstallHelper; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; @@ -173,18 +174,19 @@ public class DetailViewHolder { PermissionHelper.checkStoragePermissionBeforeAction(mViewHolder.context, () -> { if (mGameEntity.getApk().size() == 1) { ApkEntity apk = mGameEntity.getApk().get(0); - PackageCheckDialogFragment.show((AppCompatActivity) mViewHolder.context, mGameEntity.getPackageDialog(), () -> { - DownloadDialogHelper.findAvailableDialogAndShow(mViewHolder.context, mGameEntity, apk, () -> { - CertificationDialog.showCertificationDialog(mViewHolder.context, mGameEntity, () -> { - DialogUtils.showVersionNumberDialog(mViewHolder.context, mGameEntity, () -> { - DialogUtils.showOverseaDownloadDialog(mViewHolder.context, mGameEntity, () -> { - DialogUtils.checkDownload(mViewHolder.context, apk.getSize(), this::download); + BrowserInstallHelper.showBrowserInstallHintDialog(mViewHolder.context, () -> { + PackageCheckDialogFragment.show((AppCompatActivity) mViewHolder.context, mGameEntity.getPackageDialog(), () -> { + DownloadDialogHelper.findAvailableDialogAndShow(mViewHolder.context, mGameEntity, apk, () -> { + CertificationDialog.showCertificationDialog(mViewHolder.context, mGameEntity, () -> { + DialogUtils.showVersionNumberDialog(mViewHolder.context, mGameEntity, () -> { + DialogUtils.showOverseaDownloadDialog(mViewHolder.context, mGameEntity, () -> { + DialogUtils.checkDownload(mViewHolder.context, apk.getSize(), this::download); + }); }); }); }); }); }); - } else { CertificationDialog.showCertificationDialog(mViewHolder.context, mGameEntity, () -> { DialogUtils.showVersionNumberDialog(mViewHolder.context, mGameEntity, () -> { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index fa5a8f1c05..416c0ca4ef 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -34,6 +34,7 @@ import com.gh.common.view.TabIndicatorView import com.gh.common.xapk.XapkInstaller import com.gh.common.xapk.XapkUnzipStatus import com.gh.download.DownloadManager +import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.* import com.gh.gamecenter.adapter.viewholder.DetailViewHolder import com.gh.gamecenter.entity.* @@ -173,6 +174,15 @@ class GameDetailFragment : NormalFragment() { @BindView(R.id.closeIv) lateinit var mReserveGuideClose: View + @BindView(R.id.browser_install_hint_container) + lateinit var mBrowserInstallContainer: View + + @BindView(R.id.browser_install_hint_close_iv) + lateinit var mBrowserInstallCloseIv: View + + @BindView(R.id.browser_install_hint_tv) + lateinit var mBrowserInstallHintTv: TextView + private var mDownloadMenuIcon: ImageView? = null private var mDownloadCountHint: TextView? = null private var mSkeleton: ViewSkeletonScreen? = null @@ -409,7 +419,6 @@ class GameDetailFragment : NormalFragment() { mConcernBtn.visibility = View.VISIBLE } - private fun observeData() { mViewModel.gameLiveData.observeNonNull(this) { gameResource -> if (gameResource.status == Status.SUCCESS) { @@ -1165,6 +1174,27 @@ class GameDetailFragment : NormalFragment() { if (mGameEntity != null && (mGameEntity!!.getApk().size == 1 || mGameEntity!!.isReservable)) { DetailDownloadUtils.detailInitDownload(detailViewHolder, true) } + + mBrowserInstallContainer.goneIf(!BrowserInstallHelper.shouldShowGameDetailUseBrowserToInstallHint()) + mBrowserInstallContainer.setOnClickListener { + val intent = ShellActivity.getIntent(requireContext(), ShellActivity.Type.SWITCH_INSTALL_METHOD, null) + requireActivity().startActivity(intent) + } + mBrowserInstallCloseIv.setOnClickListener { + DialogHelper.showRoundedCornerDialog( + requireContext(), + "温馨提示", + "关闭后将不再显示免密安装引导，您可以前往“ 我的光环-设置-切换安装方式”进行设置，或在“ 我的光环-帮助与反馈”查看相关问题", + "", + "确定", + "取消", + { + mBrowserInstallContainer.visibility = View.GONE + BrowserInstallHelper.hideGameDetailUseBrowserToInstallHint() + } + ) + } + DownloadManager.getInstance(context).addObserver(dataWatcher) } diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java index ffee1aade3..38cc15d24b 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.java @@ -37,12 +37,14 @@ import com.gh.common.util.PermissionHelper; import com.gh.common.util.SPUtils; import com.gh.common.util.StringUtils; import com.gh.common.util.UsageStatsHelper; +import com.gh.download.server.BrowserInstallHelper; import com.gh.gamecenter.AboutActivity; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.CleanApkActivity; import com.gh.gamecenter.MainActivity; import com.gh.gamecenter.NetworkDiagnosisActivity; import com.gh.gamecenter.R; +import com.gh.gamecenter.ShellActivity; import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.entity.LoginTokenEntity; import com.gh.gamecenter.eventbus.EBReuse; @@ -103,6 +105,10 @@ public class SettingsFragment extends NormalFragment { TextView mNotificationAuthorityTipsTv; @BindView(R.id.privacy_red_dot) View mPrivacyRedDotView; + @BindView(R.id.setting_rl_install_method) + View mSettingInstallMethodContainer; + @BindView(R.id.setting_install_method_tv) + TextView mSettingInstallMethodTv; public static final String AUTO_INSTALL_SP_KEY = "autoinstall"; public static final String CONCERN_GAME_SP_KEY = "concerngame"; @@ -225,6 +231,18 @@ public class SettingsFragment extends NormalFragment { mNotificationAuthorityTv.setCompoundDrawablesWithIntrinsicBounds(null, null, ContextCompat.getDrawable(requireContext(), R.drawable.answer_detail_more_answer_icon), null); } + if (BrowserInstallHelper.isUseBrowserToInstallEnabled()) { + if (BrowserInstallHelper.shouldUseBrowserToInstall()) { + mSettingInstallMethodTv.setText("浏览器安装"); + } else { + mSettingInstallMethodTv.setText("助手安装"); + } + mSettingInstallMethodContainer.setVisibility(View.VISIBLE); + mSettingInstallMethodContainer.setOnClickListener(v -> { + Intent intent = ShellActivity.getIntent(requireContext(), ShellActivity.Type.SWITCH_INSTALL_METHOD, null); + requireContext().startActivity(intent); + }); + } } private void initUsageStats() { diff --git a/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt new file mode 100644 index 0000000000..a0c022975e --- /dev/null +++ b/app/src/main/java/com/halo/assistant/fragment/SwitchInstallMethodFragment.kt @@ -0,0 +1,53 @@ +package com.halo.assistant.fragment + +import android.os.Bundle +import android.view.View +import com.gh.common.constant.Constants +import com.gh.common.util.SPUtils +import com.gh.gamecenter.R +import com.gh.gamecenter.databinding.FragmentSwitchInstallMethodBinding +import com.gh.gamecenter.normal.NormalFragment + +class SwitchInstallMethodFragment : NormalFragment() { + + private var mBinding: FragmentSwitchInstallMethodBinding? = null + + override fun getLayoutId() = 0 + + override fun getInflatedLayout() = FragmentSwitchInstallMethodBinding.inflate(layoutInflater).apply { mBinding = this }.root + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + changeSwitch(SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL)) + + mBinding?.defaultContainer?.setOnClickListener { changeSwitch(false) } + mBinding?.browserContainer?.setOnClickListener { changeSwitch(true) } + mBinding?.toolbar?.normalTitle?.text = "切换安装方式" + mBinding?.toolbar?.normalToolbar?.setNavigationOnClickListener { requireActivity().finish() } + } + + private fun changeSwitch(useBrowserToInstall: Boolean) { + if (useBrowserToInstall) { + mBinding?.defaultInstallIv?.setImageResource(R.drawable.ic_install_method_select) + mBinding?.browserInstallIv?.setImageResource(R.drawable.ic_install_method_selected) + } else { + mBinding?.defaultInstallIv?.setImageResource(R.drawable.ic_install_method_selected) + mBinding?.browserInstallIv?.setImageResource(R.drawable.ic_install_method_select) + } + + if (SPUtils.getBoolean(Constants.SP_USE_BROWSER_TO_INSTALL) != useBrowserToInstall) { + mBinding?.confirmBtn?.isEnabled = true + mBinding?.confirmBtn?.alpha = 1F + } else { + mBinding?.confirmBtn?.isEnabled = false + mBinding?.confirmBtn?.alpha = 0.4F + } + + mBinding?.confirmBtn?.setOnClickListener { + SPUtils.setBoolean(Constants.SP_USE_BROWSER_TO_INSTALL, useBrowserToInstall) + requireActivity().finish() + } + } + +} \ No newline at end of file diff --git a/app/src/main/res/drawable-xxxhdpi/ic_install_method_arrow.png b/app/src/main/res/drawable-xxxhdpi/ic_install_method_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..ac50d853ab85706c5cf85004641f564e234f0e7a GIT binary patch literal 535 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyz07Sip>6gA}f5OZp5{*68Wt7!tvG zbo$v`CPRT%Tkn9p4sPETzM{v|ytzD>7cAl0)iKFTL&4nY#ub51?o+(1*B(0RL~1`b zyeG@;ov{A@z3tyBj=jD!b+SS2|BZVrb6y>9o?iV$x+9)n?ef$!)2hw%mak2kt9Z}k zo#P()hwY!%uKM%dtyv?7|sr|@FtYNFgHaFe?rx@M< zuNc;VAQ^@)A`f;ixZ=w4$ipPyK!5n7Gx?6`FF)JIGCn)LJMLgo;S^1W-NhB#g!Xex z`1E+%BZdWL1)mRr8On=eKPeGC5>FVdQ&MBb@ E0M*0H6gA}f5OZp5{_RZ79F(iWX z>~ved!v-S9AB$XBo8hv z>s;?v;kql~`Q6gh^_4Sp-&s6(^=UC@d2WL7r)?3LZ*ok3?l@=2D8{$r)}1S<+x9l* zEw*_+gQJt%eyRC^S=;~LT(^A2g^upD+ykmHsb{mJcf|G^E);a{R&hTpt#JGJ>BYNa zgrf?#q_qFc)mYrCw4>^Wh)k+h*=Yx@z*QDi`+1JcTJZlu*y7%V%)eX8(|WhXF`KM# z3!TF4?yux~@QbU*oPW)18CPa3xF7IFh+W*op*=)cs&Hzf2++_Se=QwUMUJWV+pGVX z)m}A8@Mx08!(S7$nC%_h_ZvUb2;Do|h9hP753TMjsn246?|a_p+4HE7DSqV@6Y$F47N{f{IHx2dxQ89eA%D|tfE>!=x95a+AHEA_z^ zH9|%C=Of(>FV2}U>-F5rEYEoh+|`p?S43xRo1Cykt*lO*Be7>kf{9wleOAp!hH5Wf zPj`6tf@#?qLGgJPd^&(Zbob)vO%
HG|opYM~eD6r|urP&2Bv2{Q7Jf7Z_ekYyV W$0NS~{k2V?l;G*==d#Wzp$P!>vHT}FRxCUh3j zPbL>rS=Rl~t7Bi6lA@dJiy>5XP{Z(g~m9BZN6W3-lcZE9J0F0 zmmjT3;|+UgDiLY0Ji}C0r?$p0swSFU|wzb9r)eXJ-Hp( z!JFpK_y;fs=nv6v(?4ZimT&64WWInNPoBkofFG*2LTf{0oc=dTi!gu5Khj_Dy}&<) ze>wj_*H_R3^iW#WZkeAOh5M^?yu#KiL}k9P3EMUiPAvTK(7-?3ZoT}kbG>Ml>Rc#u z9yrC0J7cFZ6MkWXmbg5^dCL#Lln8b`G2DPW2Cy$M0RI2+WB&GRFZjiDR_G_emfj+h z_1Db*zjOu1U!<&s6xU98>C!(g+qA&P^9!YthSAWMmj`ZQtoB{f-kXO1)idY+nVjVQJFICN7w@42ihPPK?4AMcpVilm9h1y_jD2wLiTkrX6;e5PYId`2XzX zSaVN3?d;wvwfb}P>))|)J;J+6s~z26Ut;J5$w%o+OzTOwcjz~Q^Dh_@q%_%BE^BY84U>}Mx z+QwriS5-dCiKeslbF*4;nC7>A;(J4RfBwb&o&Ude$MDzxh6DRTXg7$3eskVd?8wLe z{r~^`xjb}l`MCY9gohmHg&aTXFLJlp{xD|$EI9xj1es4=j3!6e>bb$de!U&_Sy#!j zd>i)a0buCOm%){#9)DJF5DSs)aICPHO(JuEDgaIExXt~9CXLvC!}tB_&Xst@|1p=j z7Zcx7?@iZr$#D&&Wh(#rb1IeeL-^6Z=hcV9`3z9Tyj$B)jXsw4%=S)LkJ9%2#g*ooB2r*j1YnArbphmGQ@1_m+1+9P6Y+z; z+MQb`=>7&i#4X61Pg3o*0oo*8oPz7QY?MPX9+kQ#trdyXpe=qBx0`;_n4ocDiVr2o Y59IDHKyF1Ux?BDpW>_}2`ThU^0BTb*WB>pF literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_install_method_select.webp b/app/src/main/res/drawable-xxxhdpi/ic_install_method_select.webp new file mode 100644 index 0000000000000000000000000000000000000000..487c49b80dfc7046b931ba46def14ec54694beaf GIT binary patch literal 968 zcmV;(12_CqNk&G%0{{S5MM6+kP&il$0000G0000#002J#06|PpNJ0Ss00H-)ux%qX zbo|U15dlb%H5~sdjzk4tUe0lhNR$-eu(oX%x^m8$@Als(X1;$F5Yc}JZX+pDdztyV z?+LILWmPvWyD|GRc2yR^t)!Vw{&7xC0#|}^rlq+I;6PX(eBr1=yyWE@U)pjHZ^Q!~ z7-HBL*dW)u|W9{FzpmYCLNDZAczxNZb6jV3oI-`tYSw*p` zqgXdmY+NX|>=fG##f(1mBl<=38`3|w`u9fv-s-;_`tQ~UzMJ~*w*GhH1HW7P-%b7R z_6PC?ectkcyh)$8L7z85pSMDvH-8{+*Vhezylw&XbrbY;8}xM}Ag@~i$m`~dx^BO5 z_`d;GP&go10ssIo6abw8DnI~006sAih(e+vAshOv03ZVdw15ia4$^<0eg}Ts@*rjK zdSByCh!5u9jhQ2Vl>S(19Qc5D0QCU=0s2qw75X3dKgiEeUkZMJd;otE{vrM!`8W7K z`k&mt|MGx-i2eVEk_qPvJ|DB$!qIj*b=XNCOiq#6%CVQ6AvlyfxJw&~KlPopTwXjs z-)1J`X(IMSc{K7#p^K9?pGe>m!x*!G0092}u*8>N5?2;vYcSG9J~4r~CKDniDD&t9 zg~NKSi!rqJZ-Z~%?jQZ&E`oj~6o*N_jm(>;7c-sz=?)+Gb)1?(UcdTK$@%fX8(3B& zmo7a9hwy%OQwb%jo&~Rc;r`c|aPj(uuk3_YCyd!YFl2NOKEiQ+P5MEBkWxVD4l(o= zzIW@nqtJpAjr;*&s!d;@c!7Ji3h!jP*)915;yX?$Y1Z1fsmAs}e?uKi9C`UPRV&0s z(NAZywO4|ZBQwo2b-xrEr~Zm_N~|Y#gR`>gtpKYT4w_l)aRbl)=l}hNevg)YXfeU9 z70&`9pboS%j?D_cq<=l$WDfQC|4O&pv5al(waUXwV>CMT*9^(N1uVQf#ciGZ0J%Lf zFb9SWH6SxRqekoxY(>0^fINtdYldmwvF2j7dhMX5jUMm1rKy+!hySYF@d@w23nkQb zPV>@@Z3j3dP0y##VaF9`^!Cc}$tZKK)@+}3sMSvXxD&2TCX4d|;O_i#>WJV|=}8yY qgEkX~jA@V|AF9EZ|5|bO7B=Aa>kbT2clF1zKRH4KFnOH-0002)(9od( literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_install_method_selected.png b/app/src/main/res/drawable-xxxhdpi/ic_install_method_selected.png new file mode 100644 index 0000000000000000000000000000000000000000..b0c171492348c2113ae0941f4ef137793361b243 GIT binary patch literal 1622 zcmV-c2C4apP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAuBz)3_wRCod9o6Bz%RUF5EXIfhy zA(0exCmU!{>f5dekeHaba)HrBS6UL`vLL!J{td<$4GRh;R97q@uwX@EVxoqHL44QH z!bW#eNKG2iR_XEkoqNyp_TD*X=FFWt5AI3YnR}kU&v(viW`3ij&td1B-mX?<4Rf4%!Q7P(J4wM{!@P7IDhd0%qDe_yhWEMbc zt;SEu8?r9%u zAk*`Q)$hKQdkZiztM}d&xd8Y_d>iX)ekC`DL=G-A)McM`0-ww~XZ6gw$QPA^Cj>4C zZKI7oOsRUnYiIS)kGJImOmy$~R9;qIOpqTvJtps-dtITkxg#Z3_*yUewS5>i8 zB^RF^lY>bjBn|;yd33LO!Sh*DMI;ds(=I-!ngCo4I0qoL+(Mp^~nY|lvr zySfou;X1@)_qc{`{-SMlh!vo<&R?nIY@bDSERonJOvUXJy5<1x@LHRkYOV8Gz)cw} zkz^v9i89A70mAKVRd#sB$~=x>3fVg9+N20?Z2tNi_v0n)?K^DC{U>0T9(q8=+i##Y z^#I=0-K+3alWb&cS2pSayq~|jD!(DIs9V~0JBmDC9vYP$=6OQY1Nbmw0N^R~))s3h z`i1~_k`u-Zz&{Lyh&3Dnt!H@O)`k5(T()CVBCqalT73SR$nh&8|6=EsHsBfK3w*|i zqe%DwGi}L|^Nj%h#LFTFc5E1O_(C7rdHucA7H=F{7xGNq@-!5gDYZ!o_T zk1gha&+UugO`9Zpz?T+SAfx3lV`Y6UmIj{lfL8!B*#o|@@hVtw<}~nM zV)w#H&^M4h;Oi>if<@&|3xD*I-wI&tCwqW3aoj{y>F5K$=CS;>Gm?E6gMS-Nyh0x9 zu&co$;MqRehcN**-_W`&>PX`z#H_tc;`!raBJ7G;uZC%&DEP2Fum_OATY$JVmm3pq zPzaDU6berx!QO+p-I%?IP&js5qO;Q>c>yhf8n8>lOuvwbfjlnqZdvU4lE-~x4}Wfh?c@Z=&p zx5D!-$fPu15vl@DF0!lec6e3(z<@xH$R5&yu?0?&w!nEMj}4Wr{wSUvXruCI2#uGZ zKjG(-QDVlEG$OdFE)1SVDES#LO`mFRgy4tgGAwOcn&Dupt5A3v(P9n-pcA6aFyHtr zA`}h}D8n3$`(3koK2Hb7w8Nnccsg8OZ>aD=P;@T3u})UQ512;f5#UdJ{fO-AbgGW# z0MiCD(D4}3+%$2uKQ^7DraR%u)g=HU=}kq)W4f5}cbx+n$P(uvMy^-^m_WZeJTPeR zyv~6PHXlK9Sp{GsJuK;X%=0=1+V1iaC6iMCW}w$K=7WnouT_A}q3sDqCkjAsYkFPR zsVC6ZG@jzrrfV5=2}b8>6qv25|1c*!j`^f+-_GbI01FQECo>d)Gb$aA(RaMQ&0*QT zh2}?7Q?A+G*0y&KFcl5-XLCjb9tZZr$#xNVKCqw8b_&7Y1NrfEoDhtw`sefi10>0E U1F2ld(EtDd07*qoM6N<$g5GrQ_y7O^ literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/detail_download_item.xml b/app/src/main/res/layout/detail_download_item.xml index 30095d88d7..c86b0b14a1 100644 --- a/app/src/main/res/layout/detail_download_item.xml +++ b/app/src/main/res/layout/detail_download_item.xml @@ -11,16 +11,72 @@ android:visibility="gone" tools:visibility="visible"> - + android:layout_height="wrap_content"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 1ff2c49047..680f112a15 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -128,6 +128,8 @@ #26262B #1F1F23 #303030 + #F7F7F7 + #FFF6E6 #EBF5FF #3797FF #EFF7FF @@ -175,6 +177,7 @@ #C1BFC9 #FF5F14 #FFDAA2 + #F9A755 #FF9B06 #D8D8D8 #FAFAFA @@ -185,6 +188,7 @@ #50556B #979A9F #C2C6CC + #C0C0C0 #242529 #ebebeb #4BC7FF diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7c550a6cec..05367d3914 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -132,6 +132,7 @@ 一键修复 下载完成自动安装游戏 安装完成自动关注游戏 + 切换安装方式 非Wi-Fi环境播放视频提醒 非Wi-Fi环境下载游戏提醒 非Wi-Fi环境播放首页视频 diff --git a/dependencies.gradle b/dependencies.gradle index 8168e8028a..42d631c804 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -108,6 +108,7 @@ ext { zip4j = "2.6.1" whatTheStack = "0.1.0_rt" apkParser = "v2.6.10" + nanohttpd = "2.3.1" sentry = "3.2.0" } \ No newline at end of file