diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt index 7230b80..50fd06c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt @@ -53,28 +53,32 @@ fileViewModel = ViewModelProvider(this)[FileViewModel::class.java] fileViewModel.versionResult.observe(this) { if (it.code == 200) { - //后台已经倒序,取第一个即可 - val first = it.data.rows.first() - - if (BuildConfig.VERSION_NAME == first.versionName) { + if (it.data.rows.isEmpty()) { "已是最新版本,无需更新".show(this) } else { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("有新版本,是否更新?") - .setNegativeButton("稍后再说") - .setPositiveButton("立即下载") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - downloadApk(first.minioFileName) - } + //后台已经倒序,取第一个即可 + val first = it.data.rows.first() - override fun onCancelClick() { + if (BuildConfig.VERSION_NAME == first.versionName) { + "已是最新版本,无需更新".show(this) + } else { + AlertControlDialog.Builder() + .setContext(this) + .setTitle("提示") + .setMessage("有新版本,是否更新?") + .setNegativeButton("稍后再说") + .setPositiveButton("立即下载") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + downloadApk(first.minioFileName) + } - } - }).build().show() + override fun onCancelClick() { + + } + }).build().show() + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt index 7230b80..50fd06c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/VersionControlActivity.kt @@ -53,28 +53,32 @@ fileViewModel = ViewModelProvider(this)[FileViewModel::class.java] fileViewModel.versionResult.observe(this) { if (it.code == 200) { - //后台已经倒序,取第一个即可 - val first = it.data.rows.first() - - if (BuildConfig.VERSION_NAME == first.versionName) { + if (it.data.rows.isEmpty()) { "已是最新版本,无需更新".show(this) } else { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("提示") - .setMessage("有新版本,是否更新?") - .setNegativeButton("稍后再说") - .setPositiveButton("立即下载") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - downloadApk(first.minioFileName) - } + //后台已经倒序,取第一个即可 + val first = it.data.rows.first() - override fun onCancelClick() { + if (BuildConfig.VERSION_NAME == first.versionName) { + "已是最新版本,无需更新".show(this) + } else { + AlertControlDialog.Builder() + .setContext(this) + .setTitle("提示") + .setMessage("有新版本,是否更新?") + .setNegativeButton("稍后再说") + .setPositiveButton("立即下载") + .setOnDialogButtonClickListener(object : + AlertControlDialog.OnDialogButtonClickListener { + override fun onConfirmClick() { + downloadApk(first.minioFileName) + } - } - }).build().show() + override fun onCancelClick() { + + } + }).build().show() + } } } } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt index eb09ca6..19d6fc3 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/FileViewModel.kt @@ -60,6 +60,5 @@ } }, { loadState.value = LoadState.Fail - it.convertChinese().show(BaseApplication.get()) }) } \ No newline at end of file