diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") 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 a8c460d..493180f 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 @@ -51,8 +51,9 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { if (!isLoadMore && !isRefresh) { when (it) { diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") 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 a8c460d..493180f 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 @@ -51,8 +51,9 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { if (!isLoadMore && !isRefresh) { when (it) { 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 5026c93..6561c14 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 @@ -60,21 +60,6 @@ imageAdapter = EditableImageAdapter(this, 1, 13f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - - //状态监听 - uploadFileViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - applyViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) } /** @@ -98,6 +83,22 @@ } } + override fun observeRequestState() { + uploadFileViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + + applyViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { genderView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") 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 a8c460d..493180f 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 @@ -51,8 +51,9 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { if (!isLoadMore && !isRefresh) { when (it) { 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 5026c93..6561c14 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 @@ -60,21 +60,6 @@ imageAdapter = EditableImageAdapter(this, 1, 13f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - - //状态监听 - uploadFileViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - applyViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) } /** @@ -98,6 +83,22 @@ } } + override fun observeRequestState() { + uploadFileViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + + applyViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { genderView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index fa4401d..f969350 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -30,6 +30,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") 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 a8c460d..493180f 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 @@ -51,8 +51,9 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { if (!isLoadMore && !isRefresh) { when (it) { 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 5026c93..6561c14 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 @@ -60,21 +60,6 @@ imageAdapter = EditableImageAdapter(this, 1, 13f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - - //状态监听 - uploadFileViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - applyViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) } /** @@ -98,6 +83,22 @@ } } + override fun observeRequestState() { + uploadFileViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + + applyViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { genderView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index fa4401d..f969350 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -30,6 +30,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) diff --git a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt index d744ba7..93dafb6 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt @@ -23,6 +23,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") 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 a8c460d..493180f 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 @@ -51,8 +51,9 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { if (!isLoadMore && !isRefresh) { when (it) { 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 5026c93..6561c14 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 @@ -60,21 +60,6 @@ imageAdapter = EditableImageAdapter(this, 1, 13f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - - //状态监听 - uploadFileViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - applyViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) } /** @@ -98,6 +83,22 @@ } } + override fun observeRequestState() { + uploadFileViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + + applyViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { genderView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index fa4401d..f969350 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -30,6 +30,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) diff --git a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt index d744ba7..93dafb6 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt @@ -23,6 +23,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 915c9b8..ae21c22 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -207,6 +207,10 @@ true } + override fun observeRequestState() { + + } + override fun initEvent() { } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") 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 a8c460d..493180f 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 @@ -51,8 +51,9 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { if (!isLoadMore && !isRefresh) { when (it) { 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 5026c93..6561c14 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 @@ -60,21 +60,6 @@ imageAdapter = EditableImageAdapter(this, 1, 13f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - - //状态监听 - uploadFileViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - applyViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) } /** @@ -98,6 +83,22 @@ } } + override fun observeRequestState() { + uploadFileViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + + applyViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { genderView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index fa4401d..f969350 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -30,6 +30,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) diff --git a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt index d744ba7..93dafb6 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt @@ -23,6 +23,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 915c9b8..ae21c22 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -207,6 +207,10 @@ true } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 d3d5f72..557f92f 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 @@ -36,8 +36,9 @@ authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { loginViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Loading -> LoadingDialogHub.show(this, "登录中,请稍后...") diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") 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 a8c460d..493180f 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 @@ -51,8 +51,9 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { if (!isLoadMore && !isRefresh) { when (it) { 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 5026c93..6561c14 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 @@ -60,21 +60,6 @@ imageAdapter = EditableImageAdapter(this, 1, 13f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - - //状态监听 - uploadFileViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - applyViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) } /** @@ -98,6 +83,22 @@ } } + override fun observeRequestState() { + uploadFileViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + + applyViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { genderView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index fa4401d..f969350 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -30,6 +30,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) diff --git a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt index d744ba7..93dafb6 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt @@ -23,6 +23,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 915c9b8..ae21c22 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -207,6 +207,10 @@ true } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 d3d5f72..557f92f 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 @@ -36,8 +36,9 @@ authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { loginViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Loading -> LoadingDialogHub.show(this, "登录中,请稍后...") diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 18b1b0a..bc9cb46 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -57,6 +57,10 @@ segmentedGroup.check(segmentedGroup.getChildAt(1).id) } + override fun observeRequestState() { + + } + override fun initEvent() { segmentedGroup.setOnCheckedChangeListener { _, checkedId -> when (checkedId) { diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") 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 a8c460d..493180f 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 @@ -51,8 +51,9 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { if (!isLoadMore && !isRefresh) { when (it) { 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 5026c93..6561c14 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 @@ -60,21 +60,6 @@ imageAdapter = EditableImageAdapter(this, 1, 13f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - - //状态监听 - uploadFileViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - applyViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) } /** @@ -98,6 +83,22 @@ } } + override fun observeRequestState() { + uploadFileViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + + applyViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { genderView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index fa4401d..f969350 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -30,6 +30,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) diff --git a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt index d744ba7..93dafb6 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt @@ -23,6 +23,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 915c9b8..ae21c22 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -207,6 +207,10 @@ true } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 d3d5f72..557f92f 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 @@ -36,8 +36,9 @@ authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { loginViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Loading -> LoadingDialogHub.show(this, "登录中,请稍后...") diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 18b1b0a..bc9cb46 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -57,6 +57,10 @@ segmentedGroup.check(segmentedGroup.getChildAt(1).id) } + override fun observeRequestState() { + + } + override fun initEvent() { segmentedGroup.setOnCheckedChangeListener { _, checkedId -> when (checkedId) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt index 1a26adc..0d9b80c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt @@ -23,6 +23,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") 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 a8c460d..493180f 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 @@ -51,8 +51,9 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { if (!isLoadMore && !isRefresh) { when (it) { 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 5026c93..6561c14 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 @@ -60,21 +60,6 @@ imageAdapter = EditableImageAdapter(this, 1, 13f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - - //状态监听 - uploadFileViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - applyViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) } /** @@ -98,6 +83,22 @@ } } + override fun observeRequestState() { + uploadFileViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + + applyViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { genderView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index fa4401d..f969350 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -30,6 +30,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) diff --git a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt index d744ba7..93dafb6 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt @@ -23,6 +23,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 915c9b8..ae21c22 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -207,6 +207,10 @@ true } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 d3d5f72..557f92f 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 @@ -36,8 +36,9 @@ authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { loginViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Loading -> LoadingDialogHub.show(this, "登录中,请稍后...") diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 18b1b0a..bc9cb46 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -57,6 +57,10 @@ segmentedGroup.check(segmentedGroup.getChildAt(1).id) } + override fun observeRequestState() { + + } + override fun initEvent() { segmentedGroup.setOnCheckedChangeListener { _, checkedId -> when (checkedId) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt index 1a26adc..0d9b80c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt @@ -23,6 +23,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } 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 ce81c29..0dd9ebb 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 @@ -76,8 +76,14 @@ imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + } - //状态监听 + override fun onResume() { + obtainCurrentLocation() + super.onResume() + } + + override fun observeRequestState() { uploadFileViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") @@ -93,11 +99,6 @@ }) } - override fun onResume() { - obtainCurrentLocation() - super.onResume() - } - override fun initEvent() { locationImageView.setOnClickListener { obtainCurrentLocation() } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 95567db..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 7a6068d..03b76c0 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { completedRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 0d8b51a..e8c4bcd 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -67,6 +67,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { notStartRefreshLayout.setOnRefreshListener { isRefresh = true diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 791dfd4..7f346be 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -68,6 +68,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { workingRefreshLayout.setOnRefreshListener { isRefresh = true 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 b597afa..bd0a12f 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 @@ -57,8 +57,9 @@ * 数据初始化 * */ alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...") 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 a8c460d..493180f 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 @@ -51,8 +51,9 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { alarmViewModel.loadState.observe(this, { if (!isLoadMore && !isRefresh) { when (it) { 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 5026c93..6561c14 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 @@ -60,21 +60,6 @@ imageAdapter = EditableImageAdapter(this, 1, 13f) addImageRecyclerView.layoutManager = GridLayoutManager(this, 3) addImageRecyclerView.adapter = imageAdapter - - //状态监听 - uploadFileViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - applyViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) } /** @@ -98,6 +83,22 @@ } } + override fun observeRequestState() { + uploadFileViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + + applyViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "申请中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { genderView.setOnClickListener { BottomActionSheet.Builder() diff --git a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt index fa4401d..f969350 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/BigImageActivity.kt @@ -30,6 +30,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { val index: Int = intent.getIntExtra(Constant.BIG_IMAGE_INTENT_INDEX_KEY, 0) val urls = intent.getStringArrayListExtra(Constant.BIG_IMAGE_INTENT_DATA_KEY) diff --git a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt index d744ba7..93dafb6 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/ElectricFenceActivity.kt @@ -23,6 +23,10 @@ } + override fun observeRequestState() { + + } + override fun initEvent() { } diff --git a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt index 915c9b8..ae21c22 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/FaceDetectActivity.kt @@ -207,6 +207,10 @@ true } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 d3d5f72..557f92f 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 @@ -36,8 +36,9 @@ authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { loginViewModel.loadState.observe(this, { loginState -> when (loginState) { is LoadState.Loading -> LoadingDialogHub.show(this, "登录中,请稍后...") diff --git a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt index 18b1b0a..bc9cb46 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/MainActivity.kt @@ -57,6 +57,10 @@ segmentedGroup.check(segmentedGroup.getChildAt(1).id) } + override fun observeRequestState() { + + } + override fun initEvent() { segmentedGroup.setOnCheckedChangeListener { _, checkedId -> when (checkedId) { diff --git a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt index 1a26adc..0d9b80c 100644 --- a/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/br/operationsite/view/SplashScreenActivity.kt @@ -23,6 +23,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserDetailViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } 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 ce81c29..0dd9ebb 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 @@ -76,8 +76,14 @@ imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter + } - //状态监听 + override fun onResume() { + obtainCurrentLocation() + super.onResume() + } + + override fun observeRequestState() { uploadFileViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") @@ -93,11 +99,6 @@ }) } - override fun onResume() { - obtainCurrentLocation() - super.onResume() - } - override fun initEvent() { locationImageView.setOnClickListener { obtainCurrentLocation() } 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 fce8f4f..e9baf29 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 @@ -63,8 +63,9 @@ * 数据初始化 * */ workSiteViewModel = ViewModelProvider(this).get(WorkSiteViewModel::class.java) + } - //状态监听 + override fun observeRequestState() { workSiteViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后...")