diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt index 5579474..b90485d 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -64,23 +64,32 @@ //[SafeTreeController_20241114_1.0.0.0.apk, SafeTreeController_20241118_1.0.1.0.apk] val lastApk = files.last() - //判断是否需要下载 - if (BuildConfig.VERSION_NAME == lastApk.removePrefix("apk").split("_")[2]) { - "已经是最新版本".show(requireContext()) - return + //转为Int比较版本 + val versionValue = lastApk.removeSuffix(".apk") + .split("_")[2] + .replace(".", "") + val versionCode = if (versionValue.length != 4) { + versionValue.padEnd(4, '0').toInt() + } else { + versionValue.toInt() } - //拼接apk下载地址 - val url = "${LocaleConstant.APK_FILES_URL}${lastApk}" - AlertDialog.Builder(requireContext()) - .setTitle(getString(R.string.app_name)) - .setMessage("有新版本,是否更新?") - .setIcon(R.mipmap.ic_launcher) - .setCancelable(false) - .setNegativeButton("稍后再说") { _, _ -> } - .setPositiveButton("立即下载") { _, _ -> - downloadApk(url) - }.create().show() + //判断是否需要下载 + if (BuildConfig.VERSION_CODE < versionCode) { + //拼接apk下载地址 + val url = "${LocaleConstant.APK_FILES_URL}${lastApk}" + AlertDialog.Builder(requireContext()) + .setTitle(getString(R.string.app_name)) + .setMessage("有新版本,是否更新?") + .setIcon(R.mipmap.ic_launcher) + .setCancelable(false) + .setNegativeButton("稍后再说") { _, _ -> } + .setPositiveButton("立即下载") { _, _ -> + downloadApk(url) + }.create().show() + } else { + "已经是最新版本".show(requireContext()) + } } }).build().start() diff --git a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt index 5579474..b90485d 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/fragments/VersionManageFragment.kt @@ -64,23 +64,32 @@ //[SafeTreeController_20241114_1.0.0.0.apk, SafeTreeController_20241118_1.0.1.0.apk] val lastApk = files.last() - //判断是否需要下载 - if (BuildConfig.VERSION_NAME == lastApk.removePrefix("apk").split("_")[2]) { - "已经是最新版本".show(requireContext()) - return + //转为Int比较版本 + val versionValue = lastApk.removeSuffix(".apk") + .split("_")[2] + .replace(".", "") + val versionCode = if (versionValue.length != 4) { + versionValue.padEnd(4, '0').toInt() + } else { + versionValue.toInt() } - //拼接apk下载地址 - val url = "${LocaleConstant.APK_FILES_URL}${lastApk}" - AlertDialog.Builder(requireContext()) - .setTitle(getString(R.string.app_name)) - .setMessage("有新版本,是否更新?") - .setIcon(R.mipmap.ic_launcher) - .setCancelable(false) - .setNegativeButton("稍后再说") { _, _ -> } - .setPositiveButton("立即下载") { _, _ -> - downloadApk(url) - }.create().show() + //判断是否需要下载 + if (BuildConfig.VERSION_CODE < versionCode) { + //拼接apk下载地址 + val url = "${LocaleConstant.APK_FILES_URL}${lastApk}" + AlertDialog.Builder(requireContext()) + .setTitle(getString(R.string.app_name)) + .setMessage("有新版本,是否更新?") + .setIcon(R.mipmap.ic_launcher) + .setCancelable(false) + .setNegativeButton("稍后再说") { _, _ -> } + .setPositiveButton("立即下载") { _, _ -> + downloadApk(url) + }.create().show() + } else { + "已经是最新版本".show(requireContext()) + } } }).build().start() diff --git a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt index 24069d8..065ae3b 100644 --- a/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/safetreecontroller/view/MainActivity.kt @@ -7,6 +7,7 @@ import android.view.KeyEvent import android.view.View import android.view.ViewGroup +import android.view.WindowManager import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.AppCompatEditText import androidx.fragment.app.Fragment @@ -120,6 +121,7 @@ } override fun setupTopBarLayout() { + window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) binding.rootView.initImmersionBar(this, false, R.color.mainThemeColor) binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener { override fun onLeftClick() {