diff --git a/app/OperationSite.jks b/app/OperationSite.jks new file mode 100644 index 0000000..f2b7f34 --- /dev/null +++ b/app/OperationSite.jks Binary files differ diff --git a/app/OperationSite.jks b/app/OperationSite.jks new file mode 100644 index 0000000..f2b7f34 --- /dev/null +++ b/app/OperationSite.jks Binary files differ diff --git a/app/build.gradle b/app/build.gradle index cce9aa8..036561c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,14 @@ apply plugin: 'kotlin-android-extensions' android { + signingConfigs { + release { + storeFile file('/Users/a203/Desktop/AndroidProjects/OperationSite/app/OperationSite.jks') + storePassword '123456789' + keyAlias 'key0' + keyPassword '123456789' + } + } compileSdkVersion 31 buildToolsVersion "30.0.3" diff --git a/app/OperationSite.jks b/app/OperationSite.jks new file mode 100644 index 0000000..f2b7f34 --- /dev/null +++ b/app/OperationSite.jks Binary files differ diff --git a/app/build.gradle b/app/build.gradle index cce9aa8..036561c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,14 @@ apply plugin: 'kotlin-android-extensions' android { + signingConfigs { + release { + storeFile file('/Users/a203/Desktop/AndroidProjects/OperationSite/app/OperationSite.jks') + storePassword '123456789' + keyAlias 'key0' + keyPassword '123456789' + } + } compileSdkVersion 31 buildToolsVersion "30.0.3" diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt deleted file mode 100644 index 751d8ce..0000000 --- a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.br.operationsite.utils; - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object DialogHelper { - private lateinit var loadingDialog: QMUITipDialog - - fun showLoadingDialog(activity: Activity, message: String?) { - loadingDialog = QMUITipDialog.Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismissLoadingDialog() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} diff --git a/app/OperationSite.jks b/app/OperationSite.jks new file mode 100644 index 0000000..f2b7f34 --- /dev/null +++ b/app/OperationSite.jks Binary files differ diff --git a/app/build.gradle b/app/build.gradle index cce9aa8..036561c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,14 @@ apply plugin: 'kotlin-android-extensions' android { + signingConfigs { + release { + storeFile file('/Users/a203/Desktop/AndroidProjects/OperationSite/app/OperationSite.jks') + storePassword '123456789' + keyAlias 'key0' + keyPassword '123456789' + } + } compileSdkVersion 31 buildToolsVersion "30.0.3" diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt deleted file mode 100644 index 751d8ce..0000000 --- a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.br.operationsite.utils; - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object DialogHelper { - private lateinit var loadingDialog: QMUITipDialog - - fun showLoadingDialog(activity: Activity, message: String?) { - loadingDialog = QMUITipDialog.Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismissLoadingDialog() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt new file mode 100644 index 0000000..a5f3660 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt @@ -0,0 +1,37 @@ +package com.casic.br.operationsite.utils; + +import android.app.Activity +import android.view.WindowManager +import com.pengxh.kt.lite.base.BaseSingleton +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog + +class DialogManager private constructor(private val activity: Activity) { + + private lateinit var loadingDialog: QMUITipDialog + + companion object : BaseSingleton() { + override val creator: (Activity) -> DialogManager + get() = ::DialogManager + } + + fun showLoadingDialog(message: String) { + loadingDialog = QMUITipDialog + .Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } + } + + fun dismissLoadingDialog() { + if (loadingDialog.isShowing) { + loadingDialog.dismiss() + } + } +} diff --git a/app/OperationSite.jks b/app/OperationSite.jks new file mode 100644 index 0000000..f2b7f34 --- /dev/null +++ b/app/OperationSite.jks Binary files differ diff --git a/app/build.gradle b/app/build.gradle index cce9aa8..036561c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,14 @@ apply plugin: 'kotlin-android-extensions' android { + signingConfigs { + release { + storeFile file('/Users/a203/Desktop/AndroidProjects/OperationSite/app/OperationSite.jks') + storePassword '123456789' + keyAlias 'key0' + keyPassword '123456789' + } + } compileSdkVersion 31 buildToolsVersion "30.0.3" diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt deleted file mode 100644 index 751d8ce..0000000 --- a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.br.operationsite.utils; - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object DialogHelper { - private lateinit var loadingDialog: QMUITipDialog - - fun showLoadingDialog(activity: Activity, message: String?) { - loadingDialog = QMUITipDialog.Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismissLoadingDialog() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt new file mode 100644 index 0000000..a5f3660 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt @@ -0,0 +1,37 @@ +package com.casic.br.operationsite.utils; + +import android.app.Activity +import android.view.WindowManager +import com.pengxh.kt.lite.base.BaseSingleton +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog + +class DialogManager private constructor(private val activity: Activity) { + + private lateinit var loadingDialog: QMUITipDialog + + companion object : BaseSingleton() { + override val creator: (Activity) -> DialogManager + get() = ::DialogManager + } + + fun showLoadingDialog(message: String) { + loadingDialog = QMUITipDialog + .Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } + } + + fun dismissLoadingDialog() { + if (loadingDialog.isShowing) { + loadingDialog.dismiss() + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index adadca0..d34aaa9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -14,7 +14,7 @@ import com.bumptech.glide.request.RequestOptions import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -28,6 +28,7 @@ class AlarmDetailActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var aMap: AMap private lateinit var alarmViewModel: AlarmViewModel @@ -43,7 +44,7 @@ override fun initData() { val id = intent.getStringExtra(Constant.INTENT_PARAM)!! - + dialogManager = DialogManager.obtainInstance(this) aMap = mapView.map aMap.mapType = AMap.MAP_TYPE_NORMAL @@ -93,12 +94,8 @@ alarmViewModel.loadState.observe(this, { when (it) { - LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后...") - } - else -> { - DialogHelper.dismissLoadingDialog() - } + LoadState.Loading -> dialogManager.showLoadingDialog("数据加载中，请稍后...") + else -> dialogManager.dismissLoadingDialog() } }) } diff --git a/app/OperationSite.jks b/app/OperationSite.jks new file mode 100644 index 0000000..f2b7f34 --- /dev/null +++ b/app/OperationSite.jks Binary files differ diff --git a/app/build.gradle b/app/build.gradle index cce9aa8..036561c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,14 @@ apply plugin: 'kotlin-android-extensions' android { + signingConfigs { + release { + storeFile file('/Users/a203/Desktop/AndroidProjects/OperationSite/app/OperationSite.jks') + storePassword '123456789' + keyAlias 'key0' + keyPassword '123456789' + } + } compileSdkVersion 31 buildToolsVersion "30.0.3" diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt deleted file mode 100644 index 751d8ce..0000000 --- a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.br.operationsite.utils; - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object DialogHelper { - private lateinit var loadingDialog: QMUITipDialog - - fun showLoadingDialog(activity: Activity, message: String?) { - loadingDialog = QMUITipDialog.Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismissLoadingDialog() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt new file mode 100644 index 0000000..a5f3660 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt @@ -0,0 +1,37 @@ +package com.casic.br.operationsite.utils; + +import android.app.Activity +import android.view.WindowManager +import com.pengxh.kt.lite.base.BaseSingleton +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog + +class DialogManager private constructor(private val activity: Activity) { + + private lateinit var loadingDialog: QMUITipDialog + + companion object : BaseSingleton() { + override val creator: (Activity) -> DialogManager + get() = ::DialogManager + } + + fun showLoadingDialog(message: String) { + loadingDialog = QMUITipDialog + .Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } + } + + fun dismissLoadingDialog() { + if (loadingDialog.isShowing) { + loadingDialog.dismiss() + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index adadca0..d34aaa9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -14,7 +14,7 @@ import com.bumptech.glide.request.RequestOptions import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -28,6 +28,7 @@ class AlarmDetailActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var aMap: AMap private lateinit var alarmViewModel: AlarmViewModel @@ -43,7 +44,7 @@ override fun initData() { val id = intent.getStringExtra(Constant.INTENT_PARAM)!! - + dialogManager = DialogManager.obtainInstance(this) aMap = mapView.map aMap.mapType = AMap.MAP_TYPE_NORMAL @@ -93,12 +94,8 @@ alarmViewModel.loadState.observe(this, { when (it) { - LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后...") - } - else -> { - DialogHelper.dismissLoadingDialog() - } + LoadState.Loading -> dialogManager.showLoadingDialog("数据加载中，请稍后...") + else -> dialogManager.dismissLoadingDialog() } }) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 0e5be23..ea961a9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -9,7 +9,7 @@ import com.casic.br.operationsite.adapter.AlarmListAdapter import com.casic.br.operationsite.extensions.showEmptyPage import com.casic.br.operationsite.model.AlarmListModel -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -25,6 +25,7 @@ class AlarmListActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var alarmListAdapter: AlarmListAdapter private lateinit var alarmViewModel: AlarmViewModel @@ -49,6 +50,7 @@ } override fun initData() { + dialogManager = DialogManager.obtainInstance(this) weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) } @@ -101,10 +103,10 @@ if (!isLoadMore && !isRefresh) { when (it) { is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + dialogManager.showLoadingDialog("数据加载中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } } diff --git a/app/OperationSite.jks b/app/OperationSite.jks new file mode 100644 index 0000000..f2b7f34 --- /dev/null +++ b/app/OperationSite.jks Binary files differ diff --git a/app/build.gradle b/app/build.gradle index cce9aa8..036561c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,14 @@ apply plugin: 'kotlin-android-extensions' android { + signingConfigs { + release { + storeFile file('/Users/a203/Desktop/AndroidProjects/OperationSite/app/OperationSite.jks') + storePassword '123456789' + keyAlias 'key0' + keyPassword '123456789' + } + } compileSdkVersion 31 buildToolsVersion "30.0.3" diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt deleted file mode 100644 index 751d8ce..0000000 --- a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.br.operationsite.utils; - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object DialogHelper { - private lateinit var loadingDialog: QMUITipDialog - - fun showLoadingDialog(activity: Activity, message: String?) { - loadingDialog = QMUITipDialog.Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismissLoadingDialog() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt new file mode 100644 index 0000000..a5f3660 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt @@ -0,0 +1,37 @@ +package com.casic.br.operationsite.utils; + +import android.app.Activity +import android.view.WindowManager +import com.pengxh.kt.lite.base.BaseSingleton +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog + +class DialogManager private constructor(private val activity: Activity) { + + private lateinit var loadingDialog: QMUITipDialog + + companion object : BaseSingleton() { + override val creator: (Activity) -> DialogManager + get() = ::DialogManager + } + + fun showLoadingDialog(message: String) { + loadingDialog = QMUITipDialog + .Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } + } + + fun dismissLoadingDialog() { + if (loadingDialog.isShowing) { + loadingDialog.dismiss() + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index adadca0..d34aaa9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -14,7 +14,7 @@ import com.bumptech.glide.request.RequestOptions import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -28,6 +28,7 @@ class AlarmDetailActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var aMap: AMap private lateinit var alarmViewModel: AlarmViewModel @@ -43,7 +44,7 @@ override fun initData() { val id = intent.getStringExtra(Constant.INTENT_PARAM)!! - + dialogManager = DialogManager.obtainInstance(this) aMap = mapView.map aMap.mapType = AMap.MAP_TYPE_NORMAL @@ -93,12 +94,8 @@ alarmViewModel.loadState.observe(this, { when (it) { - LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后...") - } - else -> { - DialogHelper.dismissLoadingDialog() - } + LoadState.Loading -> dialogManager.showLoadingDialog("数据加载中，请稍后...") + else -> dialogManager.dismissLoadingDialog() } }) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 0e5be23..ea961a9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -9,7 +9,7 @@ import com.casic.br.operationsite.adapter.AlarmListAdapter import com.casic.br.operationsite.extensions.showEmptyPage import com.casic.br.operationsite.model.AlarmListModel -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -25,6 +25,7 @@ class AlarmListActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var alarmListAdapter: AlarmListAdapter private lateinit var alarmViewModel: AlarmViewModel @@ -49,6 +50,7 @@ } override fun initData() { + dialogManager = DialogManager.obtainInstance(this) weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) } @@ -101,10 +103,10 @@ if (!isLoadMore && !isRefresh) { when (it) { is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + dialogManager.showLoadingDialog("数据加载中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index d5ec7aa..f30c048 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -12,7 +12,7 @@ import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.extensions.compressImage import com.casic.br.operationsite.extensions.reformat -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.vm.ApplyViewModel import com.casic.br.operationsite.vm.UploadFileViewModel @@ -36,6 +36,7 @@ class ApplyEnterActivity : KotlinBaseActivity() { private val kTag = "ApplyEnterActivity" + private lateinit var dialogManager: DialogManager private lateinit var imageAdapter: EditableImageAdapter private lateinit var uploadFileViewModel: UploadFileViewModel private lateinit var applyViewModel: ApplyViewModel @@ -54,6 +55,7 @@ } override fun initData() { + dialogManager = DialogManager.obtainInstance(this) uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java) applyViewModel = ViewModelProvider(this).get(ApplyViewModel::class.java) @@ -145,7 +147,7 @@ } }) uploadFileViewModel.loadState.observe(this, { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() }) confirmApplyButton.setOnClickListener { @@ -189,10 +191,10 @@ applyViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "申请中，请稍后") + dialogManager.showLoadingDialog("申请中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) diff --git a/app/OperationSite.jks b/app/OperationSite.jks new file mode 100644 index 0000000..f2b7f34 --- /dev/null +++ b/app/OperationSite.jks Binary files differ diff --git a/app/build.gradle b/app/build.gradle index cce9aa8..036561c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,14 @@ apply plugin: 'kotlin-android-extensions' android { + signingConfigs { + release { + storeFile file('/Users/a203/Desktop/AndroidProjects/OperationSite/app/OperationSite.jks') + storePassword '123456789' + keyAlias 'key0' + keyPassword '123456789' + } + } compileSdkVersion 31 buildToolsVersion "30.0.3" diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt deleted file mode 100644 index 751d8ce..0000000 --- a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.br.operationsite.utils; - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object DialogHelper { - private lateinit var loadingDialog: QMUITipDialog - - fun showLoadingDialog(activity: Activity, message: String?) { - loadingDialog = QMUITipDialog.Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismissLoadingDialog() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt new file mode 100644 index 0000000..a5f3660 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt @@ -0,0 +1,37 @@ +package com.casic.br.operationsite.utils; + +import android.app.Activity +import android.view.WindowManager +import com.pengxh.kt.lite.base.BaseSingleton +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog + +class DialogManager private constructor(private val activity: Activity) { + + private lateinit var loadingDialog: QMUITipDialog + + companion object : BaseSingleton() { + override val creator: (Activity) -> DialogManager + get() = ::DialogManager + } + + fun showLoadingDialog(message: String) { + loadingDialog = QMUITipDialog + .Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } + } + + fun dismissLoadingDialog() { + if (loadingDialog.isShowing) { + loadingDialog.dismiss() + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index adadca0..d34aaa9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -14,7 +14,7 @@ import com.bumptech.glide.request.RequestOptions import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -28,6 +28,7 @@ class AlarmDetailActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var aMap: AMap private lateinit var alarmViewModel: AlarmViewModel @@ -43,7 +44,7 @@ override fun initData() { val id = intent.getStringExtra(Constant.INTENT_PARAM)!! - + dialogManager = DialogManager.obtainInstance(this) aMap = mapView.map aMap.mapType = AMap.MAP_TYPE_NORMAL @@ -93,12 +94,8 @@ alarmViewModel.loadState.observe(this, { when (it) { - LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后...") - } - else -> { - DialogHelper.dismissLoadingDialog() - } + LoadState.Loading -> dialogManager.showLoadingDialog("数据加载中，请稍后...") + else -> dialogManager.dismissLoadingDialog() } }) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 0e5be23..ea961a9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -9,7 +9,7 @@ import com.casic.br.operationsite.adapter.AlarmListAdapter import com.casic.br.operationsite.extensions.showEmptyPage import com.casic.br.operationsite.model.AlarmListModel -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -25,6 +25,7 @@ class AlarmListActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var alarmListAdapter: AlarmListAdapter private lateinit var alarmViewModel: AlarmViewModel @@ -49,6 +50,7 @@ } override fun initData() { + dialogManager = DialogManager.obtainInstance(this) weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) } @@ -101,10 +103,10 @@ if (!isLoadMore && !isRefresh) { when (it) { is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + dialogManager.showLoadingDialog("数据加载中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index d5ec7aa..f30c048 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -12,7 +12,7 @@ import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.extensions.compressImage import com.casic.br.operationsite.extensions.reformat -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.vm.ApplyViewModel import com.casic.br.operationsite.vm.UploadFileViewModel @@ -36,6 +36,7 @@ class ApplyEnterActivity : KotlinBaseActivity() { private val kTag = "ApplyEnterActivity" + private lateinit var dialogManager: DialogManager private lateinit var imageAdapter: EditableImageAdapter private lateinit var uploadFileViewModel: UploadFileViewModel private lateinit var applyViewModel: ApplyViewModel @@ -54,6 +55,7 @@ } override fun initData() { + dialogManager = DialogManager.obtainInstance(this) uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java) applyViewModel = ViewModelProvider(this).get(ApplyViewModel::class.java) @@ -145,7 +147,7 @@ } }) uploadFileViewModel.loadState.observe(this, { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() }) confirmApplyButton.setOnClickListener { @@ -189,10 +191,10 @@ applyViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "申请中，请稍后") + dialogManager.showLoadingDialog("申请中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) diff --git a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt index 5e77c17..c3c5cd9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.utils.AuthenticationHelper -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.RSAUtils import com.casic.br.operationsite.vm.AuthenticateViewModel @@ -21,6 +21,7 @@ class LoginActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel private lateinit var userDetailViewModel: UserDetailViewModel @@ -36,6 +37,7 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) + dialogManager = DialogManager.obtainInstance(this) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) @@ -87,10 +89,10 @@ loginViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "登录中，请稍后...") + dialogManager.showLoadingDialog("登录中，请稍后...") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) diff --git a/app/OperationSite.jks b/app/OperationSite.jks new file mode 100644 index 0000000..f2b7f34 --- /dev/null +++ b/app/OperationSite.jks Binary files differ diff --git a/app/build.gradle b/app/build.gradle index cce9aa8..036561c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,14 @@ apply plugin: 'kotlin-android-extensions' android { + signingConfigs { + release { + storeFile file('/Users/a203/Desktop/AndroidProjects/OperationSite/app/OperationSite.jks') + storePassword '123456789' + keyAlias 'key0' + keyPassword '123456789' + } + } compileSdkVersion 31 buildToolsVersion "30.0.3" diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt deleted file mode 100644 index 751d8ce..0000000 --- a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.br.operationsite.utils; - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object DialogHelper { - private lateinit var loadingDialog: QMUITipDialog - - fun showLoadingDialog(activity: Activity, message: String?) { - loadingDialog = QMUITipDialog.Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismissLoadingDialog() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt new file mode 100644 index 0000000..a5f3660 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt @@ -0,0 +1,37 @@ +package com.casic.br.operationsite.utils; + +import android.app.Activity +import android.view.WindowManager +import com.pengxh.kt.lite.base.BaseSingleton +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog + +class DialogManager private constructor(private val activity: Activity) { + + private lateinit var loadingDialog: QMUITipDialog + + companion object : BaseSingleton() { + override val creator: (Activity) -> DialogManager + get() = ::DialogManager + } + + fun showLoadingDialog(message: String) { + loadingDialog = QMUITipDialog + .Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } + } + + fun dismissLoadingDialog() { + if (loadingDialog.isShowing) { + loadingDialog.dismiss() + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index adadca0..d34aaa9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -14,7 +14,7 @@ import com.bumptech.glide.request.RequestOptions import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -28,6 +28,7 @@ class AlarmDetailActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var aMap: AMap private lateinit var alarmViewModel: AlarmViewModel @@ -43,7 +44,7 @@ override fun initData() { val id = intent.getStringExtra(Constant.INTENT_PARAM)!! - + dialogManager = DialogManager.obtainInstance(this) aMap = mapView.map aMap.mapType = AMap.MAP_TYPE_NORMAL @@ -93,12 +94,8 @@ alarmViewModel.loadState.observe(this, { when (it) { - LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后...") - } - else -> { - DialogHelper.dismissLoadingDialog() - } + LoadState.Loading -> dialogManager.showLoadingDialog("数据加载中，请稍后...") + else -> dialogManager.dismissLoadingDialog() } }) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 0e5be23..ea961a9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -9,7 +9,7 @@ import com.casic.br.operationsite.adapter.AlarmListAdapter import com.casic.br.operationsite.extensions.showEmptyPage import com.casic.br.operationsite.model.AlarmListModel -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -25,6 +25,7 @@ class AlarmListActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var alarmListAdapter: AlarmListAdapter private lateinit var alarmViewModel: AlarmViewModel @@ -49,6 +50,7 @@ } override fun initData() { + dialogManager = DialogManager.obtainInstance(this) weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) } @@ -101,10 +103,10 @@ if (!isLoadMore && !isRefresh) { when (it) { is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + dialogManager.showLoadingDialog("数据加载中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index d5ec7aa..f30c048 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -12,7 +12,7 @@ import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.extensions.compressImage import com.casic.br.operationsite.extensions.reformat -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.vm.ApplyViewModel import com.casic.br.operationsite.vm.UploadFileViewModel @@ -36,6 +36,7 @@ class ApplyEnterActivity : KotlinBaseActivity() { private val kTag = "ApplyEnterActivity" + private lateinit var dialogManager: DialogManager private lateinit var imageAdapter: EditableImageAdapter private lateinit var uploadFileViewModel: UploadFileViewModel private lateinit var applyViewModel: ApplyViewModel @@ -54,6 +55,7 @@ } override fun initData() { + dialogManager = DialogManager.obtainInstance(this) uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java) applyViewModel = ViewModelProvider(this).get(ApplyViewModel::class.java) @@ -145,7 +147,7 @@ } }) uploadFileViewModel.loadState.observe(this, { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() }) confirmApplyButton.setOnClickListener { @@ -189,10 +191,10 @@ applyViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "申请中，请稍后") + dialogManager.showLoadingDialog("申请中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) diff --git a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt index 5e77c17..c3c5cd9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.utils.AuthenticationHelper -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.RSAUtils import com.casic.br.operationsite.vm.AuthenticateViewModel @@ -21,6 +21,7 @@ class LoginActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel private lateinit var userDetailViewModel: UserDetailViewModel @@ -36,6 +37,7 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) + dialogManager = DialogManager.obtainInstance(this) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) @@ -87,10 +89,10 @@ loginViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "登录中，请稍后...") + dialogManager.showLoadingDialog("登录中，请稍后...") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 3e629e4..9bac3a8 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -17,7 +17,7 @@ import com.casic.br.operationsite.extensions.compressImage import com.casic.br.operationsite.extensions.reformat import com.casic.br.operationsite.model.UserDetailModel -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.utils.GlideLoadEngine import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.LocationHelper @@ -45,6 +45,7 @@ class UploadEventActivity : KotlinBaseActivity() { private val kTag = "UploadEventActivity" + private lateinit var dialogManager: DialogManager private lateinit var imageAdapter: EditableImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var uploadFileViewModel: UploadFileViewModel @@ -75,6 +76,7 @@ personNumberView.text = userDetail.phone } + dialogManager = DialogManager.obtainInstance(this) weakReferenceHandler = WeakReferenceHandler(callback) uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java) eventViewModel = ViewModelProvider(this).get(EventViewModel::class.java) @@ -128,10 +130,10 @@ uploadFileViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + dialogManager.showLoadingDialog("图片上传中，请稍后...") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) @@ -189,10 +191,10 @@ eventViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "事件提交中，请稍后") + dialogManager.showLoadingDialog("事件提交中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) diff --git a/app/OperationSite.jks b/app/OperationSite.jks new file mode 100644 index 0000000..f2b7f34 --- /dev/null +++ b/app/OperationSite.jks Binary files differ diff --git a/app/build.gradle b/app/build.gradle index cce9aa8..036561c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,6 +3,14 @@ apply plugin: 'kotlin-android-extensions' android { + signingConfigs { + release { + storeFile file('/Users/a203/Desktop/AndroidProjects/OperationSite/app/OperationSite.jks') + storePassword '123456789' + keyAlias 'key0' + keyPassword '123456789' + } + } compileSdkVersion 31 buildToolsVersion "30.0.3" diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt deleted file mode 100644 index 751d8ce..0000000 --- a/app/src/main/java/com/casic/br/operationsite/utils/DialogHelper.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.casic.br.operationsite.utils; - -import android.app.Activity -import android.view.WindowManager -import com.qmuiteam.qmui.widget.dialog.QMUITipDialog - -object DialogHelper { - private lateinit var loadingDialog: QMUITipDialog - - fun showLoadingDialog(activity: Activity, message: String?) { - loadingDialog = QMUITipDialog.Builder(activity) - .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) - .setTipWord(message) - .create() - if (!activity.isDestroyed) { - try { - loadingDialog.show() - } catch (e: WindowManager.BadTokenException) { - e.printStackTrace() - } - } - } - - fun dismissLoadingDialog() { - if (loadingDialog.isShowing) { - loadingDialog.dismiss() - } - } -} diff --git a/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt new file mode 100644 index 0000000..a5f3660 --- /dev/null +++ b/app/src/main/java/com/casic/br/operationsite/utils/DialogManager.kt @@ -0,0 +1,37 @@ +package com.casic.br.operationsite.utils; + +import android.app.Activity +import android.view.WindowManager +import com.pengxh.kt.lite.base.BaseSingleton +import com.qmuiteam.qmui.widget.dialog.QMUITipDialog + +class DialogManager private constructor(private val activity: Activity) { + + private lateinit var loadingDialog: QMUITipDialog + + companion object : BaseSingleton() { + override val creator: (Activity) -> DialogManager + get() = ::DialogManager + } + + fun showLoadingDialog(message: String) { + loadingDialog = QMUITipDialog + .Builder(activity) + .setIconType(QMUITipDialog.Builder.ICON_TYPE_LOADING) + .setTipWord(message) + .create() + if (!activity.isDestroyed) { + try { + loadingDialog.show() + } catch (e: WindowManager.BadTokenException) { + e.printStackTrace() + } + } + } + + fun dismissLoadingDialog() { + if (loadingDialog.isShowing) { + loadingDialog.dismiss() + } + } +} diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt index adadca0..d34aaa9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmDetailActivity.kt @@ -14,7 +14,7 @@ import com.bumptech.glide.request.RequestOptions import com.casic.br.operationsite.R import com.casic.br.operationsite.extensions.combineImagePath -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -28,6 +28,7 @@ class AlarmDetailActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var aMap: AMap private lateinit var alarmViewModel: AlarmViewModel @@ -43,7 +44,7 @@ override fun initData() { val id = intent.getStringExtra(Constant.INTENT_PARAM)!! - + dialogManager = DialogManager.obtainInstance(this) aMap = mapView.map aMap.mapType = AMap.MAP_TYPE_NORMAL @@ -93,12 +94,8 @@ alarmViewModel.loadState.observe(this, { when (it) { - LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后...") - } - else -> { - DialogHelper.dismissLoadingDialog() - } + LoadState.Loading -> dialogManager.showLoadingDialog("数据加载中，请稍后...") + else -> dialogManager.dismissLoadingDialog() } }) } diff --git a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt index 0e5be23..ea961a9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/AlarmListActivity.kt @@ -9,7 +9,7 @@ import com.casic.br.operationsite.adapter.AlarmListAdapter import com.casic.br.operationsite.extensions.showEmptyPage import com.casic.br.operationsite.model.AlarmListModel -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.AlarmViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -25,6 +25,7 @@ class AlarmListActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var alarmListAdapter: AlarmListAdapter private lateinit var alarmViewModel: AlarmViewModel @@ -49,6 +50,7 @@ } override fun initData() { + dialogManager = DialogManager.obtainInstance(this) weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) } @@ -101,10 +103,10 @@ if (!isLoadMore && !isRefresh) { when (it) { is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后") + dialogManager.showLoadingDialog("数据加载中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } } diff --git a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt index d5ec7aa..f30c048 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ApplyEnterActivity.kt @@ -12,7 +12,7 @@ import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.extensions.compressImage import com.casic.br.operationsite.extensions.reformat -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.vm.ApplyViewModel import com.casic.br.operationsite.vm.UploadFileViewModel @@ -36,6 +36,7 @@ class ApplyEnterActivity : KotlinBaseActivity() { private val kTag = "ApplyEnterActivity" + private lateinit var dialogManager: DialogManager private lateinit var imageAdapter: EditableImageAdapter private lateinit var uploadFileViewModel: UploadFileViewModel private lateinit var applyViewModel: ApplyViewModel @@ -54,6 +55,7 @@ } override fun initData() { + dialogManager = DialogManager.obtainInstance(this) uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java) applyViewModel = ViewModelProvider(this).get(ApplyViewModel::class.java) @@ -145,7 +147,7 @@ } }) uploadFileViewModel.loadState.observe(this, { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() }) confirmApplyButton.setOnClickListener { @@ -189,10 +191,10 @@ applyViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "申请中，请稍后") + dialogManager.showLoadingDialog("申请中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) diff --git a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt index 5e77c17..c3c5cd9 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/LoginActivity.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.utils.AuthenticationHelper -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.RSAUtils import com.casic.br.operationsite.vm.AuthenticateViewModel @@ -21,6 +21,7 @@ class LoginActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var loginViewModel: LoginViewModel private lateinit var userDetailViewModel: UserDetailViewModel @@ -36,6 +37,7 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) + dialogManager = DialogManager.obtainInstance(this) authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) @@ -87,10 +89,10 @@ loginViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "登录中，请稍后...") + dialogManager.showLoadingDialog("登录中，请稍后...") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) diff --git a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt index 3e629e4..9bac3a8 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/UploadEventActivity.kt @@ -17,7 +17,7 @@ import com.casic.br.operationsite.extensions.compressImage import com.casic.br.operationsite.extensions.reformat import com.casic.br.operationsite.model.UserDetailModel -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.utils.GlideLoadEngine import com.casic.br.operationsite.utils.LocaleConstant import com.casic.br.operationsite.utils.LocationHelper @@ -45,6 +45,7 @@ class UploadEventActivity : KotlinBaseActivity() { private val kTag = "UploadEventActivity" + private lateinit var dialogManager: DialogManager private lateinit var imageAdapter: EditableImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var uploadFileViewModel: UploadFileViewModel @@ -75,6 +76,7 @@ personNumberView.text = userDetail.phone } + dialogManager = DialogManager.obtainInstance(this) weakReferenceHandler = WeakReferenceHandler(callback) uploadFileViewModel = ViewModelProvider(this).get(UploadFileViewModel::class.java) eventViewModel = ViewModelProvider(this).get(EventViewModel::class.java) @@ -128,10 +130,10 @@ uploadFileViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "图片上传中，请稍后...") + dialogManager.showLoadingDialog("图片上传中，请稍后...") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) @@ -189,10 +191,10 @@ eventViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "事件提交中，请稍后") + dialogManager.showLoadingDialog("事件提交中，请稍后") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } }) diff --git a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt index a3dd855..a9f0300 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/WorkSiteTabActivity.kt @@ -12,7 +12,7 @@ import com.amap.api.services.geocoder.RegeocodeQuery import com.amap.api.services.geocoder.RegeocodeResult import com.casic.br.operationsite.R -import com.casic.br.operationsite.utils.DialogHelper +import com.casic.br.operationsite.utils.DialogManager import com.casic.br.operationsite.vm.WorkSiteViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity @@ -29,6 +29,7 @@ class WorkSiteTabActivity : KotlinBaseActivity() { + private lateinit var dialogManager: DialogManager private lateinit var aMap: AMap private lateinit var workSiteViewModel: WorkSiteViewModel private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -46,6 +47,7 @@ override fun initData() { val id = intent.getStringExtra(Constant.INTENT_PARAM)!! + dialogManager = DialogManager.obtainInstance(this) /** * 地图初始化设置 @@ -118,10 +120,10 @@ workSiteViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "数据加载中，请稍后...") + dialogManager.showLoadingDialog("数据加载中，请稍后...") } else -> { - DialogHelper.dismissLoadingDialog() + dialogManager.dismissLoadingDialog() } } })