diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt index 82fcafd..e872ef4 100644 --- a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt @@ -1,46 +1,31 @@ package com.casic.smarttube.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.amap.api.navi.NaviSetting import com.casic.smarttube.R import com.casic.smarttube.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt index 82fcafd..e872ef4 100644 --- a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt @@ -1,46 +1,31 @@ package com.casic.smarttube.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.amap.api.navi.NaviSetting import com.casic.smarttube.R import com.casic.smarttube.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 0f588b5..c639105 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -67,6 +67,10 @@ centerMarkerView.initInfoWindowsView(aMap) } + override fun observeRequestState() { + + } + override fun initEvent() { aMap.setOnMyLocationChangeListener(this) aMap.setOnMapLoadedListener(this) diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt index 82fcafd..e872ef4 100644 --- a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt @@ -1,46 +1,31 @@ package com.casic.smarttube.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.amap.api.navi.NaviSetting import com.casic.smarttube.R import com.casic.smarttube.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 0f588b5..c639105 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -67,6 +67,10 @@ centerMarkerView.initInfoWindowsView(aMap) } + override fun observeRequestState() { + + } + override fun initEvent() { aMap.setOnMyLocationChangeListener(this) aMap.setOnMapLoadedListener(this) 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 5b00fc6..a675f0d 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -44,6 +44,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt index 82fcafd..e872ef4 100644 --- a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt @@ -1,46 +1,31 @@ package com.casic.smarttube.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.amap.api.navi.NaviSetting import com.casic.smarttube.R import com.casic.smarttube.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 0f588b5..c639105 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -67,6 +67,10 @@ centerMarkerView.initInfoWindowsView(aMap) } + override fun observeRequestState() { + + } + override fun initEvent() { aMap.setOnMyLocationChangeListener(this) aMap.setOnMapLoadedListener(this) 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 5b00fc6..a675f0d 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -44,6 +44,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } diff --git a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt deleted file mode 100644 index e43839b..0000000 --- a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt +++ /dev/null @@ -1,188 +0,0 @@ -package com.casic.smarttube.view - -import android.os.Bundle -import androidx.lifecycle.ViewModelProvider -import com.amap.api.maps.AMap -import com.amap.api.maps.AMapOptions -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* -import com.casic.smarttube.R -import com.casic.smarttube.utils.LoadingDialogHub -import com.casic.smarttube.utils.RouteOnMap -import com.casic.smarttube.vm.AuthenticateViewModel -import com.casic.smarttube.vm.WellViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* - - -class WellDetailActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener { - - private lateinit var wellViewModel: WellViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel - private lateinit var aMap: AMap - - override fun initLayoutView(): Int = R.layout.activity_well_detail - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - leftBackView.setOnClickListener { finish() } - titleView.text = "井详情" - } - - override fun initData() { - val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - wellViewModel.obtainWellDetail(wellId) - - aMap = wellMapView.map - aMap.mapType = AMap.MAP_TYPE_NORMAL - val uiSettings = aMap.uiSettings - uiSettings.isCompassEnabled = true - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 - uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - - // marker 点击事件监听 - aMap.addOnMarkerClickListener(this) - } - - override fun onMarkerClick(marker: Marker?): Boolean { - if (marker != null) { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("操作提示") - .setMessage("确定要前往吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val latLng = marker.position - val lat = latLng.latitude.toString() - val lng = latLng.longitude.toString() - if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this@WellDetailActivity) - return - } - RouteOnMap.startNavigation( - this@WellDetailActivity, - marker.snippet, - LatLng(lat.toDouble(), lng.toDouble()) - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - return true - } - - override fun initEvent() { - wellViewModel.detailModel.observe(this, { - if (it.code == 200) { - val wellDetail = it.data!! - - wellNameView.text = wellDetail.wellName - wellTypeView.text = wellDetail.wellTypeName - wellCodeView.text = wellDetail.wellCode - ownerShipView.text = wellDetail.deptName - wellStateView.text = wellDetail.bfztName - wellDepthView.text = wellDetail.deep - //绑定窨井位置 - if (wellDetail.latGaode.isBlank() || wellDetail.lngGaode.isBlank()) { - wellLocationView.text = wellDetail.position - return@observe - } - val latLng = LatLng(wellDetail.latGaode.toDouble(), wellDetail.lngGaode.toDouble()) - val cameraPosition = CameraPosition(latLng, 10f, 0f, 0f) - val newCameraPosition = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(newCameraPosition, 1500, object : AMap.CancelableCallback { - override fun onFinish() { - //添加Marker - val markerOptions = MarkerOptions() - .snippet(wellDetail.position) - .position(latLng) - .icon(BitmapDescriptorFactory.fromResource(R.mipmap.well_location)) - .draggable(true) - aMap.addMarker(markerOptions) - } - - override fun onCancel() { - - } - }) - - authenticateViewModel.obtainAreaByDept(wellDetail.deptid) - authenticateViewModel.areaModel.observe(this, { areaModel -> - if (areaModel.code == 200) { - authenticateViewModel.obtainDistrict(areaModel.data.area) - } - }) - authenticateViewModel.districtModel.observe(this, { districtModel -> - if (districtModel.code == 200) { - districtModel.data.forEach { area -> - if (area.id == wellDetail.qu) { - authenticateViewModel.obtainStreet(area.id) - authenticateViewModel.streetModel.observe(this, { street -> - if (street.code == 200) { - street.data.forEach { streetData -> - if (streetData.id == wellDetail.area) { - wellLocationView.text = String.format( - "${area.name}${streetData.name}-${wellDetail.position}" - ) - } - } - } - }) - } - } - } - }) - } - }) - wellViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - /**地图相关*********/ - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - wellMapView.onCreate(savedInstanceState) - } - - override fun onResume() { - super.onResume() - wellMapView.onResume() - } - - override fun onPause() { - super.onPause() - wellMapView.onPause() - } - - override fun onDestroy() { - wellMapView.onDestroy() - super.onDestroy() - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - wellMapView.onSaveInstanceState(outState) - } -} \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt index 82fcafd..e872ef4 100644 --- a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt @@ -1,46 +1,31 @@ package com.casic.smarttube.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.amap.api.navi.NaviSetting import com.casic.smarttube.R import com.casic.smarttube.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 0f588b5..c639105 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -67,6 +67,10 @@ centerMarkerView.initInfoWindowsView(aMap) } + override fun observeRequestState() { + + } + override fun initEvent() { aMap.setOnMyLocationChangeListener(this) aMap.setOnMapLoadedListener(this) 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 5b00fc6..a675f0d 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -44,6 +44,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } diff --git a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt deleted file mode 100644 index e43839b..0000000 --- a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt +++ /dev/null @@ -1,188 +0,0 @@ -package com.casic.smarttube.view - -import android.os.Bundle -import androidx.lifecycle.ViewModelProvider -import com.amap.api.maps.AMap -import com.amap.api.maps.AMapOptions -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* -import com.casic.smarttube.R -import com.casic.smarttube.utils.LoadingDialogHub -import com.casic.smarttube.utils.RouteOnMap -import com.casic.smarttube.vm.AuthenticateViewModel -import com.casic.smarttube.vm.WellViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* - - -class WellDetailActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener { - - private lateinit var wellViewModel: WellViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel - private lateinit var aMap: AMap - - override fun initLayoutView(): Int = R.layout.activity_well_detail - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - leftBackView.setOnClickListener { finish() } - titleView.text = "井详情" - } - - override fun initData() { - val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - wellViewModel.obtainWellDetail(wellId) - - aMap = wellMapView.map - aMap.mapType = AMap.MAP_TYPE_NORMAL - val uiSettings = aMap.uiSettings - uiSettings.isCompassEnabled = true - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 - uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - - // marker 点击事件监听 - aMap.addOnMarkerClickListener(this) - } - - override fun onMarkerClick(marker: Marker?): Boolean { - if (marker != null) { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("操作提示") - .setMessage("确定要前往吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val latLng = marker.position - val lat = latLng.latitude.toString() - val lng = latLng.longitude.toString() - if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this@WellDetailActivity) - return - } - RouteOnMap.startNavigation( - this@WellDetailActivity, - marker.snippet, - LatLng(lat.toDouble(), lng.toDouble()) - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - return true - } - - override fun initEvent() { - wellViewModel.detailModel.observe(this, { - if (it.code == 200) { - val wellDetail = it.data!! - - wellNameView.text = wellDetail.wellName - wellTypeView.text = wellDetail.wellTypeName - wellCodeView.text = wellDetail.wellCode - ownerShipView.text = wellDetail.deptName - wellStateView.text = wellDetail.bfztName - wellDepthView.text = wellDetail.deep - //绑定窨井位置 - if (wellDetail.latGaode.isBlank() || wellDetail.lngGaode.isBlank()) { - wellLocationView.text = wellDetail.position - return@observe - } - val latLng = LatLng(wellDetail.latGaode.toDouble(), wellDetail.lngGaode.toDouble()) - val cameraPosition = CameraPosition(latLng, 10f, 0f, 0f) - val newCameraPosition = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(newCameraPosition, 1500, object : AMap.CancelableCallback { - override fun onFinish() { - //添加Marker - val markerOptions = MarkerOptions() - .snippet(wellDetail.position) - .position(latLng) - .icon(BitmapDescriptorFactory.fromResource(R.mipmap.well_location)) - .draggable(true) - aMap.addMarker(markerOptions) - } - - override fun onCancel() { - - } - }) - - authenticateViewModel.obtainAreaByDept(wellDetail.deptid) - authenticateViewModel.areaModel.observe(this, { areaModel -> - if (areaModel.code == 200) { - authenticateViewModel.obtainDistrict(areaModel.data.area) - } - }) - authenticateViewModel.districtModel.observe(this, { districtModel -> - if (districtModel.code == 200) { - districtModel.data.forEach { area -> - if (area.id == wellDetail.qu) { - authenticateViewModel.obtainStreet(area.id) - authenticateViewModel.streetModel.observe(this, { street -> - if (street.code == 200) { - street.data.forEach { streetData -> - if (streetData.id == wellDetail.area) { - wellLocationView.text = String.format( - "${area.name}${streetData.name}-${wellDetail.position}" - ) - } - } - } - }) - } - } - } - }) - } - }) - wellViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - /**地图相关*********/ - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - wellMapView.onCreate(savedInstanceState) - } - - override fun onResume() { - super.onResume() - wellMapView.onResume() - } - - override fun onPause() { - super.onPause() - wellMapView.onPause() - } - - override fun onDestroy() { - wellMapView.onDestroy() - super.onDestroy() - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - wellMapView.onSaveInstanceState(outState) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt deleted file mode 100644 index 4c5ac01..0000000 --- a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.smarttube.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smarttube.base.BaseApplication -import com.casic.smarttube.extensions.separateResponseCode -import com.casic.smarttube.extensions.toErrorMessage -import com.casic.smarttube.model.WellDetailModel -import com.casic.smarttube.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState - -class WellViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt index 82fcafd..e872ef4 100644 --- a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt @@ -1,46 +1,31 @@ package com.casic.smarttube.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.amap.api.navi.NaviSetting import com.casic.smarttube.R import com.casic.smarttube.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 0f588b5..c639105 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -67,6 +67,10 @@ centerMarkerView.initInfoWindowsView(aMap) } + override fun observeRequestState() { + + } + override fun initEvent() { aMap.setOnMyLocationChangeListener(this) aMap.setOnMapLoadedListener(this) 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 5b00fc6..a675f0d 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -44,6 +44,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } diff --git a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt deleted file mode 100644 index e43839b..0000000 --- a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt +++ /dev/null @@ -1,188 +0,0 @@ -package com.casic.smarttube.view - -import android.os.Bundle -import androidx.lifecycle.ViewModelProvider -import com.amap.api.maps.AMap -import com.amap.api.maps.AMapOptions -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* -import com.casic.smarttube.R -import com.casic.smarttube.utils.LoadingDialogHub -import com.casic.smarttube.utils.RouteOnMap -import com.casic.smarttube.vm.AuthenticateViewModel -import com.casic.smarttube.vm.WellViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* - - -class WellDetailActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener { - - private lateinit var wellViewModel: WellViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel - private lateinit var aMap: AMap - - override fun initLayoutView(): Int = R.layout.activity_well_detail - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - leftBackView.setOnClickListener { finish() } - titleView.text = "井详情" - } - - override fun initData() { - val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - wellViewModel.obtainWellDetail(wellId) - - aMap = wellMapView.map - aMap.mapType = AMap.MAP_TYPE_NORMAL - val uiSettings = aMap.uiSettings - uiSettings.isCompassEnabled = true - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 - uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - - // marker 点击事件监听 - aMap.addOnMarkerClickListener(this) - } - - override fun onMarkerClick(marker: Marker?): Boolean { - if (marker != null) { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("操作提示") - .setMessage("确定要前往吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val latLng = marker.position - val lat = latLng.latitude.toString() - val lng = latLng.longitude.toString() - if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this@WellDetailActivity) - return - } - RouteOnMap.startNavigation( - this@WellDetailActivity, - marker.snippet, - LatLng(lat.toDouble(), lng.toDouble()) - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - return true - } - - override fun initEvent() { - wellViewModel.detailModel.observe(this, { - if (it.code == 200) { - val wellDetail = it.data!! - - wellNameView.text = wellDetail.wellName - wellTypeView.text = wellDetail.wellTypeName - wellCodeView.text = wellDetail.wellCode - ownerShipView.text = wellDetail.deptName - wellStateView.text = wellDetail.bfztName - wellDepthView.text = wellDetail.deep - //绑定窨井位置 - if (wellDetail.latGaode.isBlank() || wellDetail.lngGaode.isBlank()) { - wellLocationView.text = wellDetail.position - return@observe - } - val latLng = LatLng(wellDetail.latGaode.toDouble(), wellDetail.lngGaode.toDouble()) - val cameraPosition = CameraPosition(latLng, 10f, 0f, 0f) - val newCameraPosition = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(newCameraPosition, 1500, object : AMap.CancelableCallback { - override fun onFinish() { - //添加Marker - val markerOptions = MarkerOptions() - .snippet(wellDetail.position) - .position(latLng) - .icon(BitmapDescriptorFactory.fromResource(R.mipmap.well_location)) - .draggable(true) - aMap.addMarker(markerOptions) - } - - override fun onCancel() { - - } - }) - - authenticateViewModel.obtainAreaByDept(wellDetail.deptid) - authenticateViewModel.areaModel.observe(this, { areaModel -> - if (areaModel.code == 200) { - authenticateViewModel.obtainDistrict(areaModel.data.area) - } - }) - authenticateViewModel.districtModel.observe(this, { districtModel -> - if (districtModel.code == 200) { - districtModel.data.forEach { area -> - if (area.id == wellDetail.qu) { - authenticateViewModel.obtainStreet(area.id) - authenticateViewModel.streetModel.observe(this, { street -> - if (street.code == 200) { - street.data.forEach { streetData -> - if (streetData.id == wellDetail.area) { - wellLocationView.text = String.format( - "${area.name}${streetData.name}-${wellDetail.position}" - ) - } - } - } - }) - } - } - } - }) - } - }) - wellViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - /**地图相关*********/ - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - wellMapView.onCreate(savedInstanceState) - } - - override fun onResume() { - super.onResume() - wellMapView.onResume() - } - - override fun onPause() { - super.onPause() - wellMapView.onPause() - } - - override fun onDestroy() { - wellMapView.onDestroy() - super.onDestroy() - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - wellMapView.onSaveInstanceState(outState) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt deleted file mode 100644 index 4c5ac01..0000000 --- a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.smarttube.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smarttube.base.BaseApplication -import com.casic.smarttube.extensions.separateResponseCode -import com.casic.smarttube.extensions.toErrorMessage -import com.casic.smarttube.model.WellDetailModel -import com.casic.smarttube.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState - -class WellViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt index 82fcafd..e872ef4 100644 --- a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt @@ -1,46 +1,31 @@ package com.casic.smarttube.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.amap.api.navi.NaviSetting import com.casic.smarttube.R import com.casic.smarttube.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 0f588b5..c639105 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -67,6 +67,10 @@ centerMarkerView.initInfoWindowsView(aMap) } + override fun observeRequestState() { + + } + override fun initEvent() { aMap.setOnMyLocationChangeListener(this) aMap.setOnMapLoadedListener(this) 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 5b00fc6..a675f0d 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -44,6 +44,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } diff --git a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt deleted file mode 100644 index e43839b..0000000 --- a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt +++ /dev/null @@ -1,188 +0,0 @@ -package com.casic.smarttube.view - -import android.os.Bundle -import androidx.lifecycle.ViewModelProvider -import com.amap.api.maps.AMap -import com.amap.api.maps.AMapOptions -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* -import com.casic.smarttube.R -import com.casic.smarttube.utils.LoadingDialogHub -import com.casic.smarttube.utils.RouteOnMap -import com.casic.smarttube.vm.AuthenticateViewModel -import com.casic.smarttube.vm.WellViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* - - -class WellDetailActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener { - - private lateinit var wellViewModel: WellViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel - private lateinit var aMap: AMap - - override fun initLayoutView(): Int = R.layout.activity_well_detail - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - leftBackView.setOnClickListener { finish() } - titleView.text = "井详情" - } - - override fun initData() { - val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - wellViewModel.obtainWellDetail(wellId) - - aMap = wellMapView.map - aMap.mapType = AMap.MAP_TYPE_NORMAL - val uiSettings = aMap.uiSettings - uiSettings.isCompassEnabled = true - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 - uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - - // marker 点击事件监听 - aMap.addOnMarkerClickListener(this) - } - - override fun onMarkerClick(marker: Marker?): Boolean { - if (marker != null) { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("操作提示") - .setMessage("确定要前往吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val latLng = marker.position - val lat = latLng.latitude.toString() - val lng = latLng.longitude.toString() - if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this@WellDetailActivity) - return - } - RouteOnMap.startNavigation( - this@WellDetailActivity, - marker.snippet, - LatLng(lat.toDouble(), lng.toDouble()) - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - return true - } - - override fun initEvent() { - wellViewModel.detailModel.observe(this, { - if (it.code == 200) { - val wellDetail = it.data!! - - wellNameView.text = wellDetail.wellName - wellTypeView.text = wellDetail.wellTypeName - wellCodeView.text = wellDetail.wellCode - ownerShipView.text = wellDetail.deptName - wellStateView.text = wellDetail.bfztName - wellDepthView.text = wellDetail.deep - //绑定窨井位置 - if (wellDetail.latGaode.isBlank() || wellDetail.lngGaode.isBlank()) { - wellLocationView.text = wellDetail.position - return@observe - } - val latLng = LatLng(wellDetail.latGaode.toDouble(), wellDetail.lngGaode.toDouble()) - val cameraPosition = CameraPosition(latLng, 10f, 0f, 0f) - val newCameraPosition = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(newCameraPosition, 1500, object : AMap.CancelableCallback { - override fun onFinish() { - //添加Marker - val markerOptions = MarkerOptions() - .snippet(wellDetail.position) - .position(latLng) - .icon(BitmapDescriptorFactory.fromResource(R.mipmap.well_location)) - .draggable(true) - aMap.addMarker(markerOptions) - } - - override fun onCancel() { - - } - }) - - authenticateViewModel.obtainAreaByDept(wellDetail.deptid) - authenticateViewModel.areaModel.observe(this, { areaModel -> - if (areaModel.code == 200) { - authenticateViewModel.obtainDistrict(areaModel.data.area) - } - }) - authenticateViewModel.districtModel.observe(this, { districtModel -> - if (districtModel.code == 200) { - districtModel.data.forEach { area -> - if (area.id == wellDetail.qu) { - authenticateViewModel.obtainStreet(area.id) - authenticateViewModel.streetModel.observe(this, { street -> - if (street.code == 200) { - street.data.forEach { streetData -> - if (streetData.id == wellDetail.area) { - wellLocationView.text = String.format( - "${area.name}${streetData.name}-${wellDetail.position}" - ) - } - } - } - }) - } - } - } - }) - } - }) - wellViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - /**地图相关*********/ - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - wellMapView.onCreate(savedInstanceState) - } - - override fun onResume() { - super.onResume() - wellMapView.onResume() - } - - override fun onPause() { - super.onPause() - wellMapView.onPause() - } - - override fun onDestroy() { - wellMapView.onDestroy() - super.onDestroy() - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - wellMapView.onSaveInstanceState(outState) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt deleted file mode 100644 index 4c5ac01..0000000 --- a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.smarttube.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smarttube.base.BaseApplication -import com.casic.smarttube.extensions.separateResponseCode -import com.casic.smarttube.extensions.toErrorMessage -import com.casic.smarttube.model.WellDetailModel -import com.casic.smarttube.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState - -class WellViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt index 82fcafd..e872ef4 100644 --- a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt @@ -1,46 +1,31 @@ package com.casic.smarttube.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.amap.api.navi.NaviSetting import com.casic.smarttube.R import com.casic.smarttube.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 0f588b5..c639105 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -67,6 +67,10 @@ centerMarkerView.initInfoWindowsView(aMap) } + override fun observeRequestState() { + + } + override fun initEvent() { aMap.setOnMyLocationChangeListener(this) aMap.setOnMapLoadedListener(this) 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 5b00fc6..a675f0d 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -44,6 +44,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } diff --git a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt deleted file mode 100644 index e43839b..0000000 --- a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt +++ /dev/null @@ -1,188 +0,0 @@ -package com.casic.smarttube.view - -import android.os.Bundle -import androidx.lifecycle.ViewModelProvider -import com.amap.api.maps.AMap -import com.amap.api.maps.AMapOptions -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* -import com.casic.smarttube.R -import com.casic.smarttube.utils.LoadingDialogHub -import com.casic.smarttube.utils.RouteOnMap -import com.casic.smarttube.vm.AuthenticateViewModel -import com.casic.smarttube.vm.WellViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* - - -class WellDetailActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener { - - private lateinit var wellViewModel: WellViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel - private lateinit var aMap: AMap - - override fun initLayoutView(): Int = R.layout.activity_well_detail - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - leftBackView.setOnClickListener { finish() } - titleView.text = "井详情" - } - - override fun initData() { - val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - wellViewModel.obtainWellDetail(wellId) - - aMap = wellMapView.map - aMap.mapType = AMap.MAP_TYPE_NORMAL - val uiSettings = aMap.uiSettings - uiSettings.isCompassEnabled = true - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 - uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - - // marker 点击事件监听 - aMap.addOnMarkerClickListener(this) - } - - override fun onMarkerClick(marker: Marker?): Boolean { - if (marker != null) { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("操作提示") - .setMessage("确定要前往吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val latLng = marker.position - val lat = latLng.latitude.toString() - val lng = latLng.longitude.toString() - if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this@WellDetailActivity) - return - } - RouteOnMap.startNavigation( - this@WellDetailActivity, - marker.snippet, - LatLng(lat.toDouble(), lng.toDouble()) - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - return true - } - - override fun initEvent() { - wellViewModel.detailModel.observe(this, { - if (it.code == 200) { - val wellDetail = it.data!! - - wellNameView.text = wellDetail.wellName - wellTypeView.text = wellDetail.wellTypeName - wellCodeView.text = wellDetail.wellCode - ownerShipView.text = wellDetail.deptName - wellStateView.text = wellDetail.bfztName - wellDepthView.text = wellDetail.deep - //绑定窨井位置 - if (wellDetail.latGaode.isBlank() || wellDetail.lngGaode.isBlank()) { - wellLocationView.text = wellDetail.position - return@observe - } - val latLng = LatLng(wellDetail.latGaode.toDouble(), wellDetail.lngGaode.toDouble()) - val cameraPosition = CameraPosition(latLng, 10f, 0f, 0f) - val newCameraPosition = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(newCameraPosition, 1500, object : AMap.CancelableCallback { - override fun onFinish() { - //添加Marker - val markerOptions = MarkerOptions() - .snippet(wellDetail.position) - .position(latLng) - .icon(BitmapDescriptorFactory.fromResource(R.mipmap.well_location)) - .draggable(true) - aMap.addMarker(markerOptions) - } - - override fun onCancel() { - - } - }) - - authenticateViewModel.obtainAreaByDept(wellDetail.deptid) - authenticateViewModel.areaModel.observe(this, { areaModel -> - if (areaModel.code == 200) { - authenticateViewModel.obtainDistrict(areaModel.data.area) - } - }) - authenticateViewModel.districtModel.observe(this, { districtModel -> - if (districtModel.code == 200) { - districtModel.data.forEach { area -> - if (area.id == wellDetail.qu) { - authenticateViewModel.obtainStreet(area.id) - authenticateViewModel.streetModel.observe(this, { street -> - if (street.code == 200) { - street.data.forEach { streetData -> - if (streetData.id == wellDetail.area) { - wellLocationView.text = String.format( - "${area.name}${streetData.name}-${wellDetail.position}" - ) - } - } - } - }) - } - } - } - }) - } - }) - wellViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - /**地图相关*********/ - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - wellMapView.onCreate(savedInstanceState) - } - - override fun onResume() { - super.onResume() - wellMapView.onResume() - } - - override fun onPause() { - super.onPause() - wellMapView.onPause() - } - - override fun onDestroy() { - wellMapView.onDestroy() - super.onDestroy() - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - wellMapView.onSaveInstanceState(outState) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt deleted file mode 100644 index 4c5ac01..0000000 --- a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.smarttube.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smarttube.base.BaseApplication -import com.casic.smarttube.extensions.separateResponseCode -import com.casic.smarttube.extensions.toErrorMessage -import com.casic.smarttube.model.WellDetailModel -import com.casic.smarttube.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState - -class WellViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt index 82fcafd..e872ef4 100644 --- a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt @@ -1,46 +1,31 @@ package com.casic.smarttube.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.amap.api.navi.NaviSetting import com.casic.smarttube.R import com.casic.smarttube.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 0f588b5..c639105 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -67,6 +67,10 @@ centerMarkerView.initInfoWindowsView(aMap) } + override fun observeRequestState() { + + } + override fun initEvent() { aMap.setOnMyLocationChangeListener(this) aMap.setOnMapLoadedListener(this) 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 5b00fc6..a675f0d 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -44,6 +44,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } diff --git a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt deleted file mode 100644 index e43839b..0000000 --- a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt +++ /dev/null @@ -1,188 +0,0 @@ -package com.casic.smarttube.view - -import android.os.Bundle -import androidx.lifecycle.ViewModelProvider -import com.amap.api.maps.AMap -import com.amap.api.maps.AMapOptions -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* -import com.casic.smarttube.R -import com.casic.smarttube.utils.LoadingDialogHub -import com.casic.smarttube.utils.RouteOnMap -import com.casic.smarttube.vm.AuthenticateViewModel -import com.casic.smarttube.vm.WellViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* - - -class WellDetailActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener { - - private lateinit var wellViewModel: WellViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel - private lateinit var aMap: AMap - - override fun initLayoutView(): Int = R.layout.activity_well_detail - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - leftBackView.setOnClickListener { finish() } - titleView.text = "井详情" - } - - override fun initData() { - val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - wellViewModel.obtainWellDetail(wellId) - - aMap = wellMapView.map - aMap.mapType = AMap.MAP_TYPE_NORMAL - val uiSettings = aMap.uiSettings - uiSettings.isCompassEnabled = true - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 - uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - - // marker 点击事件监听 - aMap.addOnMarkerClickListener(this) - } - - override fun onMarkerClick(marker: Marker?): Boolean { - if (marker != null) { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("操作提示") - .setMessage("确定要前往吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val latLng = marker.position - val lat = latLng.latitude.toString() - val lng = latLng.longitude.toString() - if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this@WellDetailActivity) - return - } - RouteOnMap.startNavigation( - this@WellDetailActivity, - marker.snippet, - LatLng(lat.toDouble(), lng.toDouble()) - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - return true - } - - override fun initEvent() { - wellViewModel.detailModel.observe(this, { - if (it.code == 200) { - val wellDetail = it.data!! - - wellNameView.text = wellDetail.wellName - wellTypeView.text = wellDetail.wellTypeName - wellCodeView.text = wellDetail.wellCode - ownerShipView.text = wellDetail.deptName - wellStateView.text = wellDetail.bfztName - wellDepthView.text = wellDetail.deep - //绑定窨井位置 - if (wellDetail.latGaode.isBlank() || wellDetail.lngGaode.isBlank()) { - wellLocationView.text = wellDetail.position - return@observe - } - val latLng = LatLng(wellDetail.latGaode.toDouble(), wellDetail.lngGaode.toDouble()) - val cameraPosition = CameraPosition(latLng, 10f, 0f, 0f) - val newCameraPosition = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(newCameraPosition, 1500, object : AMap.CancelableCallback { - override fun onFinish() { - //添加Marker - val markerOptions = MarkerOptions() - .snippet(wellDetail.position) - .position(latLng) - .icon(BitmapDescriptorFactory.fromResource(R.mipmap.well_location)) - .draggable(true) - aMap.addMarker(markerOptions) - } - - override fun onCancel() { - - } - }) - - authenticateViewModel.obtainAreaByDept(wellDetail.deptid) - authenticateViewModel.areaModel.observe(this, { areaModel -> - if (areaModel.code == 200) { - authenticateViewModel.obtainDistrict(areaModel.data.area) - } - }) - authenticateViewModel.districtModel.observe(this, { districtModel -> - if (districtModel.code == 200) { - districtModel.data.forEach { area -> - if (area.id == wellDetail.qu) { - authenticateViewModel.obtainStreet(area.id) - authenticateViewModel.streetModel.observe(this, { street -> - if (street.code == 200) { - street.data.forEach { streetData -> - if (streetData.id == wellDetail.area) { - wellLocationView.text = String.format( - "${area.name}${streetData.name}-${wellDetail.position}" - ) - } - } - } - }) - } - } - } - }) - } - }) - wellViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - /**地图相关*********/ - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - wellMapView.onCreate(savedInstanceState) - } - - override fun onResume() { - super.onResume() - wellMapView.onResume() - } - - override fun onPause() { - super.onPause() - wellMapView.onPause() - } - - override fun onDestroy() { - wellMapView.onDestroy() - super.onDestroy() - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - wellMapView.onSaveInstanceState(outState) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt deleted file mode 100644 index 4c5ac01..0000000 --- a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.smarttube.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smarttube.base.BaseApplication -import com.casic.smarttube.extensions.separateResponseCode -import com.casic.smarttube.extensions.toErrorMessage -import com.casic.smarttube.model.WellDetailModel -import com.casic.smarttube.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState - -class WellViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml deleted file mode 100644 index 898c1cf..0000000 --- a/app/src/main/res/drawable/ic_storage.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/app/libs/lite-release.aar b/app/libs/lite-release.aar index 5df8bf2..9f8c814 100644 --- a/app/libs/lite-release.aar +++ b/app/libs/lite-release.aar Binary files differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 06ee725..0885263 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,7 +43,6 @@ - @@ -55,6 +54,16 @@ android:name=".view.BigImageActivity" android:theme="@style/Theme.BigImageActivity" /> + + + + when (state) { LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "数据加载中...") else -> LoadingDialogHub.dismiss() } }) - return homeView } override fun onResume() { 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 0fa5afb..f9b3271 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/MinePageFragment.kt @@ -62,6 +62,29 @@ progressDialog.setCancelable(false) } + override fun observeRequestState() { + userViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") + is LoadState.Success -> { + "修改成功，请重新登录".show(requireContext()) + LoadingDialogHub.dismiss() + AuthenticationHelper.removeToken() + requireContext().navigatePageTo() + PageNavigationManager.finishAllActivity() + } + else -> LoadingDialogHub.dismiss() + } + }) + + versionViewModel.loadState.observe(this, { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { userImageView.setOnClickListener { "尽情期待～".show(requireContext()) @@ -154,20 +177,6 @@ } }) - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "修改中，请稍后") - is LoadState.Success -> { - "修改成功，请重新登录".show(requireContext()) - LoadingDialogHub.dismiss() - AuthenticationHelper.removeToken() - requireContext().navigatePageTo() - PageNavigationManager.finishAllActivity() - } - else -> LoadingDialogHub.dismiss() - } - }) - versionViewModel.versionResultModel.observe(this, { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本，无需更新".show(requireContext()) @@ -191,13 +200,6 @@ } }) - versionViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中，请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - loginViewModel.outResultModel.observe(this, { if (it.code == 200) { AuthenticationHelper.removeToken() 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 76fe75b..1143d7c 100644 --- a/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt +++ b/app/src/main/java/com/casic/smarttube/fragment/OverviewFragment.kt @@ -36,6 +36,10 @@ super.onResume() } + override fun observeRequestState() { + + } + override fun initEvent() { rightOptionView.setOnClickListener { groupViewModel.obtainProGroupList() diff --git a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java index abd8d76..78e1354 100644 --- a/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java +++ b/app/src/main/java/com/casic/smarttube/model/ProjectGroupModel.java @@ -42,8 +42,11 @@ } public static class DataModel { + private String unalive; private String lngGaode; private String latGaode; + private String alive; + private String totalDevice; private String installDate; private String wellCode; private String deviceCount; @@ -51,6 +54,14 @@ private String deptid; private String wellId; + public String getUnalive() { + return unalive; + } + + public void setUnalive(String unalive) { + this.unalive = unalive; + } + public String getLngGaode() { return lngGaode; } @@ -67,6 +78,22 @@ this.latGaode = latGaode; } + public String getAlive() { + return alive; + } + + public void setAlive(String alive) { + this.alive = alive; + } + + public String getTotalDevice() { + return totalDevice; + } + + public void setTotalDevice(String totalDevice) { + this.totalDevice = totalDevice; + } + public String getInstallDate() { return installDate; } diff --git a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java b/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java deleted file mode 100644 index 30f7f7a..0000000 --- a/app/src/main/java/com/casic/smarttube/model/WellDetailModel.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.casic.smarttube.model; - -public class WellDetailModel { - - private int code; - private DataBean data; - private String message; - private boolean success; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataBean getData() { - return data; - } - - public void setData(DataBean data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public boolean isSuccess() { - return success; - } - - public void setSuccess(boolean success) { - this.success = success; - } - - public static class DataBean { - private String area; - private String bfzt; - private String bfztName; - private String coordinateX; - private String coordinateY; - private String deep; - private String deptName; - private String deptid; - private String deviceCount; - private String id; - private String latBaidu; - private String latGaode; - private String lngBaidu; - private String lngGaode; - private String notes; - private String photos; - private String position; - private String qu; - private String responsibleDept; - private String responsibleDeptName; - private String ts; - private String valid; - private String wellCode; - private String wellFlag1; - private String wellFlag2; - private String wellFlag3; - private String wellName; - private String wellType; - private String wellTypeName; - - public String getArea() { - return area; - } - - public void setArea(String area) { - this.area = area; - } - - public String getBfzt() { - return bfzt; - } - - public void setBfzt(String bfzt) { - this.bfzt = bfzt; - } - - public String getBfztName() { - return bfztName; - } - - public void setBfztName(String bfztName) { - this.bfztName = bfztName; - } - - public String getCoordinateX() { - return coordinateX; - } - - public void setCoordinateX(String coordinateX) { - this.coordinateX = coordinateX; - } - - public String getCoordinateY() { - return coordinateY; - } - - public void setCoordinateY(String coordinateY) { - this.coordinateY = coordinateY; - } - - public String getDeep() { - return deep; - } - - public void setDeep(String deep) { - this.deep = deep; - } - - public String getDeptName() { - return deptName; - } - - public void setDeptName(String deptName) { - this.deptName = deptName; - } - - public String getDeptid() { - return deptid; - } - - public void setDeptid(String deptid) { - this.deptid = deptid; - } - - public String getDeviceCount() { - return deviceCount; - } - - public void setDeviceCount(String deviceCount) { - this.deviceCount = deviceCount; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getLatBaidu() { - return latBaidu; - } - - public void setLatBaidu(String latBaidu) { - this.latBaidu = latBaidu; - } - - public String getLatGaode() { - return latGaode; - } - - public void setLatGaode(String latGaode) { - this.latGaode = latGaode; - } - - public String getLngBaidu() { - return lngBaidu; - } - - public void setLngBaidu(String lngBaidu) { - this.lngBaidu = lngBaidu; - } - - public String getLngGaode() { - return lngGaode; - } - - public void setLngGaode(String lngGaode) { - this.lngGaode = lngGaode; - } - - public String getNotes() { - return notes; - } - - public void setNotes(String notes) { - this.notes = notes; - } - - public String getPhotos() { - return photos; - } - - public void setPhotos(String photos) { - this.photos = photos; - } - - public String getPosition() { - return position; - } - - public void setPosition(String position) { - this.position = position; - } - - public String getQu() { - return qu; - } - - public void setQu(String qu) { - this.qu = qu; - } - - public String getResponsibleDept() { - return responsibleDept; - } - - public void setResponsibleDept(String responsibleDept) { - this.responsibleDept = responsibleDept; - } - - public String getResponsibleDeptName() { - return responsibleDeptName; - } - - public void setResponsibleDeptName(String responsibleDeptName) { - this.responsibleDeptName = responsibleDeptName; - } - - public String getTs() { - return ts; - } - - public void setTs(String ts) { - this.ts = ts; - } - - public String getValid() { - return valid; - } - - public void setValid(String valid) { - this.valid = valid; - } - - public String getWellCode() { - return wellCode; - } - - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } - - public String getWellFlag1() { - return wellFlag1; - } - - public void setWellFlag1(String wellFlag1) { - this.wellFlag1 = wellFlag1; - } - - public String getWellFlag2() { - return wellFlag2; - } - - public void setWellFlag2(String wellFlag2) { - this.wellFlag2 = wellFlag2; - } - - public String getWellFlag3() { - return wellFlag3; - } - - public void setWellFlag3(String wellFlag3) { - this.wellFlag3 = wellFlag3; - } - - public String getWellName() { - return wellName; - } - - public void setWellName(String wellName) { - this.wellName = wellName; - } - - public String getWellType() { - return wellType; - } - - public void setWellType(String wellType) { - this.wellType = wellType; - } - - public String getWellTypeName() { - return wellTypeName; - } - - public void setWellTypeName(String wellTypeName) { - this.wellTypeName = wellTypeName; - } - } -} diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt index 5834f21..4034111 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitService.kt @@ -118,17 +118,6 @@ ): String /** - * 获取闸井详情 - * - * @param id 窨井ID - */ - @GET("/well/info") - suspend fun obtainWellDetail( - @Header("token") token: String, - @Query("id") id: String - ): String - - /** * 根据部门获取区ID * * @param deptId diff --git a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt index 3258f72..b8d3c92 100644 --- a/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/smarttube/utils/retrofit/RetrofitServiceManager.kt @@ -102,13 +102,6 @@ } /** - * 获取闸井详情 - */ - suspend fun obtainWellDetail(id: String): String { - return api.obtainWellDetail(AuthenticationHelper.token!!, id) - } - - /** * 根据部门获取区ID */ suspend fun obtainAreaByDept(deptId: String): String { diff --git a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt index 54f77e9..65bba6f 100644 --- a/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AboutUsActivity.kt @@ -24,6 +24,10 @@ versionCodeView.text = String.format("版本信息：V${BuildConfig.VERSION_NAME}") } + override fun observeRequestState() { + + } + override fun initEvent() { } 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 768b363..8bde48b 100644 --- a/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/AddDeviceActivity.kt @@ -82,7 +82,9 @@ uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) groupViewModel = ViewModelProvider(this).get(ProjectGroupViewModel::class.java) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "处理中，请稍后") diff --git a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt index 2b9c7b2..3864f16 100644 --- a/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/BigImageActivity.kt @@ -58,6 +58,10 @@ }) } + override fun observeRequestState() { + + } + override fun initEvent() { leftBackView.setOnClickListener { this.finish() } } 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 422480a..ac4de0b 100644 --- a/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/DeviceDetailActivity.kt @@ -1,7 +1,6 @@ package com.casic.smarttube.view import android.graphics.Color -import android.util.Log import android.view.View import androidx.lifecycle.ViewModelProvider import com.amap.api.maps.model.LatLng @@ -117,7 +116,9 @@ deviceBatteryView.text = device.cell } }) + } + override fun observeRequestState() { deviceViewModel.loadState.observe(this, { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") 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 7938806..c57e2c1 100644 --- a/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/GroupDeviceActivity.kt @@ -144,6 +144,15 @@ obtainDeviceListByPage() } + override fun observeRequestState() { + groupViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + override fun initEvent() { groupDeviceLayout.setOnRefreshListener { isRefresh = true @@ -183,13 +192,6 @@ } }) - groupViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - deviceViewModel.deleteResult.observe(this, { if (it.code == 200) { if (isDeleteAll) { 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 219f80d..a5b43ab 100644 --- a/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/HistoryDataActivity.kt @@ -42,6 +42,10 @@ deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { //默认选择近7天的数据 periodSpinner.setSelection(3) 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 c73bdee..ec9a374 100644 --- a/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/LoginActivity.kt @@ -34,6 +34,16 @@ userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + authenticateViewModel.loadState.observe(this, { + LoadingDialogHub.show(this, "登录中，请稍后") + }) + + loginViewModel.loadState.observe(this, { + LoadingDialogHub.dismiss() + }) + } + override fun initEvent() { loginButton.setOnClickListener { val account = userNameView.text.toString().trim() @@ -77,13 +87,7 @@ finish() } }) - loginViewModel.loadState.observe(this, { - LoadingDialogHub.dismiss() - }) } }) - authenticateViewModel.loadState.observe(this, { - LoadingDialogHub.show(this, "登录中，请稍后") - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt index b74bf07..4461757 100644 --- a/app/src/main/java/com/casic/smarttube/view/MainActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MainActivity.kt @@ -57,6 +57,10 @@ mainViewPager.offscreenPageLimit = fragmentList.size //缓存页数 } + override fun observeRequestState() { + + } + override fun initEvent() { mainViewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener { override fun onPageScrollStateChanged(state: Int) { diff --git a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt index bf8d310..0805438 100644 --- a/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/MapDeviceBriefActivity.kt @@ -29,6 +29,7 @@ private val kTag = "MapDeviceBriefActivity" private lateinit var deviceViewModel: DeviceViewModel private lateinit var aMap: AMap + private lateinit var params: ArrayList private val geocoderSearch by lazy { GeocodeSearch(this) } @@ -50,9 +51,21 @@ uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - val params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! + this.params = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! deviceViewModel = ViewModelProvider(this).get(DeviceViewModel::class.java) + } + + override fun observeRequestState() { + deviceViewModel.loadState.observe(this, { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") + else -> LoadingDialogHub.dismiss() + } + }) + } + + override fun initEvent() { deviceViewModel.obtainDeviceDetail(params[0], params[1]) deviceViewModel.deviceDetailModel.observe(this, { if (it.code == 200) { @@ -121,17 +134,6 @@ } } }) - - deviceViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - } /**地图相关*********/ diff --git a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt index 82fcafd..e872ef4 100644 --- a/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/PermissionActivity.kt @@ -1,46 +1,31 @@ package com.casic.smarttube.view +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity import com.amap.api.navi.NaviSetting import com.casic.smarttube.R import com.casic.smarttube.utils.LocaleConstant -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import kotlinx.android.synthetic.main.activity_permssion.* import pub.devrel.easypermissions.EasyPermissions import pub.devrel.easypermissions.EasyPermissions.PermissionCallbacks -class PermissionActivity : KotlinBaseActivity(), PermissionCallbacks { +class PermissionActivity : AppCompatActivity(), PermissionCallbacks { - override fun initLayoutView(): Int = R.layout.activity_permssion - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(true).init() - ImmerseStatusBarUtil.setColor(this, R.color.white.convertColor(this)) - } - - override fun initData() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) //判断是否有权限，如果版本大于5.1才需要判断（即6.0以上），其他则不需要判断。 if (EasyPermissions.hasPermissions(this, *LocaleConstant.USER_PERMISSIONS)) { startSplashScreenActivity() } else { - enterMainButton.setOnClickListener { - EasyPermissions.requestPermissions( - this@PermissionActivity, - resources.getString(R.string.app_name) + "需要获取存储相关权限", - LocaleConstant.PERMISSIONS_CODE, - *LocaleConstant.USER_PERMISSIONS - ) - } + EasyPermissions.requestPermissions( + this@PermissionActivity, + resources.getString(R.string.app_name) + "需要获取存储相关权限", + LocaleConstant.PERMISSIONS_CODE, + *LocaleConstant.USER_PERMISSIONS + ) } } - override fun initEvent() { - - } - private fun startSplashScreenActivity() { //先把导航隐私政策声明，后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt index 0f588b5..c639105 100644 --- a/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SelectLocationActivity.kt @@ -67,6 +67,10 @@ centerMarkerView.initInfoWindowsView(aMap) } + override fun observeRequestState() { + + } + override fun initEvent() { aMap.setOnMyLocationChangeListener(this) aMap.setOnMapLoadedListener(this) 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 5b00fc6..a675f0d 100644 --- a/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/smarttube/view/SplashScreenActivity.kt @@ -44,6 +44,10 @@ userDetailViewModel = ViewModelProvider(this).get(UserViewModel::class.java) } + override fun observeRequestState() { + + } + override fun initEvent() { countDownTimer.start() } diff --git a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt b/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt deleted file mode 100644 index e43839b..0000000 --- a/app/src/main/java/com/casic/smarttube/view/WellDetailActivity.kt +++ /dev/null @@ -1,188 +0,0 @@ -package com.casic.smarttube.view - -import android.os.Bundle -import androidx.lifecycle.ViewModelProvider -import com.amap.api.maps.AMap -import com.amap.api.maps.AMapOptions -import com.amap.api.maps.CameraUpdateFactory -import com.amap.api.maps.model.* -import com.casic.smarttube.R -import com.casic.smarttube.utils.LoadingDialogHub -import com.casic.smarttube.utils.RouteOnMap -import com.casic.smarttube.vm.AuthenticateViewModel -import com.casic.smarttube.vm.WellViewModel -import com.gyf.immersionbar.ImmersionBar -import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.utils.Constant -import com.pengxh.kt.lite.utils.ImmerseStatusBarUtil -import com.pengxh.kt.lite.vm.LoadState -import com.pengxh.kt.lite.widget.dialog.AlertControlDialog -import kotlinx.android.synthetic.main.activity_well_detail.* -import kotlinx.android.synthetic.main.include_base_title.* - - -class WellDetailActivity : KotlinBaseActivity(), AMap.OnMarkerClickListener { - - private lateinit var wellViewModel: WellViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel - private lateinit var aMap: AMap - - override fun initLayoutView(): Int = R.layout.activity_well_detail - - override fun setupTopBarLayout() { - ImmersionBar.with(this).statusBarDarkFont(false).init() - ImmerseStatusBarUtil.setColor(this, R.color.mainThemeColor.convertColor(this)) - leftBackView.setOnClickListener { finish() } - titleView.text = "井详情" - } - - override fun initData() { - val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - wellViewModel.obtainWellDetail(wellId) - - aMap = wellMapView.map - aMap.mapType = AMap.MAP_TYPE_NORMAL - val uiSettings = aMap.uiSettings - uiSettings.isCompassEnabled = true - uiSettings.zoomPosition = AMapOptions.ZOOM_POSITION_RIGHT_CENTER - uiSettings.isTiltGesturesEnabled = false//不许地图随手势倾斜角度 - uiSettings.isRotateGesturesEnabled = false//不允许地图旋转 - - // marker 点击事件监听 - aMap.addOnMarkerClickListener(this) - } - - override fun onMarkerClick(marker: Marker?): Boolean { - if (marker != null) { - AlertControlDialog.Builder() - .setContext(this) - .setTitle("操作提示") - .setMessage("确定要前往吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val latLng = marker.position - val lat = latLng.latitude.toString() - val lng = latLng.longitude.toString() - if (lat.isBlank() || lng.isBlank()) { - "窨井经纬度异常，无法开启导航".show(this@WellDetailActivity) - return - } - RouteOnMap.startNavigation( - this@WellDetailActivity, - marker.snippet, - LatLng(lat.toDouble(), lng.toDouble()) - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - return true - } - - override fun initEvent() { - wellViewModel.detailModel.observe(this, { - if (it.code == 200) { - val wellDetail = it.data!! - - wellNameView.text = wellDetail.wellName - wellTypeView.text = wellDetail.wellTypeName - wellCodeView.text = wellDetail.wellCode - ownerShipView.text = wellDetail.deptName - wellStateView.text = wellDetail.bfztName - wellDepthView.text = wellDetail.deep - //绑定窨井位置 - if (wellDetail.latGaode.isBlank() || wellDetail.lngGaode.isBlank()) { - wellLocationView.text = wellDetail.position - return@observe - } - val latLng = LatLng(wellDetail.latGaode.toDouble(), wellDetail.lngGaode.toDouble()) - val cameraPosition = CameraPosition(latLng, 10f, 0f, 0f) - val newCameraPosition = CameraUpdateFactory.newCameraPosition(cameraPosition) - aMap.animateCamera(newCameraPosition, 1500, object : AMap.CancelableCallback { - override fun onFinish() { - //添加Marker - val markerOptions = MarkerOptions() - .snippet(wellDetail.position) - .position(latLng) - .icon(BitmapDescriptorFactory.fromResource(R.mipmap.well_location)) - .draggable(true) - aMap.addMarker(markerOptions) - } - - override fun onCancel() { - - } - }) - - authenticateViewModel.obtainAreaByDept(wellDetail.deptid) - authenticateViewModel.areaModel.observe(this, { areaModel -> - if (areaModel.code == 200) { - authenticateViewModel.obtainDistrict(areaModel.data.area) - } - }) - authenticateViewModel.districtModel.observe(this, { districtModel -> - if (districtModel.code == 200) { - districtModel.data.forEach { area -> - if (area.id == wellDetail.qu) { - authenticateViewModel.obtainStreet(area.id) - authenticateViewModel.streetModel.observe(this, { street -> - if (street.code == 200) { - street.data.forEach { streetData -> - if (streetData.id == wellDetail.area) { - wellLocationView.text = String.format( - "${area.name}${streetData.name}-${wellDetail.position}" - ) - } - } - } - }) - } - } - } - }) - } - }) - wellViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") - else -> LoadingDialogHub.dismiss() - } - }) - } - - /**地图相关*********/ - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - wellMapView.onCreate(savedInstanceState) - } - - override fun onResume() { - super.onResume() - wellMapView.onResume() - } - - override fun onPause() { - super.onPause() - wellMapView.onPause() - } - - override fun onDestroy() { - wellMapView.onDestroy() - super.onDestroy() - } - - override fun onSaveInstanceState(outState: Bundle) { - super.onSaveInstanceState(outState) - wellMapView.onSaveInstanceState(outState) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt b/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt deleted file mode 100644 index 4c5ac01..0000000 --- a/app/src/main/java/com/casic/smarttube/vm/WellViewModel.kt +++ /dev/null @@ -1,38 +0,0 @@ -package com.casic.smarttube.vm - -import androidx.lifecycle.MutableLiveData -import com.casic.smarttube.base.BaseApplication -import com.casic.smarttube.extensions.separateResponseCode -import com.casic.smarttube.extensions.toErrorMessage -import com.casic.smarttube.model.WellDetailModel -import com.casic.smarttube.utils.retrofit.RetrofitServiceManager -import com.google.gson.Gson -import com.google.gson.reflect.TypeToken -import com.pengxh.kt.lite.extensions.launch -import com.pengxh.kt.lite.extensions.show -import com.pengxh.kt.lite.vm.BaseViewModel -import com.pengxh.kt.lite.vm.LoadState - -class WellViewModel : BaseViewModel() { - - private val gson = Gson() - val detailModel = MutableLiveData() - - fun obtainWellDetail(id: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainWellDetail(id) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - detailModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml deleted file mode 100644 index b612ce9..0000000 --- a/app/src/main/res/drawable/ic_camera.xml +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_device.xml b/app/src/main/res/drawable/ic_device.xml deleted file mode 100644 index 831c4c4..0000000 --- a/app/src/main/res/drawable/ic_device.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml deleted file mode 100644 index 52e376f..0000000 --- a/app/src/main/res/drawable/ic_location.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml deleted file mode 100644 index 898c1cf..0000000 --- a/app/src/main/res/drawable/ic_storage.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml deleted file mode 100644 index beba9ba..0000000 --- a/app/src/main/res/layout/activity_permssion.xml +++ /dev/null @@ -1,208 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -