diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index 9e5204d..5a451da 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -148,7 +148,7 @@ } } - deviceViewModel.historyDataModel.observe(this) { + deviceViewModel.historyDataData.observe(this) { if (it.code == 200) { val xAxisLabels = ArrayList() //每个entries都是一条折线 diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index 9e5204d..5a451da 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -148,7 +148,7 @@ } } - deviceViewModel.historyDataModel.observe(this) { + deviceViewModel.historyDataData.observe(this) { if (it.code == 200) { val xAxisLabels = ArrayList() //每个entries都是一条折线 diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt index b854dee..4e0f80f 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -70,7 +70,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.getPublicKey(this) } - authenticateViewModel.keyModel.observe(this) { + authenticateViewModel.keyData.observe(this) { if (it.code == 200) {//用code判断，别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -85,7 +85,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 loginViewModel.enter(context, it.data!!.sid!!, account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this) { loginResult -> + loginViewModel.enterResultData.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) /** diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index 9e5204d..5a451da 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -148,7 +148,7 @@ } } - deviceViewModel.historyDataModel.observe(this) { + deviceViewModel.historyDataData.observe(this) { if (it.code == 200) { val xAxisLabels = ArrayList() //每个entries都是一条折线 diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt index b854dee..4e0f80f 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -70,7 +70,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.getPublicKey(this) } - authenticateViewModel.keyModel.observe(this) { + authenticateViewModel.keyData.observe(this) { if (it.code == 200) {//用code判断，别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -85,7 +85,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 loginViewModel.enter(context, it.data!!.sid!!, account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this) { loginResult -> + loginViewModel.enterResultData.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) /** diff --git a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt index 50eced4..2611a12 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -25,7 +25,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserViewModel::class.java] - userDetailViewModel.userDetailModel.observe(this) { + userDetailViewModel.userDetailData.observe(this) { if (it.code == 200) { navigatePageTo() } else { diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index 9e5204d..5a451da 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -148,7 +148,7 @@ } } - deviceViewModel.historyDataModel.observe(this) { + deviceViewModel.historyDataData.observe(this) { if (it.code == 200) { val xAxisLabels = ArrayList() //每个entries都是一条折线 diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt index b854dee..4e0f80f 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -70,7 +70,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.getPublicKey(this) } - authenticateViewModel.keyModel.observe(this) { + authenticateViewModel.keyData.observe(this) { if (it.code == 200) {//用code判断，别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -85,7 +85,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 loginViewModel.enter(context, it.data!!.sid!!, account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this) { loginResult -> + loginViewModel.enterResultData.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) /** diff --git a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt index 50eced4..2611a12 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -25,7 +25,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserViewModel::class.java] - userDetailViewModel.userDetailModel.observe(this) { + userDetailViewModel.userDetailData.observe(this) { if (it.code == 200) { navigatePageTo() } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt index 6127c1b..381beaf 100644 --- a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt @@ -19,17 +19,17 @@ class AuthenticateViewModel : BaseViewModel() { private val gson = Gson() - val keyModel = MutableLiveData() - val areaModel = MutableLiveData() - val districtModel = MutableLiveData() - val streetModel = MutableLiveData() + val keyData = MutableLiveData() + val areaData = MutableLiveData() + val districtData = MutableLiveData() + val streetData = MutableLiveData() fun getPublicKey(context: Context) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.authenticate() val responseCode = response.separateResponseCode() if (responseCode == 200) { - keyModel.value = gson.fromJson( + keyData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val response = RetrofitServiceManager.getAreaByDept(deptId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - areaModel.value = gson.fromJson( + areaData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -63,7 +63,7 @@ val response = RetrofitServiceManager.getDistrict(pid) val responseCode = response.separateResponseCode() if (responseCode == 200) { - districtModel.value = gson.fromJson( + districtData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getStreet(areaId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - streetModel.value = gson.fromJson( + streetData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index 9e5204d..5a451da 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -148,7 +148,7 @@ } } - deviceViewModel.historyDataModel.observe(this) { + deviceViewModel.historyDataData.observe(this) { if (it.code == 200) { val xAxisLabels = ArrayList() //每个entries都是一条折线 diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt index b854dee..4e0f80f 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -70,7 +70,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.getPublicKey(this) } - authenticateViewModel.keyModel.observe(this) { + authenticateViewModel.keyData.observe(this) { if (it.code == 200) {//用code判断，别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -85,7 +85,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 loginViewModel.enter(context, it.data!!.sid!!, account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this) { loginResult -> + loginViewModel.enterResultData.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) /** diff --git a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt index 50eced4..2611a12 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -25,7 +25,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserViewModel::class.java] - userDetailViewModel.userDetailModel.observe(this) { + userDetailViewModel.userDetailData.observe(this) { if (it.code == 200) { navigatePageTo() } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt index 6127c1b..381beaf 100644 --- a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt @@ -19,17 +19,17 @@ class AuthenticateViewModel : BaseViewModel() { private val gson = Gson() - val keyModel = MutableLiveData() - val areaModel = MutableLiveData() - val districtModel = MutableLiveData() - val streetModel = MutableLiveData() + val keyData = MutableLiveData() + val areaData = MutableLiveData() + val districtData = MutableLiveData() + val streetData = MutableLiveData() fun getPublicKey(context: Context) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.authenticate() val responseCode = response.separateResponseCode() if (responseCode == 200) { - keyModel.value = gson.fromJson( + keyData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val response = RetrofitServiceManager.getAreaByDept(deptId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - areaModel.value = gson.fromJson( + areaData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -63,7 +63,7 @@ val response = RetrofitServiceManager.getDistrict(pid) val responseCode = response.separateResponseCode() if (responseCode == 200) { - districtModel.value = gson.fromJson( + districtData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getStreet(areaId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - streetModel.value = gson.fromJson( + streetData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt index 66f235b..d1006c7 100644 --- a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt @@ -20,17 +20,17 @@ class DeviceViewModel : BaseViewModel() { private val gson = Gson() - val mapDeviceModel = MutableLiveData() - val deviceDetailModel = MutableLiveData() - val historyDataModel = MutableLiveData() - val lastDataModel = MutableLiveData() - val deleteResult = MutableLiveData() + val mapDeviceData = MutableLiveData() + val deviceDetailData = MutableLiveData() + val historyDataData = MutableLiveData() + val lastDataData = MutableLiveData() + val deleteResultData = MutableLiveData() fun getMapDeviceList(context: Context) = launch({ val response = RetrofitServiceManager.getMapDeviceList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - mapDeviceModel.value = gson.fromJson( + mapDeviceData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - deviceDetailModel.value = gson.fromJson( + deviceDetailData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -71,7 +71,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - historyDataModel.value = gson.fromJson( + historyDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -87,13 +87,13 @@ val response = RetrofitServiceManager.getTubeLastData(groupId, devcode) when (response.separateResponseCode()) { 200 -> { - lastDataModel.value = gson.fromJson( + lastDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } 500 -> { - lastDataModel.value = LastDataModel() + lastDataData.value = LastDataModel() } else -> { @@ -149,7 +149,7 @@ val response = RetrofitServiceManager.deleteDeviceById(ids) val responseCode = response.separateResponseCode() if (responseCode == 200) { - deleteResult.value = gson.fromJson( + deleteResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index 9e5204d..5a451da 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -148,7 +148,7 @@ } } - deviceViewModel.historyDataModel.observe(this) { + deviceViewModel.historyDataData.observe(this) { if (it.code == 200) { val xAxisLabels = ArrayList() //每个entries都是一条折线 diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt index b854dee..4e0f80f 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -70,7 +70,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.getPublicKey(this) } - authenticateViewModel.keyModel.observe(this) { + authenticateViewModel.keyData.observe(this) { if (it.code == 200) {//用code判断，别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -85,7 +85,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 loginViewModel.enter(context, it.data!!.sid!!, account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this) { loginResult -> + loginViewModel.enterResultData.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) /** diff --git a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt index 50eced4..2611a12 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -25,7 +25,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserViewModel::class.java] - userDetailViewModel.userDetailModel.observe(this) { + userDetailViewModel.userDetailData.observe(this) { if (it.code == 200) { navigatePageTo() } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt index 6127c1b..381beaf 100644 --- a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt @@ -19,17 +19,17 @@ class AuthenticateViewModel : BaseViewModel() { private val gson = Gson() - val keyModel = MutableLiveData() - val areaModel = MutableLiveData() - val districtModel = MutableLiveData() - val streetModel = MutableLiveData() + val keyData = MutableLiveData() + val areaData = MutableLiveData() + val districtData = MutableLiveData() + val streetData = MutableLiveData() fun getPublicKey(context: Context) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.authenticate() val responseCode = response.separateResponseCode() if (responseCode == 200) { - keyModel.value = gson.fromJson( + keyData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val response = RetrofitServiceManager.getAreaByDept(deptId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - areaModel.value = gson.fromJson( + areaData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -63,7 +63,7 @@ val response = RetrofitServiceManager.getDistrict(pid) val responseCode = response.separateResponseCode() if (responseCode == 200) { - districtModel.value = gson.fromJson( + districtData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getStreet(areaId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - streetModel.value = gson.fromJson( + streetData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt index 66f235b..d1006c7 100644 --- a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt @@ -20,17 +20,17 @@ class DeviceViewModel : BaseViewModel() { private val gson = Gson() - val mapDeviceModel = MutableLiveData() - val deviceDetailModel = MutableLiveData() - val historyDataModel = MutableLiveData() - val lastDataModel = MutableLiveData() - val deleteResult = MutableLiveData() + val mapDeviceData = MutableLiveData() + val deviceDetailData = MutableLiveData() + val historyDataData = MutableLiveData() + val lastDataData = MutableLiveData() + val deleteResultData = MutableLiveData() fun getMapDeviceList(context: Context) = launch({ val response = RetrofitServiceManager.getMapDeviceList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - mapDeviceModel.value = gson.fromJson( + mapDeviceData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - deviceDetailModel.value = gson.fromJson( + deviceDetailData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -71,7 +71,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - historyDataModel.value = gson.fromJson( + historyDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -87,13 +87,13 @@ val response = RetrofitServiceManager.getTubeLastData(groupId, devcode) when (response.separateResponseCode()) { 200 -> { - lastDataModel.value = gson.fromJson( + lastDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } 500 -> { - lastDataModel.value = LastDataModel() + lastDataData.value = LastDataModel() } else -> { @@ -149,7 +149,7 @@ val response = RetrofitServiceManager.deleteDeviceById(ids) val responseCode = response.separateResponseCode() if (responseCode == 200) { - deleteResult.value = gson.fromJson( + deleteResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt index 2632d37..12d953d 100644 --- a/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt @@ -17,8 +17,8 @@ class LoginViewModel : BaseViewModel() { private val gson = Gson() - val enterResultModel = MutableLiveData() - val outResultModel = MutableLiveData() + val enterResultData = MutableLiveData() + val outResultData = MutableLiveData() fun enter(context: Context, sid: String, account: String, secretKey: String) = launch({ val response = RetrofitServiceManager.login(sid, account, secretKey) @@ -26,7 +26,7 @@ if (responseCode == 200) { loadState.value = LoadState.Success "登录成功".show(context) - enterResultModel.value = gson.fromJson( + enterResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -42,7 +42,7 @@ val response = RetrofitServiceManager.loginOut() val responseCode = response.separateResponseCode() if (responseCode == 200) { - outResultModel.value = gson.fromJson( + outResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index 9e5204d..5a451da 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -148,7 +148,7 @@ } } - deviceViewModel.historyDataModel.observe(this) { + deviceViewModel.historyDataData.observe(this) { if (it.code == 200) { val xAxisLabels = ArrayList() //每个entries都是一条折线 diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt index b854dee..4e0f80f 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -70,7 +70,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.getPublicKey(this) } - authenticateViewModel.keyModel.observe(this) { + authenticateViewModel.keyData.observe(this) { if (it.code == 200) {//用code判断，别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -85,7 +85,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 loginViewModel.enter(context, it.data!!.sid!!, account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this) { loginResult -> + loginViewModel.enterResultData.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) /** diff --git a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt index 50eced4..2611a12 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -25,7 +25,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserViewModel::class.java] - userDetailViewModel.userDetailModel.observe(this) { + userDetailViewModel.userDetailData.observe(this) { if (it.code == 200) { navigatePageTo() } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt index 6127c1b..381beaf 100644 --- a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt @@ -19,17 +19,17 @@ class AuthenticateViewModel : BaseViewModel() { private val gson = Gson() - val keyModel = MutableLiveData() - val areaModel = MutableLiveData() - val districtModel = MutableLiveData() - val streetModel = MutableLiveData() + val keyData = MutableLiveData() + val areaData = MutableLiveData() + val districtData = MutableLiveData() + val streetData = MutableLiveData() fun getPublicKey(context: Context) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.authenticate() val responseCode = response.separateResponseCode() if (responseCode == 200) { - keyModel.value = gson.fromJson( + keyData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val response = RetrofitServiceManager.getAreaByDept(deptId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - areaModel.value = gson.fromJson( + areaData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -63,7 +63,7 @@ val response = RetrofitServiceManager.getDistrict(pid) val responseCode = response.separateResponseCode() if (responseCode == 200) { - districtModel.value = gson.fromJson( + districtData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getStreet(areaId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - streetModel.value = gson.fromJson( + streetData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt index 66f235b..d1006c7 100644 --- a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt @@ -20,17 +20,17 @@ class DeviceViewModel : BaseViewModel() { private val gson = Gson() - val mapDeviceModel = MutableLiveData() - val deviceDetailModel = MutableLiveData() - val historyDataModel = MutableLiveData() - val lastDataModel = MutableLiveData() - val deleteResult = MutableLiveData() + val mapDeviceData = MutableLiveData() + val deviceDetailData = MutableLiveData() + val historyDataData = MutableLiveData() + val lastDataData = MutableLiveData() + val deleteResultData = MutableLiveData() fun getMapDeviceList(context: Context) = launch({ val response = RetrofitServiceManager.getMapDeviceList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - mapDeviceModel.value = gson.fromJson( + mapDeviceData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - deviceDetailModel.value = gson.fromJson( + deviceDetailData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -71,7 +71,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - historyDataModel.value = gson.fromJson( + historyDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -87,13 +87,13 @@ val response = RetrofitServiceManager.getTubeLastData(groupId, devcode) when (response.separateResponseCode()) { 200 -> { - lastDataModel.value = gson.fromJson( + lastDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } 500 -> { - lastDataModel.value = LastDataModel() + lastDataData.value = LastDataModel() } else -> { @@ -149,7 +149,7 @@ val response = RetrofitServiceManager.deleteDeviceById(ids) val responseCode = response.separateResponseCode() if (responseCode == 200) { - deleteResult.value = gson.fromJson( + deleteResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt index 2632d37..12d953d 100644 --- a/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt @@ -17,8 +17,8 @@ class LoginViewModel : BaseViewModel() { private val gson = Gson() - val enterResultModel = MutableLiveData() - val outResultModel = MutableLiveData() + val enterResultData = MutableLiveData() + val outResultData = MutableLiveData() fun enter(context: Context, sid: String, account: String, secretKey: String) = launch({ val response = RetrofitServiceManager.login(sid, account, secretKey) @@ -26,7 +26,7 @@ if (responseCode == 200) { loadState.value = LoadState.Success "登录成功".show(context) - enterResultModel.value = gson.fromJson( + enterResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -42,7 +42,7 @@ val response = RetrofitServiceManager.loginOut() val responseCode = response.separateResponseCode() if (responseCode == 200) { - outResultModel.value = gson.fromJson( + outResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt index 6cbe323..a853a90 100644 --- a/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt @@ -20,17 +20,17 @@ class ProjectGroupViewModel : BaseViewModel() { private val gson = Gson() - val groupModel = MutableLiveData() - val groupDeviceModel = MutableLiveData() - val deviceListModel = MutableLiveData() - val groupListModel = MutableLiveData() - val changeGroupResult = MutableLiveData() + val groupData = MutableLiveData() + val groupDeviceData = MutableLiveData() + val deviceListData = MutableLiveData() + val groupListData = MutableLiveData() + val changeGroupResultData = MutableLiveData() fun getProGroupList(context: Context) = launch({ val response = RetrofitServiceManager.getProGroupList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - groupModel.value = gson.fromJson( + groupData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - groupDeviceModel.value = gson.fromJson( + groupDeviceData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -64,7 +64,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - deviceListModel.value = gson.fromJson( + deviceListData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getGroupList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - groupListModel.value = gson.fromJson( + groupListData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -94,7 +94,7 @@ val response = RetrofitServiceManager.changeGroupId(oldGroupId, newGroupId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - changeGroupResult.value = gson.fromJson( + changeGroupResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index 9e5204d..5a451da 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -148,7 +148,7 @@ } } - deviceViewModel.historyDataModel.observe(this) { + deviceViewModel.historyDataData.observe(this) { if (it.code == 200) { val xAxisLabels = ArrayList() //每个entries都是一条折线 diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt index b854dee..4e0f80f 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -70,7 +70,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.getPublicKey(this) } - authenticateViewModel.keyModel.observe(this) { + authenticateViewModel.keyData.observe(this) { if (it.code == 200) {//用code判断，别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -85,7 +85,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 loginViewModel.enter(context, it.data!!.sid!!, account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this) { loginResult -> + loginViewModel.enterResultData.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) /** diff --git a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt index 50eced4..2611a12 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -25,7 +25,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserViewModel::class.java] - userDetailViewModel.userDetailModel.observe(this) { + userDetailViewModel.userDetailData.observe(this) { if (it.code == 200) { navigatePageTo() } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt index 6127c1b..381beaf 100644 --- a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt @@ -19,17 +19,17 @@ class AuthenticateViewModel : BaseViewModel() { private val gson = Gson() - val keyModel = MutableLiveData() - val areaModel = MutableLiveData() - val districtModel = MutableLiveData() - val streetModel = MutableLiveData() + val keyData = MutableLiveData() + val areaData = MutableLiveData() + val districtData = MutableLiveData() + val streetData = MutableLiveData() fun getPublicKey(context: Context) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.authenticate() val responseCode = response.separateResponseCode() if (responseCode == 200) { - keyModel.value = gson.fromJson( + keyData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val response = RetrofitServiceManager.getAreaByDept(deptId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - areaModel.value = gson.fromJson( + areaData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -63,7 +63,7 @@ val response = RetrofitServiceManager.getDistrict(pid) val responseCode = response.separateResponseCode() if (responseCode == 200) { - districtModel.value = gson.fromJson( + districtData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getStreet(areaId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - streetModel.value = gson.fromJson( + streetData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt index 66f235b..d1006c7 100644 --- a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt @@ -20,17 +20,17 @@ class DeviceViewModel : BaseViewModel() { private val gson = Gson() - val mapDeviceModel = MutableLiveData() - val deviceDetailModel = MutableLiveData() - val historyDataModel = MutableLiveData() - val lastDataModel = MutableLiveData() - val deleteResult = MutableLiveData() + val mapDeviceData = MutableLiveData() + val deviceDetailData = MutableLiveData() + val historyDataData = MutableLiveData() + val lastDataData = MutableLiveData() + val deleteResultData = MutableLiveData() fun getMapDeviceList(context: Context) = launch({ val response = RetrofitServiceManager.getMapDeviceList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - mapDeviceModel.value = gson.fromJson( + mapDeviceData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - deviceDetailModel.value = gson.fromJson( + deviceDetailData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -71,7 +71,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - historyDataModel.value = gson.fromJson( + historyDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -87,13 +87,13 @@ val response = RetrofitServiceManager.getTubeLastData(groupId, devcode) when (response.separateResponseCode()) { 200 -> { - lastDataModel.value = gson.fromJson( + lastDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } 500 -> { - lastDataModel.value = LastDataModel() + lastDataData.value = LastDataModel() } else -> { @@ -149,7 +149,7 @@ val response = RetrofitServiceManager.deleteDeviceById(ids) val responseCode = response.separateResponseCode() if (responseCode == 200) { - deleteResult.value = gson.fromJson( + deleteResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt index 2632d37..12d953d 100644 --- a/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt @@ -17,8 +17,8 @@ class LoginViewModel : BaseViewModel() { private val gson = Gson() - val enterResultModel = MutableLiveData() - val outResultModel = MutableLiveData() + val enterResultData = MutableLiveData() + val outResultData = MutableLiveData() fun enter(context: Context, sid: String, account: String, secretKey: String) = launch({ val response = RetrofitServiceManager.login(sid, account, secretKey) @@ -26,7 +26,7 @@ if (responseCode == 200) { loadState.value = LoadState.Success "登录成功".show(context) - enterResultModel.value = gson.fromJson( + enterResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -42,7 +42,7 @@ val response = RetrofitServiceManager.loginOut() val responseCode = response.separateResponseCode() if (responseCode == 200) { - outResultModel.value = gson.fromJson( + outResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt index 6cbe323..a853a90 100644 --- a/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt @@ -20,17 +20,17 @@ class ProjectGroupViewModel : BaseViewModel() { private val gson = Gson() - val groupModel = MutableLiveData() - val groupDeviceModel = MutableLiveData() - val deviceListModel = MutableLiveData() - val groupListModel = MutableLiveData() - val changeGroupResult = MutableLiveData() + val groupData = MutableLiveData() + val groupDeviceData = MutableLiveData() + val deviceListData = MutableLiveData() + val groupListData = MutableLiveData() + val changeGroupResultData = MutableLiveData() fun getProGroupList(context: Context) = launch({ val response = RetrofitServiceManager.getProGroupList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - groupModel.value = gson.fromJson( + groupData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - groupDeviceModel.value = gson.fromJson( + groupDeviceData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -64,7 +64,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - deviceListModel.value = gson.fromJson( + deviceListData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getGroupList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - groupListModel.value = gson.fromJson( + groupListData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -94,7 +94,7 @@ val response = RetrofitServiceManager.changeGroupId(oldGroupId, newGroupId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - changeGroupResult.value = gson.fromJson( + changeGroupResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt index 01632e8..698ce65 100644 --- a/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt @@ -16,13 +16,13 @@ class UploadImageViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val commonResultData = MutableLiveData() fun uploadImage(context: Context, image: File) = launch({ val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( + commonResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index 9e5204d..5a451da 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -148,7 +148,7 @@ } } - deviceViewModel.historyDataModel.observe(this) { + deviceViewModel.historyDataData.observe(this) { if (it.code == 200) { val xAxisLabels = ArrayList() //每个entries都是一条折线 diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt index b854dee..4e0f80f 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -70,7 +70,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.getPublicKey(this) } - authenticateViewModel.keyModel.observe(this) { + authenticateViewModel.keyData.observe(this) { if (it.code == 200) {//用code判断，别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -85,7 +85,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 loginViewModel.enter(context, it.data!!.sid!!, account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this) { loginResult -> + loginViewModel.enterResultData.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) /** diff --git a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt index 50eced4..2611a12 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -25,7 +25,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserViewModel::class.java] - userDetailViewModel.userDetailModel.observe(this) { + userDetailViewModel.userDetailData.observe(this) { if (it.code == 200) { navigatePageTo() } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt index 6127c1b..381beaf 100644 --- a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt @@ -19,17 +19,17 @@ class AuthenticateViewModel : BaseViewModel() { private val gson = Gson() - val keyModel = MutableLiveData() - val areaModel = MutableLiveData() - val districtModel = MutableLiveData() - val streetModel = MutableLiveData() + val keyData = MutableLiveData() + val areaData = MutableLiveData() + val districtData = MutableLiveData() + val streetData = MutableLiveData() fun getPublicKey(context: Context) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.authenticate() val responseCode = response.separateResponseCode() if (responseCode == 200) { - keyModel.value = gson.fromJson( + keyData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val response = RetrofitServiceManager.getAreaByDept(deptId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - areaModel.value = gson.fromJson( + areaData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -63,7 +63,7 @@ val response = RetrofitServiceManager.getDistrict(pid) val responseCode = response.separateResponseCode() if (responseCode == 200) { - districtModel.value = gson.fromJson( + districtData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getStreet(areaId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - streetModel.value = gson.fromJson( + streetData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt index 66f235b..d1006c7 100644 --- a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt @@ -20,17 +20,17 @@ class DeviceViewModel : BaseViewModel() { private val gson = Gson() - val mapDeviceModel = MutableLiveData() - val deviceDetailModel = MutableLiveData() - val historyDataModel = MutableLiveData() - val lastDataModel = MutableLiveData() - val deleteResult = MutableLiveData() + val mapDeviceData = MutableLiveData() + val deviceDetailData = MutableLiveData() + val historyDataData = MutableLiveData() + val lastDataData = MutableLiveData() + val deleteResultData = MutableLiveData() fun getMapDeviceList(context: Context) = launch({ val response = RetrofitServiceManager.getMapDeviceList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - mapDeviceModel.value = gson.fromJson( + mapDeviceData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - deviceDetailModel.value = gson.fromJson( + deviceDetailData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -71,7 +71,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - historyDataModel.value = gson.fromJson( + historyDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -87,13 +87,13 @@ val response = RetrofitServiceManager.getTubeLastData(groupId, devcode) when (response.separateResponseCode()) { 200 -> { - lastDataModel.value = gson.fromJson( + lastDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } 500 -> { - lastDataModel.value = LastDataModel() + lastDataData.value = LastDataModel() } else -> { @@ -149,7 +149,7 @@ val response = RetrofitServiceManager.deleteDeviceById(ids) val responseCode = response.separateResponseCode() if (responseCode == 200) { - deleteResult.value = gson.fromJson( + deleteResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt index 2632d37..12d953d 100644 --- a/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt @@ -17,8 +17,8 @@ class LoginViewModel : BaseViewModel() { private val gson = Gson() - val enterResultModel = MutableLiveData() - val outResultModel = MutableLiveData() + val enterResultData = MutableLiveData() + val outResultData = MutableLiveData() fun enter(context: Context, sid: String, account: String, secretKey: String) = launch({ val response = RetrofitServiceManager.login(sid, account, secretKey) @@ -26,7 +26,7 @@ if (responseCode == 200) { loadState.value = LoadState.Success "登录成功".show(context) - enterResultModel.value = gson.fromJson( + enterResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -42,7 +42,7 @@ val response = RetrofitServiceManager.loginOut() val responseCode = response.separateResponseCode() if (responseCode == 200) { - outResultModel.value = gson.fromJson( + outResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt index 6cbe323..a853a90 100644 --- a/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt @@ -20,17 +20,17 @@ class ProjectGroupViewModel : BaseViewModel() { private val gson = Gson() - val groupModel = MutableLiveData() - val groupDeviceModel = MutableLiveData() - val deviceListModel = MutableLiveData() - val groupListModel = MutableLiveData() - val changeGroupResult = MutableLiveData() + val groupData = MutableLiveData() + val groupDeviceData = MutableLiveData() + val deviceListData = MutableLiveData() + val groupListData = MutableLiveData() + val changeGroupResultData = MutableLiveData() fun getProGroupList(context: Context) = launch({ val response = RetrofitServiceManager.getProGroupList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - groupModel.value = gson.fromJson( + groupData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - groupDeviceModel.value = gson.fromJson( + groupDeviceData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -64,7 +64,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - deviceListModel.value = gson.fromJson( + deviceListData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getGroupList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - groupListModel.value = gson.fromJson( + groupListData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -94,7 +94,7 @@ val response = RetrofitServiceManager.changeGroupId(oldGroupId, newGroupId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - changeGroupResult.value = gson.fromJson( + changeGroupResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt index 01632e8..698ce65 100644 --- a/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt @@ -16,13 +16,13 @@ class UploadImageViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val commonResultData = MutableLiveData() fun uploadImage(context: Context, image: File) = launch({ val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( + commonResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/UserViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/UserViewModel.kt index cf9cc72..1207eed 100644 --- a/app/src/main/java/com/casic/smarttube/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/UserViewModel.kt @@ -18,7 +18,7 @@ class UserViewModel : BaseViewModel() { private val gson = Gson() - val userDetailModel = MutableLiveData() + val userDetailData = MutableLiveData() fun getUserDetail() = launch({ val response = RetrofitServiceManager.getUserDetail() @@ -27,12 +27,12 @@ val userDetail = gson.fromJson( response, object : TypeToken() {}.type ) - userDetailModel.value = userDetail + userDetailData.value = userDetail SaveKeyValues.putValue(LocaleConstant.USER_DETAIL_MODEL, gson.toJson(userDetail.data)) } else { val errorModel = UserDetailModel() errorModel.code = responseCode - userDetailModel.value = errorModel + userDetailData.value = errorModel //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 SaveKeyValues.removeKey(LocaleConstant.USER_DETAIL_MODEL) } diff --git a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt index 8322ca2..f407a8f 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -164,7 +164,7 @@ } private fun dataObserve() { - userViewModel.userDetailModel.observe(this) { + userViewModel.userDetailData.observe(this) { if (it.code == 200) { LoadingDialog.dismiss() "同步完成".show(requireContext()) @@ -173,7 +173,7 @@ } } - versionViewModel.versionResultModel.observe(this) { + versionViewModel.versionResultData.observe(this) { if (it.version.compareVersion()) { "已是最新版本，无需更新".show(requireContext()) } else { @@ -192,7 +192,7 @@ } } - loginViewModel.outResultModel.observe(this) { + loginViewModel.outResultData.observe(this) { if (it.code == 200) { AuthenticationHelper.removeToken() requireContext().navigatePageTo() diff --git a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt index 8f63fdb..d507f87 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -46,12 +46,12 @@ override fun initOnCreate(savedInstanceState: Bundle?) { groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupModel.observe(this) { + groupViewModel.groupData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } } - groupViewModel.changeGroupResult.observe(this) { + groupViewModel.changeGroupResultData.observe(this) { if (it.code == 200) { groupListAdapter.notifyItemChanged(clickedPosition) } diff --git a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt index 1976c77..cf613fd 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -93,7 +93,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] - uploadImageViewModel.resultModel.observe(this) { + uploadImageViewModel.commonResultData.observe(this) { isUploading = false if (it.code == 200) { val url = it.data.toString() @@ -108,7 +108,7 @@ deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupListModel.observe(this) { + groupViewModel.groupListData.observe(this) { val groups = ArrayList() if (it.code == 200) { if (it.data.isEmpty()) { diff --git a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt index 264d41b..8416587 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -61,7 +61,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val params = intent.getStringArrayListExtra(LiteKitConstant.INTENT_PARAM_KEY)!! deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deviceDetailModel.observe(this) { + deviceViewModel.deviceDetailData.observe(this) { if (it.code == 200) { val device = it.data this.deviceModel = device diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt index 767f52c..a928fc2 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -68,7 +68,7 @@ binding.titleView.setTitle(String.format(groupId + "项目设备列表")) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.deviceListModel.observe(this) { + groupViewModel.deviceListData.observe(this) { if (it.code == 200) { bindRecyclerView(it) } @@ -76,7 +76,7 @@ getDeviceListByPage() deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.deleteResult.observe(this) { + deviceViewModel.deleteResultData.observe(this) { if (it.code == 200) { if (isDeleteAll) { dataRows.clear() diff --git a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt index d17f773..68f4dfd 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceMapActivity.kt @@ -80,7 +80,7 @@ initMap(savedInstanceState) deviceViewModel = ViewModelProvider(this)[DeviceViewModel::class.java] - deviceViewModel.mapDeviceModel.observe(this) { + deviceViewModel.mapDeviceData.observe(this) { if (it.code == 200) { it.data.forEach { device -> val lat = device.latGaode.toString() @@ -99,7 +99,7 @@ deviceViewModel.getMapDeviceList(this) groupViewModel = ViewModelProvider(this)[ProjectGroupViewModel::class.java] - groupViewModel.groupDeviceModel.observe(this) { + groupViewModel.groupDeviceData.observe(this) { if (it.code == 200) { val allMarkerOptions = ArrayList() val latitudeList = ArrayList() @@ -213,7 +213,7 @@ deviceCodeView.text = String.format("设备编号: ${device.devcode}") deviceModelView.text = String.format("设备模型: ${device.modelName}") - deviceViewModel.lastDataModel.observe(this) { + deviceViewModel.lastDataData.observe(this) { if (it.code == 200) { deviceValueView.text = String.format("最新浓度: ${it.data.strength}") updateTimeView.text = String.format("更新时间: ${it.data.uptime}") diff --git a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt index 9e5204d..5a451da 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -148,7 +148,7 @@ } } - deviceViewModel.historyDataModel.observe(this) { + deviceViewModel.historyDataData.observe(this) { if (it.code == 200) { val xAxisLabels = ArrayList() //每个entries都是一条折线 diff --git a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt index b854dee..4e0f80f 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -70,7 +70,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.getPublicKey(this) } - authenticateViewModel.keyModel.observe(this) { + authenticateViewModel.keyData.observe(this) { if (it.code == 200) {//用code判断，别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -85,7 +85,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token，POST请求 loginViewModel.enter(context, it.data!!.sid!!, account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this) { loginResult -> + loginViewModel.enterResultData.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) /** diff --git a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt index 50eced4..2611a12 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -25,7 +25,7 @@ override fun initOnCreate(savedInstanceState: Bundle?) { userDetailViewModel = ViewModelProvider(this)[UserViewModel::class.java] - userDetailViewModel.userDetailModel.observe(this) { + userDetailViewModel.userDetailData.observe(this) { if (it.code == 200) { navigatePageTo() } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt index 6127c1b..381beaf 100644 --- a/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/AuthenticateViewModel.kt @@ -19,17 +19,17 @@ class AuthenticateViewModel : BaseViewModel() { private val gson = Gson() - val keyModel = MutableLiveData() - val areaModel = MutableLiveData() - val districtModel = MutableLiveData() - val streetModel = MutableLiveData() + val keyData = MutableLiveData() + val areaData = MutableLiveData() + val districtData = MutableLiveData() + val streetData = MutableLiveData() fun getPublicKey(context: Context) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.authenticate() val responseCode = response.separateResponseCode() if (responseCode == 200) { - keyModel.value = gson.fromJson( + keyData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val response = RetrofitServiceManager.getAreaByDept(deptId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - areaModel.value = gson.fromJson( + areaData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -63,7 +63,7 @@ val response = RetrofitServiceManager.getDistrict(pid) val responseCode = response.separateResponseCode() if (responseCode == 200) { - districtModel.value = gson.fromJson( + districtData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getStreet(areaId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - streetModel.value = gson.fromJson( + streetData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt index 66f235b..d1006c7 100644 --- a/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/DeviceViewModel.kt @@ -20,17 +20,17 @@ class DeviceViewModel : BaseViewModel() { private val gson = Gson() - val mapDeviceModel = MutableLiveData() - val deviceDetailModel = MutableLiveData() - val historyDataModel = MutableLiveData() - val lastDataModel = MutableLiveData() - val deleteResult = MutableLiveData() + val mapDeviceData = MutableLiveData() + val deviceDetailData = MutableLiveData() + val historyDataData = MutableLiveData() + val lastDataData = MutableLiveData() + val deleteResultData = MutableLiveData() fun getMapDeviceList(context: Context) = launch({ val response = RetrofitServiceManager.getMapDeviceList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - mapDeviceModel.value = gson.fromJson( + mapDeviceData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - deviceDetailModel.value = gson.fromJson( + deviceDetailData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -71,7 +71,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - historyDataModel.value = gson.fromJson( + historyDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -87,13 +87,13 @@ val response = RetrofitServiceManager.getTubeLastData(groupId, devcode) when (response.separateResponseCode()) { 200 -> { - lastDataModel.value = gson.fromJson( + lastDataData.value = gson.fromJson( response, object : TypeToken() {}.type ) } 500 -> { - lastDataModel.value = LastDataModel() + lastDataData.value = LastDataModel() } else -> { @@ -149,7 +149,7 @@ val response = RetrofitServiceManager.deleteDeviceById(ids) val responseCode = response.separateResponseCode() if (responseCode == 200) { - deleteResult.value = gson.fromJson( + deleteResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt index 2632d37..12d953d 100644 --- a/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/LoginViewModel.kt @@ -17,8 +17,8 @@ class LoginViewModel : BaseViewModel() { private val gson = Gson() - val enterResultModel = MutableLiveData() - val outResultModel = MutableLiveData() + val enterResultData = MutableLiveData() + val outResultData = MutableLiveData() fun enter(context: Context, sid: String, account: String, secretKey: String) = launch({ val response = RetrofitServiceManager.login(sid, account, secretKey) @@ -26,7 +26,7 @@ if (responseCode == 200) { loadState.value = LoadState.Success "登录成功".show(context) - enterResultModel.value = gson.fromJson( + enterResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -42,7 +42,7 @@ val response = RetrofitServiceManager.loginOut() val responseCode = response.separateResponseCode() if (responseCode == 200) { - outResultModel.value = gson.fromJson( + outResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt index 6cbe323..a853a90 100644 --- a/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/ProjectGroupViewModel.kt @@ -20,17 +20,17 @@ class ProjectGroupViewModel : BaseViewModel() { private val gson = Gson() - val groupModel = MutableLiveData() - val groupDeviceModel = MutableLiveData() - val deviceListModel = MutableLiveData() - val groupListModel = MutableLiveData() - val changeGroupResult = MutableLiveData() + val groupData = MutableLiveData() + val groupDeviceData = MutableLiveData() + val deviceListData = MutableLiveData() + val groupListData = MutableLiveData() + val changeGroupResultData = MutableLiveData() fun getProGroupList(context: Context) = launch({ val response = RetrofitServiceManager.getProGroupList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - groupModel.value = gson.fromJson( + groupData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -46,7 +46,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - groupDeviceModel.value = gson.fromJson( + groupDeviceData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -64,7 +64,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - deviceListModel.value = gson.fromJson( + deviceListData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +80,7 @@ val response = RetrofitServiceManager.getGroupList() val responseCode = response.separateResponseCode() if (responseCode == 200) { - groupListModel.value = gson.fromJson( + groupListData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -94,7 +94,7 @@ val response = RetrofitServiceManager.changeGroupId(oldGroupId, newGroupId) val responseCode = response.separateResponseCode() if (responseCode == 200) { - changeGroupResult.value = gson.fromJson( + changeGroupResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt index 01632e8..698ce65 100644 --- a/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/UploadImageViewModel.kt @@ -16,13 +16,13 @@ class UploadImageViewModel : BaseViewModel() { private val gson = Gson() - val resultModel = MutableLiveData() + val commonResultData = MutableLiveData() fun uploadImage(context: Context, image: File) = launch({ val response = RetrofitServiceManager.uploadImage(image) val responseCode = response.separateResponseCode() if (responseCode == 200) { - resultModel.value = gson.fromJson( + commonResultData.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/smarttube/vm/UserViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/UserViewModel.kt index cf9cc72..1207eed 100644 --- a/app/src/main/java/com/casic/smarttube/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/UserViewModel.kt @@ -18,7 +18,7 @@ class UserViewModel : BaseViewModel() { private val gson = Gson() - val userDetailModel = MutableLiveData() + val userDetailData = MutableLiveData() fun getUserDetail() = launch({ val response = RetrofitServiceManager.getUserDetail() @@ -27,12 +27,12 @@ val userDetail = gson.fromJson( response, object : TypeToken() {}.type ) - userDetailModel.value = userDetail + userDetailData.value = userDetail SaveKeyValues.putValue(LocaleConstant.USER_DETAIL_MODEL, gson.toJson(userDetail.data)) } else { val errorModel = UserDetailModel() errorModel.code = responseCode - userDetailModel.value = errorModel + userDetailData.value = errorModel //如果此次获取不到用户信息，那么就清空之前的用户缓存，然后让用户重新登录 SaveKeyValues.removeKey(LocaleConstant.USER_DETAIL_MODEL) } diff --git a/app/src/main/java/com/casic/smarttube/vm/VersionViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/VersionViewModel.kt index 2c6a133..fb63c93 100644 --- a/app/src/main/java/com/casic/smarttube/vm/VersionViewModel.kt +++ b/app/src/main/java/com/casic/smarttube/vm/VersionViewModel.kt @@ -16,7 +16,7 @@ class VersionViewModel : BaseViewModel() { private val gson = Gson() - val versionResultModel = MutableLiveData() + val versionResultData = MutableLiveData() fun updateVersion(context: Context) = launch({ loadState.value = LoadState.Loading @@ -24,7 +24,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - versionResultModel.value = gson.fromJson( + versionResultData.value = gson.fromJson( response, object : TypeToken() {}.type ).data } else {