From 3232f36ed0b96568bd54f5512435a7fb675c85aa Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Mon, 6 Nov 2023 16:04:26 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E4=BD=93=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safetywatcher/watcher/base/BaseActivity.kt | 15 +++++++++------ .../safetywatcher/watcher/utils/PlatformUtils.kt | 12 ++++-------- .../safetywatcher/watcher/utils/StorageUtils.kt | 2 +- .../watcher/wifi/ui/GlobalMonitorActivity.kt | 10 ++++++---- 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt index 88040fd..d4543f7 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt @@ -15,6 +15,7 @@ import android.widget.SeekBar import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.AppCompatRadioButton +import androidx.lifecycle.lifecycleScope import com.common.commonlib.utils.LogUtils import com.loper7.date_time_picker.number_picker.NumberPicker import com.yinuo.safetywatcher.R @@ -85,10 +86,10 @@ abstract class BaseActivity : AppCompatActivity() { } fun showLoadingDialog(resId: Int = R.string.sync_data_tip, cancelable: Boolean = true) { - loadingDialog?.dismiss() - loadingDialog = CommonDialog(resId) - loadingDialog!!.isCancelable = cancelable - if (!this.isFinishing) { + lifecycleScope.launchWhenResumed { + loadingDialog?.dismiss() + loadingDialog = CommonDialog(resId) + loadingDialog!!.isCancelable = cancelable loadingDialog!!.show(supportFragmentManager, "loading") } } @@ -99,8 +100,10 @@ abstract class BaseActivity : AppCompatActivity() { } fun closeLoadingDialog() { - loadingDialog?.dismiss() - loadingDialog = null + lifecycleScope.launchWhenResumed { + loadingDialog?.dismiss() + loadingDialog = null + } } open val isHome: Boolean = false diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/PlatformUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/PlatformUtils.kt index c3ab4be..0859435 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/PlatformUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/PlatformUtils.kt @@ -47,19 +47,15 @@ object PlatformUtils { CommonApplication.getContext()?.sendBroadcast(intent) } - fun hideStatusBar(hide: Boolean = true) { - val action = - if (hide) "android.ido.intent.action.statusbar.HIDE" - else "android.ido.intent.action.statusbar.HIDE" + fun hideStatusBar() { + val action = "android.ido.intent.action.statusbar.HIDE" val intent = Intent(action) intent.putExtra("save", true) //true,断电保存；false，断电不保存 CommonApplication.getContext()?.sendBroadcast(intent) } - fun hideNavigation(hide: Boolean = true) { - val action = - if (hide) "android.ido.intent.action.navigation.HIDE" - else "android.ido.intent.action.navigation.SHOW" + fun hideNavigation() { + val action ="android.ido.intent.action.navigation.HIDE" val intent = Intent(action) intent.putExtra("save", true) //true,断电保存；false，断电不保存 CommonApplication.getContext()?.sendBroadcast(intent) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/StorageUtils.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/StorageUtils.kt index e8d151b..6f3f75e 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/StorageUtils.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/StorageUtils.kt @@ -30,7 +30,7 @@ object StorageUtils { val storageVolumeElement: StorageVolume = result[i] val userLabel = getUserLabel.invoke(storageVolumeElement) as String val path = getPath.invoke(storageVolumeElement) as String - if (userLabel.contains(keyword)) { + if (userLabel.contains(keyword) || userLabel.contains("U 盘")) { targetpath = path } } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt index db92c6e..3b45a56 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/wifi/ui/GlobalMonitorActivity.kt @@ -81,11 +81,11 @@ class GlobalMonitorActivity : NoOptionsActivity() { showInputDialog(wifiInfo, 0) } } else { - showDelDialog(wifiInfo) +// showDelDialog(wifiInfo) } }, onItemLongClick = { info -> if (null != info.configuration) { - showDelDialog(info) +// showDelDialog(info) } }) mBinding.rvData.adapter = mAdapter @@ -133,7 +133,8 @@ class GlobalMonitorActivity : NoOptionsActivity() { } override fun onWiFiConnected(SSID: String, isInit: Boolean) { - mBinding.tvStatus!!.text = isInit.toString() + " || " + SSID + "已连接" +// mBinding.tvStatus!!.text = isInit.toString() + " || " + SSID + "已连接" + mBinding.tvStatus!!.text = SSID + "已连接" refreshData(SSID, WiFiConnectType.CONNECTED) } @@ -141,7 +142,8 @@ class GlobalMonitorActivity : NoOptionsActivity() { if (TextUtils.isEmpty(SSID)) { return } - mBinding.tvStatus!!.text = SSID + "连接失败，" + type.name +// mBinding.tvStatus!!.text = SSID + "连接失败，" + type.name + mBinding.tvStatus!!.text = SSID + "连接失败" refreshData(SSID, WiFiConnectType.DISCONNECTED) if (type == WiFiConnectFailType.DIRECT_PASSWORD_ERROR) { //直连密码错误，提示用户修改密码