diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt index 71f7a15..281e3df 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HistoryVideoActivity.kt @@ -94,6 +94,7 @@ class HistoryVideoActivity : BaseActivity() { } private fun queryData() { + showLoadingDialog(R.string.loading, false) lifecycleScope.launch(Dispatchers.IO) { val videoDao = DBUtils.videoDao() val videos = videoDao.getAllByTime(startTime, endTime) @@ -106,6 +107,7 @@ class HistoryVideoActivity : BaseActivity() { (o2.time - o1.time).toInt() } mAdapter.setData(sortList) + closeLoadingDialog() } } } diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt index d77623e..c4b5577 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt @@ -82,7 +82,8 @@ class CommonTopBar : LinearLayout { override fun onEnable(enable: Boolean) { LogUtils.w("wifiCallback onEnable = $enable") mBinding?.root?.post { - mBinding?.wifi?.visibility = if (enable) View.VISIBLE else View.GONE +// mBinding?.wifi?.visibility = if (enable) View.VISIBLE else View.GONE + mBinding?.wifi?.setImageLevel(0) } } @@ -103,7 +104,8 @@ class CommonTopBar : LinearLayout { override fun onEnable(enable: Boolean) { LogUtils.w("sim enable callback : $enable") mBinding?.root?.post { - mBinding?.fourG?.visibility = if (enable) View.VISIBLE else View.GONE +// mBinding?.fourG?.visibility = if (enable) View.VISIBLE else View.GONE + mBinding?.fourG?.setImageLevel(0) } }