diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index cd46551..898b189 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -37,7 +37,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -61,7 +61,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021002) } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index cd46551..898b189 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -37,7 +37,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -61,7 +61,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021002) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 5e19d4e..c885d5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -62,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index cd46551..898b189 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -37,7 +37,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -61,7 +61,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021002) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 5e19d4e..c885d5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -62,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 96bf7ab..8e9b2ee 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -28,6 +28,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index cd46551..898b189 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -37,7 +37,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -61,7 +61,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021002) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 5e19d4e..c885d5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -62,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 96bf7ab..8e9b2ee 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -28,6 +28,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index a398906..595f9cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -44,7 +44,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -62,6 +62,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index cd46551..898b189 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -37,7 +37,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -61,7 +61,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021002) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 5e19d4e..c885d5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -62,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 96bf7ab..8e9b2ee 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -28,6 +28,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index a398906..595f9cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -44,7 +44,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -62,6 +62,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt new file mode 100644 index 0000000..3c6cbed --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -0,0 +1,42 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.CustomerListModel +import com.casic.xz.meterage.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 CustomerViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val customerResult = MutableLiveData() + + fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCustomerList( + bussinessSize, customerName, customerNo, grade, offset + ) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + customerResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index cd46551..898b189 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -37,7 +37,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -61,7 +61,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021002) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 5e19d4e..c885d5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -62,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 96bf7ab..8e9b2ee 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -28,6 +28,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index a398906..595f9cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -44,7 +44,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -62,6 +62,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt new file mode 100644 index 0000000..3c6cbed --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -0,0 +1,42 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.CustomerListModel +import com.casic.xz.meterage.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 CustomerViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val customerResult = MutableLiveData() + + fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCustomerList( + bussinessSize, customerName, customerNo, grade, offset + ) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + customerResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index ba281ba..66be25d 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -73,7 +73,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -91,7 +91,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -127,7 +127,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -145,6 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index cd46551..898b189 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -37,7 +37,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -61,7 +61,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021002) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 5e19d4e..c885d5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -62,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 96bf7ab..8e9b2ee 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -28,6 +28,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index a398906..595f9cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -44,7 +44,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -62,6 +62,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt new file mode 100644 index 0000000..3c6cbed --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -0,0 +1,42 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.CustomerListModel +import com.casic.xz.meterage.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 CustomerViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val customerResult = MutableLiveData() + + fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCustomerList( + bussinessSize, customerName, customerNo, grade, offset + ) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + customerResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index ba281ba..66be25d 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -73,7 +73,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -91,7 +91,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -127,7 +127,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -145,6 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 138facb..65212d1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -57,7 +57,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -75,6 +75,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index cd46551..898b189 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -37,7 +37,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -61,7 +61,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021002) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 5e19d4e..c885d5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -62,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 96bf7ab..8e9b2ee 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -28,6 +28,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index a398906..595f9cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -44,7 +44,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -62,6 +62,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt new file mode 100644 index 0000000..3c6cbed --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -0,0 +1,42 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.CustomerListModel +import com.casic.xz.meterage.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 CustomerViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val customerResult = MutableLiveData() + + fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCustomerList( + bussinessSize, customerName, customerNo, grade, offset + ) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + customerResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index ba281ba..66be25d 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -73,7 +73,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -91,7 +91,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -127,7 +127,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -145,6 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 138facb..65212d1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -57,7 +57,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -75,6 +75,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index e25348a..9707c55 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -1,12 +1,14 @@ package com.casic.xz.meterage.vm import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.NoticeListModel import com.casic.xz.meterage.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 class NoticeViewModel : BaseViewModel() { @@ -37,6 +39,6 @@ ) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index cd46551..898b189 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -37,7 +37,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -61,7 +61,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021002) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 5e19d4e..c885d5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -62,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 96bf7ab..8e9b2ee 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -28,6 +28,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index a398906..595f9cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -44,7 +44,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -62,6 +62,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt new file mode 100644 index 0000000..3c6cbed --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -0,0 +1,42 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.CustomerListModel +import com.casic.xz.meterage.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 CustomerViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val customerResult = MutableLiveData() + + fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCustomerList( + bussinessSize, customerName, customerNo, grade, offset + ) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + customerResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index ba281ba..66be25d 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -73,7 +73,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -91,7 +91,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -127,7 +127,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -145,6 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 138facb..65212d1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -57,7 +57,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -75,6 +75,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index e25348a..9707c55 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -1,12 +1,14 @@ package com.casic.xz.meterage.vm import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.NoticeListModel import com.casic.xz.meterage.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 class NoticeViewModel : BaseViewModel() { @@ -37,6 +39,6 @@ ) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index 8af3351..f81af1d 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -47,7 +47,7 @@ // } // }, { // loadState.value = LoadState.Fail -// it.printStackTrace() +// it.cause.toString().show(BaseApplication.get()) // }) fun enter(sid: String, account: String, secretKey: String) = launch({ @@ -65,7 +65,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getUserInfo(account: String) = launch({ @@ -77,7 +77,7 @@ ) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) // fun updateUserInfo(userData: UserDetailModel.DataModel) = launch({ @@ -92,7 +92,7 @@ // } // }, { // loadState.value = LoadState.Fail -// it.printStackTrace() +// it.cause.toString().show(BaseApplication.get()) // }) // // fun out() = launch({ @@ -106,6 +106,6 @@ // response.toErrorMessage().show(BaseApplication.obtainInstance()) // } // }, { -// it.printStackTrace() +// it.cause.toString().show(BaseApplication.get()) // }) } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61bd7aa..eaea412 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -55,6 +55,7 @@ + diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 761da02..77afd2a 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -5,10 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.HomeGridAdapter import com.casic.xz.meterage.utils.LocaleConstant -import com.casic.xz.meterage.view.home.CapabilityActivity -import com.casic.xz.meterage.view.home.EquipmentActivity -import com.casic.xz.meterage.view.home.MeterageTrainActivity -import com.casic.xz.meterage.view.home.StandardDeviceActivity +import com.casic.xz.meterage.view.home.* import com.casic.xz.meterage.view.notice.NoticeListActivity import com.casic.xz.meterage.vm.NoticeViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -20,7 +17,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -34,7 +31,7 @@ } } } - }) + } val homeAdapter = HomeGridAdapter(requireContext(), LocaleConstant.HOME_FUNC_OPERATE) homeFuncRecyclerView.adapter = homeAdapter @@ -51,7 +48,7 @@ "计量培训" -> requireContext().navigatePageTo() // "合同发票" -> requireContext().navigatePageTo() // "业务统计" -> requireContext().navigatePageTo() -// "客户列表" -> requireContext().navigatePageTo() + "客户列表" -> requireContext().navigatePageTo() // "外场检测" -> requireContext().navigatePageTo() } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 56dc5ec..de0181c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -20,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this, { + userViewModel.userInfoResult.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -32,11 +32,11 @@ // .placeholder(R.mipmap.load_image_error) // .into(userAvatarView) } - }) + } val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { @@ -50,7 +50,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index e1fc6b8..94d57c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this, { + equipmentViewModel.standardDeviceDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -62,7 +62,7 @@ } remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index a64791f..f7f845f 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -17,7 +17,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this, { + equipmentViewModel.equipmentDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -79,7 +79,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index 73f927c..b8776f1 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this, { + meterageTrainViewModel.meterageTrainDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -32,7 +32,7 @@ contentView.text = data.trainContent remarkView.text = data.remark } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java new file mode 100644 index 0000000..aecdcb4 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/CustomerListModel.java @@ -0,0 +1,508 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class CustomerListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String addressArea; + private String addressAreaName; + private String addressCity; + private String addressCityName; + private String addressCountry; + private String addressCountryName; + private String addressProvince; + private String addressProvinceName; + private String bankAccount; + private String bankAccountNumber; + private String bankName; + private String briefName; + private String businessContent; + private String businessScope; + private String businessSize; + private String businessSizeName; + private String companySize; + private String companySizeName; + private String createTime; + private String createUser; + private String customerName; + private String customerNo; + private String customerUserList; + private String director; + private String email; + private String evaluation; + private String evaluationName; + private String fax; + private String fullAddress; + private String grade; + private String id; + private String invoiceArea; + private String invoiceAreaName; + private String invoiceCity; + private String invoiceCityName; + private String invoiceCountry; + private String invoiceCountryName; + private String invoiceFullAddress; + private String invoiceProvince; + private String invoiceProvinceName; + private int isDel; + private String minioFileName; + private String mobile; + private String phone; + private String postalCode; + private String remark; + private String taxNumber; + private String updateTime; + private String updateUser; + private String website; + + public String getAddressArea() { + return addressArea; + } + + public void setAddressArea(String addressArea) { + this.addressArea = addressArea; + } + + public String getAddressAreaName() { + return addressAreaName; + } + + public void setAddressAreaName(String addressAreaName) { + this.addressAreaName = addressAreaName; + } + + public String getAddressCity() { + return addressCity; + } + + public void setAddressCity(String addressCity) { + this.addressCity = addressCity; + } + + public String getAddressCityName() { + return addressCityName; + } + + public void setAddressCityName(String addressCityName) { + this.addressCityName = addressCityName; + } + + public String getAddressCountry() { + return addressCountry; + } + + public void setAddressCountry(String addressCountry) { + this.addressCountry = addressCountry; + } + + public String getAddressCountryName() { + return addressCountryName; + } + + public void setAddressCountryName(String addressCountryName) { + this.addressCountryName = addressCountryName; + } + + public String getAddressProvince() { + return addressProvince; + } + + public void setAddressProvince(String addressProvince) { + this.addressProvince = addressProvince; + } + + public String getAddressProvinceName() { + return addressProvinceName; + } + + public void setAddressProvinceName(String addressProvinceName) { + this.addressProvinceName = addressProvinceName; + } + + public String getBankAccount() { + return bankAccount; + } + + public void setBankAccount(String bankAccount) { + this.bankAccount = bankAccount; + } + + public String getBankAccountNumber() { + return bankAccountNumber; + } + + public void setBankAccountNumber(String bankAccountNumber) { + this.bankAccountNumber = bankAccountNumber; + } + + public String getBankName() { + return bankName; + } + + public void setBankName(String bankName) { + this.bankName = bankName; + } + + public String getBriefName() { + return briefName; + } + + public void setBriefName(String briefName) { + this.briefName = briefName; + } + + public String getBusinessContent() { + return businessContent; + } + + public void setBusinessContent(String businessContent) { + this.businessContent = businessContent; + } + + public String getBusinessScope() { + return businessScope; + } + + public void setBusinessScope(String businessScope) { + this.businessScope = businessScope; + } + + public String getBusinessSize() { + return businessSize; + } + + public void setBusinessSize(String businessSize) { + this.businessSize = businessSize; + } + + public String getBusinessSizeName() { + return businessSizeName; + } + + public void setBusinessSizeName(String businessSizeName) { + this.businessSizeName = businessSizeName; + } + + public String getCompanySize() { + return companySize; + } + + public void setCompanySize(String companySize) { + this.companySize = companySize; + } + + public String getCompanySizeName() { + return companySizeName; + } + + public void setCompanySizeName(String companySizeName) { + this.companySizeName = companySizeName; + } + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerNo() { + return customerNo; + } + + public void setCustomerNo(String customerNo) { + this.customerNo = customerNo; + } + + public String getCustomerUserList() { + return customerUserList; + } + + public void setCustomerUserList(String customerUserList) { + this.customerUserList = customerUserList; + } + + public String getDirector() { + return director; + } + + public void setDirector(String director) { + this.director = director; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getEvaluation() { + return evaluation; + } + + public void setEvaluation(String evaluation) { + this.evaluation = evaluation; + } + + public String getEvaluationName() { + return evaluationName; + } + + public void setEvaluationName(String evaluationName) { + this.evaluationName = evaluationName; + } + + public String getFax() { + return fax; + } + + public void setFax(String fax) { + this.fax = fax; + } + + public String getFullAddress() { + return fullAddress; + } + + public void setFullAddress(String fullAddress) { + this.fullAddress = fullAddress; + } + + public String getGrade() { + return grade; + } + + public void setGrade(String grade) { + this.grade = grade; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getInvoiceArea() { + return invoiceArea; + } + + public void setInvoiceArea(String invoiceArea) { + this.invoiceArea = invoiceArea; + } + + public String getInvoiceAreaName() { + return invoiceAreaName; + } + + public void setInvoiceAreaName(String invoiceAreaName) { + this.invoiceAreaName = invoiceAreaName; + } + + public String getInvoiceCity() { + return invoiceCity; + } + + public void setInvoiceCity(String invoiceCity) { + this.invoiceCity = invoiceCity; + } + + public String getInvoiceCityName() { + return invoiceCityName; + } + + public void setInvoiceCityName(String invoiceCityName) { + this.invoiceCityName = invoiceCityName; + } + + public String getInvoiceCountry() { + return invoiceCountry; + } + + public void setInvoiceCountry(String invoiceCountry) { + this.invoiceCountry = invoiceCountry; + } + + public String getInvoiceCountryName() { + return invoiceCountryName; + } + + public void setInvoiceCountryName(String invoiceCountryName) { + this.invoiceCountryName = invoiceCountryName; + } + + public String getInvoiceFullAddress() { + return invoiceFullAddress; + } + + public void setInvoiceFullAddress(String invoiceFullAddress) { + this.invoiceFullAddress = invoiceFullAddress; + } + + public String getInvoiceProvince() { + return invoiceProvince; + } + + public void setInvoiceProvince(String invoiceProvince) { + this.invoiceProvince = invoiceProvince; + } + + public String getInvoiceProvinceName() { + return invoiceProvinceName; + } + + public void setInvoiceProvinceName(String invoiceProvinceName) { + this.invoiceProvinceName = invoiceProvinceName; + } + + public int getIsDel() { + return isDel; + } + + public void setIsDel(int isDel) { + this.isDel = isDel; + } + + public String getMinioFileName() { + return minioFileName; + } + + public void setMinioFileName(String minioFileName) { + this.minioFileName = minioFileName; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getPhone() { + return phone; + } + + public void setPhone(String phone) { + this.phone = phone; + } + + public String getPostalCode() { + return postalCode; + } + + public void setPostalCode(String postalCode) { + this.postalCode = postalCode; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getTaxNumber() { + return taxNumber; + } + + public void setTaxNumber(String taxNumber) { + this.taxNumber = taxNumber; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUpdateUser() { + return updateUser; + } + + public void setUpdateUser(String updateUser) { + this.updateUser = updateUser; + } + + public String getWebsite() { + return website; + } + + public void setWebsite(String website) { + this.website = website; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java index e68ab5b..3c47e45 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/UserInfoModel.java @@ -57,7 +57,7 @@ private String name; private String phone; private List resourceUrls; - private List roleIds; + private List roleIds; private List roleNames; private List roleTips; private String scopeType; @@ -187,11 +187,11 @@ this.resourceUrls = resourceUrls; } - public List getRoleIds() { + public List getRoleIds() { return roleIds; } - public void setRoleIds(List roleIds) { + public void setRoleIds(List roleIds) { this.roleIds = roleIds; } diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index 3b8cb14..4451020 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -115,4 +115,15 @@ @Header("token") token: String, @Body requestBody: RequestBody ): String + + /** + * 获取客户列表 + */ + @POST("/customer/listPage") + suspend fun getCustomerList( + @Header("token") token: String, + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map + ): String } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index 3f7d42f..9cb70be 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -274,7 +274,12 @@ val offsetMap = HashMap() offsetMap["offset"] = offset - return api.getMeterageTrainList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + return api.getMeterageTrainList( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** @@ -288,4 +293,28 @@ ) return api.getMeterageTrainDetail(AuthenticationHelper.token!!, requestBody) } + + /** + * 获取客户列表 + */ + suspend fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("bussinessSize", bussinessSize) + paramObject.put("customerName", customerName) + paramObject.put("customerNo", customerNo) + paramObject.put("grade", grade) + + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + + val limitMap = HashMap() + limitMap["limit"] = LocaleConstant.PAGE_LIMIT + + val offsetMap = HashMap() + offsetMap["offset"] = offset + return api.getCustomerList(AuthenticationHelper.token!!, requestBody, limitMap, offsetMap) + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt index df0855c..8e9a355 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/LoginActivity.kt @@ -55,7 +55,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() - authenticateViewModel.keyModel.observe(this, { keyModel -> + authenticateViewModel.keyModel.observe(this) { keyModel -> if (keyModel.code == 200) { val keyString = keyModel.data!!.publicKey!! /** @@ -68,27 +68,27 @@ userPassword.toByteArray(), publicKey!! ) userViewModel.enter(keyModel.data!!.sid!!, userPhone, dataByPublicKey) - userViewModel.loginResult.observe(this, { + userViewModel.loginResult.observe(this) { if (it.code == 200) { AuthenticationHelper.saveToken(it.data!!.token!!) PageNavigationManager.finishAllActivity() navigatePageTo() } - }) + } } - }) + } } } override fun initLayoutView(): Int = R.layout.activity_login override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "登录中，请稍后") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index 7b9c9ec..dcbb471 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddb486c..ddc1258 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this, { + capabilityViewModel.capabilityDetailResult.observe(this) { if (it.code == 200) { val data = it.data!! @@ -35,7 +35,7 @@ explainView.text = data.priceDescription remarkView.text = data.remark } - }) + } } override fun initEvent() { @@ -45,12 +45,12 @@ override fun initLayoutView(): Int = R.layout.activity_capability_detail override fun observeRequestState() { - capabilityViewModel.loadState.observe(this, { + capabilityViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt new file mode 100644 index 0000000..defa8f9 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -0,0 +1,25 @@ +package com.casic.xz.meterage.view.home + +import com.casic.xz.meterage.R +import com.pengxh.kt.lite.base.KotlinBaseActivity + +class CustomerActivity : KotlinBaseActivity() { + + override fun initData() { + + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.activity_customer + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index d0cce96..81047a3 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020801) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_equipment override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun setupTopBarLayout() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index 0f45e25..b0dcb5d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -33,7 +33,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -57,7 +57,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021001) } - }) + } } override fun initEvent() { @@ -89,12 +89,12 @@ } override fun observeRequestState() { - meterageTrainViewModel.loadState.observe(this, { + meterageTrainViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } private fun getMeterageTrainList() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index cae747c..568556b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -58,7 +58,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020901) } - }) + } } override fun initEvent() { @@ -84,12 +84,12 @@ override fun initLayoutView(): Int = R.layout.activity_standard_device override fun observeRequestState() { - equipmentViewModel.loadState.observe(this, { + equipmentViewModel.loadState.observe(this) { when (it) { LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中...") else -> LoadingDialogHub.dismiss() } - }) + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 6fe0022..c60b69f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -33,7 +33,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] @@ -85,7 +85,7 @@ } } } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index 31c0490..7628b01 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this, { + noticeViewModel.noticeResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -59,7 +59,7 @@ } weakReferenceHandler.sendEmptyMessage(2023013101) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index e8a9fe5..aea442f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this, { + capabilityViewModel.capabilityResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020903) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index 5ee960d..5c2f743 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this, { + equipmentViewModel.equipmentResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -63,7 +63,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020802) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index cd46551..898b189 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -37,7 +37,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this, { + meterageTrainViewModel.meterageTrainResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -61,7 +61,7 @@ } weakReferenceHandler.sendEmptyMessage(2023021002) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 5e19d4e..c885d5c 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this, { + equipmentViewModel.standardDeviceResult.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -62,7 +62,7 @@ } weakReferenceHandler.sendEmptyMessage(2023020902) } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 96bf7ab..8e9b2ee 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -28,6 +28,6 @@ response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index a398906..595f9cb 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -44,7 +44,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getCapabilityDetail(id: String) = launch({ @@ -62,6 +62,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt new file mode 100644 index 0000000..3c6cbed --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -0,0 +1,42 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.CustomerListModel +import com.casic.xz.meterage.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 CustomerViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val customerResult = MutableLiveData() + + fun getCustomerList( + bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int + ) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getCustomerList( + bussinessSize, customerName, customerNo, grade, offset + ) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + customerResult.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index ba281ba..66be25d 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -73,7 +73,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getEquipmentDetail(id: String) = launch({ @@ -91,7 +91,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getStandardDeviceList( @@ -127,7 +127,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getStandardDeviceDetail(id: String) = launch({ @@ -145,6 +145,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 138facb..65212d1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -57,7 +57,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getMeterageTrainDetail(id: String) = launch({ @@ -75,6 +75,6 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index e25348a..9707c55 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -1,12 +1,14 @@ package com.casic.xz.meterage.vm import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication import com.casic.xz.meterage.extensions.separateResponseCode import com.casic.xz.meterage.model.NoticeListModel import com.casic.xz.meterage.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 class NoticeViewModel : BaseViewModel() { @@ -37,6 +39,6 @@ ) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index 8af3351..f81af1d 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -47,7 +47,7 @@ // } // }, { // loadState.value = LoadState.Fail -// it.printStackTrace() +// it.cause.toString().show(BaseApplication.get()) // }) fun enter(sid: String, account: String, secretKey: String) = launch({ @@ -65,7 +65,7 @@ } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun getUserInfo(account: String) = launch({ @@ -77,7 +77,7 @@ ) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) // fun updateUserInfo(userData: UserDetailModel.DataModel) = launch({ @@ -92,7 +92,7 @@ // } // }, { // loadState.value = LoadState.Fail -// it.printStackTrace() +// it.cause.toString().show(BaseApplication.get()) // }) // // fun out() = launch({ @@ -106,6 +106,6 @@ // response.toErrorMessage().show(BaseApplication.obtainInstance()) // } // }, { -// it.printStackTrace() +// it.cause.toString().show(BaseApplication.get()) // }) } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml new file mode 100644 index 0000000..77d9ef6 --- /dev/null +++ b/app/src/main/res/layout/activity_customer.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file