diff --git a/app/build.gradle b/app/build.gradle index 8c3c54d..591d39c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,13 +21,13 @@ applicationId "com.casic.xz.meterage" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 2 + versionName "1.0.0.1" manifestPlaceholders = [GETUI_APPID: "RoW3b4QCWH9EnYYiyaUJz5"] ndk { - abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64' + abiFilters 'armeabi-v7a', "arm64-v8a" } } diff --git a/app/build.gradle b/app/build.gradle index 8c3c54d..591d39c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,13 +21,13 @@ applicationId "com.casic.xz.meterage" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 2 + versionName "1.0.0.1" manifestPlaceholders = [GETUI_APPID: "RoW3b4QCWH9EnYYiyaUJz5"] ndk { - abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64' + abiFilters 'armeabi-v7a', "arm64-v8a" } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 5386346..c83ec93 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -6,10 +6,8 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile -import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_device_base_info.* @@ -84,12 +82,7 @@ override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - } + } override fun setupTopBarLayout() { diff --git a/app/build.gradle b/app/build.gradle index 8c3c54d..591d39c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,13 +21,13 @@ applicationId "com.casic.xz.meterage" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 2 + versionName "1.0.0.1" manifestPlaceholders = [GETUI_APPID: "RoW3b4QCWH9EnYYiyaUJz5"] ndk { - abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64' + abiFilters 'armeabi-v7a', "arm64-v8a" } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 5386346..c83ec93 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -6,10 +6,8 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile -import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_device_base_info.* @@ -84,12 +82,7 @@ override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - } + } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cba2114..f760fb7 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -6,10 +6,8 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile -import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_equipment_base_info.* @@ -104,12 +102,7 @@ override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - } + } override fun setupTopBarLayout() { diff --git a/app/build.gradle b/app/build.gradle index 8c3c54d..591d39c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,13 +21,13 @@ applicationId "com.casic.xz.meterage" minSdkVersion 23 targetSdkVersion 31 - versionCode 1 - versionName "1.0.0.0" + versionCode 2 + versionName "1.0.0.1" manifestPlaceholders = [GETUI_APPID: "RoW3b4QCWH9EnYYiyaUJz5"] ndk { - abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a', 'x86_64' + abiFilters 'armeabi-v7a', "arm64-v8a" } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 5386346..c83ec93 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -6,10 +6,8 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile -import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_device_base_info.* @@ -84,12 +82,7 @@ override fun initLayoutView(): Int = R.layout.fragment_device_base_info override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - } + } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cba2114..f760fb7 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -6,10 +6,8 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.extensions.formatToYearMonthDay import com.casic.xz.meterage.extensions.watchAttachFile -import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.vm.LoadState import com.pengxh.kt.lite.widget.dialog.BottomActionSheet import kotlinx.android.synthetic.main.fragment_equipment_base_info.* @@ -104,12 +102,7 @@ override fun initLayoutView(): Int = R.layout.fragment_equipment_base_info override fun observeRequestState() { - equipmentViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - } + } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 5d07147..b8455c5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -2,10 +2,8 @@ import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.MeterageTrainViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.vm.LoadState import kotlinx.android.synthetic.main.fragment_train_base_info.* class BasicInformationFragment(private val id: String) : KotlinBaseFragment() { @@ -42,12 +40,7 @@ override fun initLayoutView(): Int = R.layout.fragment_train_base_info override fun observeRequestState() { - trainViewModel.loadState.observe(this) { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - } + } override fun setupTopBarLayout() {