diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index e144850..a465783 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -28,14 +28,14 @@ enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - "登录成功".show(BaseApplication.obtainInstance()) + "登录成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun out() = launch({ @@ -46,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index e144850..a465783 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -28,14 +28,14 @@ enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - "登录成功".show(BaseApplication.obtainInstance()) + "登录成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun out() = launch({ @@ -46,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt index eaf90d2..fdab23e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -20,14 +20,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun confirmWorkOrder( @@ -40,14 +40,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun transferWorkOrder(id: String, userId: String) = launch({ @@ -56,14 +56,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ @@ -72,13 +72,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index e144850..a465783 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -28,14 +28,14 @@ enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - "登录成功".show(BaseApplication.obtainInstance()) + "登录成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun out() = launch({ @@ -46,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt index eaf90d2..fdab23e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -20,14 +20,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun confirmWorkOrder( @@ -40,14 +40,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun transferWorkOrder(id: String, userId: String) = launch({ @@ -56,14 +56,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ @@ -72,13 +72,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt index 6b088e5..303cc21 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index e144850..a465783 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -28,14 +28,14 @@ enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - "登录成功".show(BaseApplication.obtainInstance()) + "登录成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun out() = launch({ @@ -46,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt index eaf90d2..fdab23e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -20,14 +20,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun confirmWorkOrder( @@ -40,14 +40,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun transferWorkOrder(id: String, userId: String) = launch({ @@ -56,14 +56,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ @@ -72,13 +72,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt index 6b088e5..303cc21 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 2acc184..6b90a12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -12,16 +12,26 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState -import okhttp3.RequestBody class SearchOrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } val listModel = MutableLiveData() - fun obtainSearchResult(requestBody: RequestBody) = launch({ + fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainSearchResult(requestBody) + val response = RetrofitServiceManager.obtainSearchResult( + keywords, alarmContent, alarmLevel, jobStatus, deptId, beginTime, endTime, offset + ) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success @@ -30,10 +40,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index e144850..a465783 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -28,14 +28,14 @@ enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - "登录成功".show(BaseApplication.obtainInstance()) + "登录成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun out() = launch({ @@ -46,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt index eaf90d2..fdab23e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -20,14 +20,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun confirmWorkOrder( @@ -40,14 +40,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun transferWorkOrder(id: String, userId: String) = launch({ @@ -56,14 +56,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ @@ -72,13 +72,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt index 6b088e5..303cc21 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 2acc184..6b90a12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -12,16 +12,26 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState -import okhttp3.RequestBody class SearchOrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } val listModel = MutableLiveData() - fun obtainSearchResult(requestBody: RequestBody) = launch({ + fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainSearchResult(requestBody) + val response = RetrofitServiceManager.obtainSearchResult( + keywords, alarmContent, alarmLevel, jobStatus, deptId, beginTime, endTime, offset + ) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success @@ -30,10 +40,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 8149543..63d5008 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -30,10 +30,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index e144850..a465783 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -28,14 +28,14 @@ enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - "登录成功".show(BaseApplication.obtainInstance()) + "登录成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun out() = launch({ @@ -46,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt index eaf90d2..fdab23e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -20,14 +20,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun confirmWorkOrder( @@ -40,14 +40,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun transferWorkOrder(id: String, userId: String) = launch({ @@ -56,14 +56,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ @@ -72,13 +72,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt index 6b088e5..303cc21 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 2acc184..6b90a12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -12,16 +12,26 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState -import okhttp3.RequestBody class SearchOrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } val listModel = MutableLiveData() - fun obtainSearchResult(requestBody: RequestBody) = launch({ + fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainSearchResult(requestBody) + val response = RetrofitServiceManager.obtainSearchResult( + keywords, alarmContent, alarmLevel, jobStatus, deptId, beginTime, endTime, offset + ) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success @@ -30,10 +40,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 8149543..63d5008 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -30,10 +30,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt index f66b2a2..aad1256 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -41,7 +41,7 @@ SaveKeyValues.removeKey(LocaleConstant.USER_DETAIL_MODEL) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) /** @@ -55,10 +55,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun changePassword(oldPwd: String, newPwd: String) = launch({ @@ -67,14 +67,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功,请重新登录".show(BaseApplication.obtainInstance()) + "修改成功,请重新登录".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun updateVersion() = launch({ @@ -88,10 +88,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index e144850..a465783 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -28,14 +28,14 @@ enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - "登录成功".show(BaseApplication.obtainInstance()) + "登录成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun out() = launch({ @@ -46,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt index eaf90d2..fdab23e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -20,14 +20,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun confirmWorkOrder( @@ -40,14 +40,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun transferWorkOrder(id: String, userId: String) = launch({ @@ -56,14 +56,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ @@ -72,13 +72,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt index 6b088e5..303cc21 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 2acc184..6b90a12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -12,16 +12,26 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState -import okhttp3.RequestBody class SearchOrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } val listModel = MutableLiveData() - fun obtainSearchResult(requestBody: RequestBody) = launch({ + fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainSearchResult(requestBody) + val response = RetrofitServiceManager.obtainSearchResult( + keywords, alarmContent, alarmLevel, jobStatus, deptId, beginTime, endTime, offset + ) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success @@ -30,10 +40,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 8149543..63d5008 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -30,10 +30,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt index f66b2a2..aad1256 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -41,7 +41,7 @@ SaveKeyValues.removeKey(LocaleConstant.USER_DETAIL_MODEL) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) /** @@ -55,10 +55,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun changePassword(oldPwd: String, newPwd: String) = launch({ @@ -67,14 +67,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功,请重新登录".show(BaseApplication.obtainInstance()) + "修改成功,请重新登录".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun updateVersion() = launch({ @@ -88,10 +88,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 660274d..a0d753f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -35,10 +35,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainAllWell() = launch({ @@ -49,9 +49,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index e144850..a465783 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -28,14 +28,14 @@ enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - "登录成功".show(BaseApplication.obtainInstance()) + "登录成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun out() = launch({ @@ -46,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt index eaf90d2..fdab23e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -20,14 +20,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun confirmWorkOrder( @@ -40,14 +40,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun transferWorkOrder(id: String, userId: String) = launch({ @@ -56,14 +56,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ @@ -72,13 +72,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt index 6b088e5..303cc21 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 2acc184..6b90a12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -12,16 +12,26 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState -import okhttp3.RequestBody class SearchOrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } val listModel = MutableLiveData() - fun obtainSearchResult(requestBody: RequestBody) = launch({ + fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainSearchResult(requestBody) + val response = RetrofitServiceManager.obtainSearchResult( + keywords, alarmContent, alarmLevel, jobStatus, deptId, beginTime, endTime, offset + ) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success @@ -30,10 +40,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 8149543..63d5008 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -30,10 +30,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt index f66b2a2..aad1256 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -41,7 +41,7 @@ SaveKeyValues.removeKey(LocaleConstant.USER_DETAIL_MODEL) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) /** @@ -55,10 +55,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun changePassword(oldPwd: String, newPwd: String) = launch({ @@ -67,14 +67,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功,请重新登录".show(BaseApplication.obtainInstance()) + "修改成功,请重新登录".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun updateVersion() = launch({ @@ -88,10 +88,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 660274d..a0d753f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -35,10 +35,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainAllWell() = launch({ @@ -49,9 +49,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index f70795b..0cad03e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -39,10 +39,10 @@ map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) private fun convertString(value: String): String { @@ -61,10 +61,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainWellDetail(id: String) = launch({ @@ -78,11 +78,11 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainOperationResult(id: String, state: String) = launch({ @@ -91,17 +91,17 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "操作成功".show(BaseApplication.obtainInstance()) + "操作成功".show(BaseApplication.get()) commonResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainMonitorResult(id: String) = launch({ @@ -115,10 +115,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index e144850..a465783 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -28,14 +28,14 @@ enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - "登录成功".show(BaseApplication.obtainInstance()) + "登录成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun out() = launch({ @@ -46,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt index eaf90d2..fdab23e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -20,14 +20,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun confirmWorkOrder( @@ -40,14 +40,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun transferWorkOrder(id: String, userId: String) = launch({ @@ -56,14 +56,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ @@ -72,13 +72,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt index 6b088e5..303cc21 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 2acc184..6b90a12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -12,16 +12,26 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState -import okhttp3.RequestBody class SearchOrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } val listModel = MutableLiveData() - fun obtainSearchResult(requestBody: RequestBody) = launch({ + fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainSearchResult(requestBody) + val response = RetrofitServiceManager.obtainSearchResult( + keywords, alarmContent, alarmLevel, jobStatus, deptId, beginTime, endTime, offset + ) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success @@ -30,10 +40,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 8149543..63d5008 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -30,10 +30,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt index f66b2a2..aad1256 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -41,7 +41,7 @@ SaveKeyValues.removeKey(LocaleConstant.USER_DETAIL_MODEL) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) /** @@ -55,10 +55,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun changePassword(oldPwd: String, newPwd: String) = launch({ @@ -67,14 +67,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功,请重新登录".show(BaseApplication.obtainInstance()) + "修改成功,请重新登录".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun updateVersion() = launch({ @@ -88,10 +88,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 660274d..a0d753f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -35,10 +35,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainAllWell() = launch({ @@ -49,9 +49,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index f70795b..0cad03e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -39,10 +39,10 @@ map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) private fun convertString(value: String): String { @@ -61,10 +61,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainWellDetail(id: String) = launch({ @@ -78,11 +78,11 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainOperationResult(id: String, state: String) = launch({ @@ -91,17 +91,17 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "操作成功".show(BaseApplication.obtainInstance()) + "操作成功".show(BaseApplication.get()) commonResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainMonitorResult(id: String) = launch({ @@ -115,10 +115,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index 6417e90..db84680 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -25,10 +25,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainNotAcceptOderList(page: Int) = launch({ @@ -39,10 +39,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainNotHandleOderList(page: Int) = launch({ @@ -53,9 +53,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e3e3bf8..2a13931 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -21,8 +21,8 @@ applicationId "com.casic.app.smartwell" minSdkVersion 23 targetSdkVersion 31 - versionCode 10 - versionName "1.10.0" + versionCode 11 + versionName "1.1.1" manifestPlaceholders = [GETUI_APPID: "HKv8K9qARd6WckZ1o2Vbu4"] @@ -32,7 +32,7 @@ /** * 多渠道打包 - * 1、applicationId = 软件-包名 + * 1、applicationId = 软件包名 * */ productFlavors { zq { diff --git a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt index 87ef3d2..5431506 100644 --- a/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt +++ b/app/src/main/java/com/casic/app/smartwell/base/BaseApplication.kt @@ -14,16 +14,16 @@ private val kTag = "BaseApplication" companion object { - private var instance: BaseApplication by Delegates.notNull() + private var application: BaseApplication by Delegates.notNull() - fun obtainInstance() = instance + fun get() = application private lateinit var daoSession: DaoSession } override fun onCreate() { super.onCreate() - instance = this + application = this SaveKeyValues.initSharedPreferences(this) //推送 PushManager.getInstance().initialize(this) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt index 42cce73..e01cd6d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/HomePageFragment.kt @@ -95,7 +95,7 @@ LoadingDialogHub.show(requireActivity(), "数据加载中,请稍后...") //获取所有窨井数据 wellListViewModel.obtainAllWell() - wellListViewModel.totalWellModel.observe(viewLifecycleOwner, { + wellListViewModel.totalWellModel.observe(viewLifecycleOwner) { if (it.code == 200) { val latitudeList: MutableList = ArrayList() val longitudeList: MutableList = ArrayList() @@ -141,20 +141,20 @@ val cameraUpdate = CameraUpdateFactory.newCameraPosition(cameraPosition) aMap.animateCamera(cameraUpdate, 1500, null) } - }) + } //地图初始化 initMap(savedInstanceState) //获取窨井监控数据 - wellViewModel.countResultModel.observe(viewLifecycleOwner, { + wellViewModel.countResultModel.observe(viewLifecycleOwner) { homeView.deployedWellView.text = it["bfWell"] homeView.unDeployedWellView.text = it["cfWell"] homeView.allWellDataView.text = it["total"] - }) + } //获取工单数据 - workOrderViewModel.resultModel.observe(viewLifecycleOwner, { + workOrderViewModel.resultModel.observe(viewLifecycleOwner) { if (it["beforeGet"]!!.length > 4 || it["beforeConfirm"]!!.length > 4 || it["inHandle"]!!.length > 4 || it["over"]!!.length > 4 ) { @@ -167,7 +167,7 @@ homeView.undeterminedDataView.text = it["beforeConfirm"] homeView.inHandleDataView.text = it["inHandle"] homeView.completedDataView.text = it["over"] - }) + } //首页功能块 val homeRecycleAdapter = HomeRecycleAdapter(requireContext()) diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt index f12c575..111670d 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/MinePageFragment.kt @@ -43,7 +43,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] //初始化下载对话框 progressDialog = ProgressDialog(requireContext()) progressDialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL) @@ -53,43 +53,8 @@ //默认打开通知 noticeSwitch.isChecked = SaveKeyValues.getValue("noticeSwitchStatus", true) as Boolean - } - override fun observeRequestState() { - userViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - userDetailLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - helpCenterLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - aboutUsLayout.setOnClickListener { - requireContext().navigatePageTo() - } - - updateVersionLayout.setOnClickListener { - userViewModel.updateVersion() - } - - noticeSwitch.setOnCheckedChangeListener { buttonView, isChecked -> - if (isChecked) { - Log.d(kTag, "initEvent: 打开") - } else { - Log.d(kTag, "initEvent: 关闭") - } - } - - userViewModel.versionResultModel.observe(this, { + userViewModel.versionResultModel.observe(this) { if (BuildConfig.VERSION_NAME == it.version) { "已是最新版本,无需更新".show(requireContext()) } else { @@ -110,13 +75,48 @@ } }).build().show() } - }) + } - userViewModel.userDetailModel.observe(this, { + userViewModel.userDetailModel.observe(this) { if (it.code == 200) { userNameView.text = it.data.name } - }) + } + } + + override fun observeRequestState() { + userViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "检查版本中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + userDetailLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + helpCenterLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + aboutUsLayout.setOnClickListener { + requireContext().navigatePageTo() + } + + updateVersionLayout.setOnClickListener { + userViewModel.updateVersion() + } + + noticeSwitch.setOnCheckedChangeListener { _, isChecked -> + if (isChecked) { + Log.d(kTag, "initEvent: 打开") + } else { + Log.d(kTag, "initEvent: 关闭") + } + } } override fun onResume() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt index df89ee4..6804e83 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderCompletedFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + completedOrderLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + completedOrderLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033101) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - completedOrderLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - completedOrderLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033101) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt index f341b9f..c80cdfa 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderInHandleFragment.kt @@ -36,8 +36,47 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + inHandleLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + inHandleLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033002) + } + } + + workOrderViewModel.detailModel.observe(this) { + if (it.code == 200) { + val orderDetail = it.data!![0] + val orderFlow = orderDetail.flow!! + if (orderFlow.size != 0) { + TimeLineBottomSheet.Builder().setContext(requireContext()) + .setFlowItems(orderFlow).build().show() + } else { + "该工单无流转记录".show(requireContext()) + } + } + } } override fun onResume() { @@ -62,45 +101,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - inHandleLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - inHandleLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033002) - } - }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "该工单无流转记录".show(requireContext()) - } - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt index 7f1a260..4c4aebd 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -33,7 +33,32 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022033001) + } + } } override fun onResume() { @@ -58,32 +83,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022033001) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt index beaf4c5..1e89564 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OrderNotProcessedFragment.kt @@ -39,49 +39,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -105,7 +66,46 @@ } weakReferenceHandler.sendEmptyMessage(2022032901) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt index ee70413..2f0da97 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotAcceptFragment.kt @@ -42,49 +42,10 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] - override fun onResume() { - super.onResume() - pageIndex = 1 - obtainWorkOrderList() - } - - override fun observeRequestState() { - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - notProcessedAdapter.notifyItemRemoved(clickedPosition) - notProcessedAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - notProcessedLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainWorkOrderList() - } - notProcessedLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainWorkOrderList() - } - - workOrderListViewModel.resultModel.observe(this, { + workOrderListViewModel.resultModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -108,7 +69,46 @@ } weakReferenceHandler.sendEmptyMessage(2022040601) } - }) + } + } + + override fun onResume() { + super.onResume() + pageIndex = 1 + obtainWorkOrderList() + } + + override fun observeRequestState() { + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(requireActivity(), "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + notProcessedAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + notProcessedLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainWorkOrderList() + } + notProcessedLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainWorkOrderList() + } } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt index c9dbad1..95e85bf 100644 --- a/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt +++ b/app/src/main/java/com/casic/app/smartwell/fragment/OvertimeNotHandleFragment.kt @@ -36,7 +36,33 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) - workOrderListViewModel = ViewModelProvider(this).get(WorkOrderListViewModel::class.java) + workOrderListViewModel = ViewModelProvider(this)[WorkOrderListViewModel::class.java] + + workOrderListViewModel.resultModel.observe(this) { + if (it.code == 200) { + val dataRows = it.data?.rows + when { + isRefresh -> { + dataBeans.clear() + dataBeans = dataRows!! + notConfirmedLayout.finishRefresh() + isRefresh = false + } + isLoadMore -> { + if (dataRows?.size == 0) { + "到底了,别拉了".show(requireContext()) + } + dataBeans.addAll(dataRows!!) + notConfirmedLayout.finishLoadMore() + isLoadMore = false + } + else -> { + dataBeans = dataRows!! + } + } + weakReferenceHandler.sendEmptyMessage(2022040801) + } + } } override fun onResume() { @@ -61,32 +87,6 @@ pageIndex++ obtainWorkOrderList() } - - workOrderListViewModel.resultModel.observe(this, { - if (it.code == 200) { - val dataRows = it.data?.rows - when { - isRefresh -> { - dataBeans.clear() - dataBeans = dataRows!! - notConfirmedLayout.finishRefresh() - isRefresh = false - } - isLoadMore -> { - if (dataRows?.size == 0) { - "到底了,别拉了".show(requireContext()) - } - dataBeans.addAll(dataRows!!) - notConfirmedLayout.finishLoadMore() - isLoadMore = false - } - else -> { - dataBeans = dataRows!! - } - } - weakReferenceHandler.sendEmptyMessage(2022040801) - } - }) } private fun obtainWorkOrderList() { diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java index 58ba4d8..bd3adf3 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoMaster.java @@ -6,30 +6,25 @@ import android.util.Log; import org.greenrobot.greendao.AbstractDaoMaster; +import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseOpenHelper; -import org.greenrobot.greendao.database.StandardDatabase; import org.greenrobot.greendao.identityscope.IdentityScopeType; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - /** * Master of DAO (schema version 2): knows all DAOs. */ public class DaoMaster extends AbstractDaoMaster { public static final int SCHEMA_VERSION = 2; - /** - * Creates underlying database table using DAOs. - */ + /** Creates underlying database table using DAOs. */ public static void createAllTables(Database db, boolean ifNotExists) { NoticeLocaleBeanDao.createTable(db, ifNotExists); } - /** - * Drops underlying database table using DAOs. - */ + /** Drops underlying database table using DAOs. */ public static void dropAllTables(Database db, boolean ifExists) { NoticeLocaleBeanDao.dropTable(db, ifExists); } @@ -80,9 +75,7 @@ } } - /** - * WARNING: Drops all table on Upgrade! Use only during development. - */ + /** WARNING: Drops all table on Upgrade! Use only during development. */ public static class DevOpenHelper extends OpenHelper { public DevOpenHelper(Context context, String name) { super(context, name); diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java index c574564..196fe19 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/DaoSession.java @@ -1,6 +1,6 @@ package com.casic.app.smartwell.greendao; -import com.casic.app.smartwell.model.NoticeLocaleBean; +import java.util.Map; import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.AbstractDaoSession; @@ -8,13 +8,15 @@ import org.greenrobot.greendao.identityscope.IdentityScopeType; import org.greenrobot.greendao.internal.DaoConfig; -import java.util.Map; +import com.casic.app.smartwell.model.NoticeLocaleBean; + +import com.casic.app.smartwell.greendao.NoticeLocaleBeanDao; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. /** * {@inheritDoc} - * + * * @see org.greenrobot.greendao.AbstractDaoSession */ public class DaoSession extends AbstractDaoSession { @@ -34,7 +36,7 @@ registerDao(NoticeLocaleBean.class, noticeLocaleBeanDao); } - + public void clear() { noticeLocaleBeanDaoConfig.clearIdentityScope(); } diff --git a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java index fe1c844..eae1c85 100644 --- a/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java +++ b/app/src/main/java/com/casic/app/smartwell/greendao/NoticeLocaleBeanDao.java @@ -3,19 +3,18 @@ import android.database.Cursor; import android.database.sqlite.SQLiteStatement; -import com.casic.app.smartwell.model.NoticeLocaleBean; - import org.greenrobot.greendao.AbstractDao; import org.greenrobot.greendao.Property; +import org.greenrobot.greendao.internal.DaoConfig; import org.greenrobot.greendao.database.Database; import org.greenrobot.greendao.database.DatabaseStatement; -import org.greenrobot.greendao.internal.DaoConfig; + +import com.casic.app.smartwell.model.NoticeLocaleBean; // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. - -/** +/** * DAO for table "NOTICE_LOCALE_BEAN". - */ +*/ public class NoticeLocaleBeanDao extends AbstractDao { public static final String TABLENAME = "NOTICE_LOCALE_BEAN"; @@ -43,16 +42,14 @@ public NoticeLocaleBeanDao(DaoConfig config) { super(config); } - + public NoticeLocaleBeanDao(DaoConfig config, DaoSession daoSession) { super(config, daoSession); } - /** - * Creates the underlying database table. - */ + /** Creates the underlying database table. */ public static void createTable(Database db, boolean ifNotExists) { - String constraint = ifNotExists ? "IF NOT EXISTS " : ""; + String constraint = ifNotExists? "IF NOT EXISTS ": ""; db.execSQL("CREATE TABLE " + constraint + "\"NOTICE_LOCALE_BEAN\" (" + // "\"_id\" INTEGER PRIMARY KEY AUTOINCREMENT ," + // 0: id "\"MESSAGE_ID\" TEXT UNIQUE ," + // 1: messageId @@ -68,9 +65,7 @@ "\"NOTICE_TIME\" TEXT);"); // 11: noticeTime } - /** - * Drops the underlying database table. - */ + /** Drops the underlying database table. */ public static void dropTable(Database db, boolean ifExists) { String sql = "DROP TABLE " + (ifExists ? "IF EXISTS " : "") + "\"NOTICE_LOCALE_BEAN\""; db.execSQL(sql); @@ -79,62 +74,62 @@ @Override protected final void bindValues(DatabaseStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -144,62 +139,62 @@ @Override protected final void bindValues(SQLiteStatement stmt, NoticeLocaleBean entity) { stmt.clearBindings(); - + Long id = entity.getId(); if (id != null) { stmt.bindLong(1, id); } - + String messageId = entity.getMessageId(); if (messageId != null) { stmt.bindString(2, messageId); } - + String appid = entity.getAppid(); if (appid != null) { stmt.bindString(3, appid); } - + String clientId = entity.getClientId(); if (clientId != null) { stmt.bindString(4, clientId); } - + String taskId = entity.getTaskId(); if (taskId != null) { stmt.bindString(5, taskId); } - + String userId = entity.getUserId(); if (userId != null) { stmt.bindString(6, userId); } - + String title = entity.getTitle(); if (title != null) { stmt.bindString(7, title); } - + String content = entity.getContent(); if (content != null) { stmt.bindString(8, content); } - + String deviceCode = entity.getDeviceCode(); if (deviceCode != null) { stmt.bindString(9, deviceCode); } - + String jobId = entity.getJobId(); if (jobId != null) { stmt.bindString(10, jobId); } - + String isRead = entity.getIsRead(); if (isRead != null) { stmt.bindString(11, isRead); } - + String noticeTime = entity.getNoticeTime(); if (noticeTime != null) { stmt.bindString(12, noticeTime); @@ -209,27 +204,27 @@ @Override public Long readKey(Cursor cursor, int offset) { return cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0); - } + } @Override public NoticeLocaleBean readEntity(Cursor cursor, int offset) { NoticeLocaleBean entity = new NoticeLocaleBean( // - cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id - cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId - cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid - cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId - cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId - cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId - cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title - cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content - cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode - cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId - cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead - cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime + cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0), // id + cursor.isNull(offset + 1) ? null : cursor.getString(offset + 1), // messageId + cursor.isNull(offset + 2) ? null : cursor.getString(offset + 2), // appid + cursor.isNull(offset + 3) ? null : cursor.getString(offset + 3), // clientId + cursor.isNull(offset + 4) ? null : cursor.getString(offset + 4), // taskId + cursor.isNull(offset + 5) ? null : cursor.getString(offset + 5), // userId + cursor.isNull(offset + 6) ? null : cursor.getString(offset + 6), // title + cursor.isNull(offset + 7) ? null : cursor.getString(offset + 7), // content + cursor.isNull(offset + 8) ? null : cursor.getString(offset + 8), // deviceCode + cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9), // jobId + cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10), // isRead + cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11) // noticeTime ); return entity; } - + @Override public void readEntity(Cursor cursor, NoticeLocaleBean entity, int offset) { entity.setId(cursor.isNull(offset + 0) ? null : cursor.getLong(offset + 0)); @@ -244,17 +239,17 @@ entity.setJobId(cursor.isNull(offset + 9) ? null : cursor.getString(offset + 9)); entity.setIsRead(cursor.isNull(offset + 10) ? null : cursor.getString(offset + 10)); entity.setNoticeTime(cursor.isNull(offset + 11) ? null : cursor.getString(offset + 11)); - } - + } + @Override protected final Long updateKeyAfterInsert(NoticeLocaleBean entity, long rowId) { entity.setId(rowId); return rowId; } - + @Override public Long getKey(NoticeLocaleBean entity) { - if (entity != null) { + if(entity != null) { return entity.getId(); } else { return null; @@ -270,5 +265,5 @@ protected final boolean isEntityUpdateable() { return true; } - + } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt index 33fe989..c4cd24c 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/DataBaseManager.kt @@ -13,7 +13,7 @@ } } - private val daoSession = BaseApplication.obtainInstance().obtainDaoSession() + private val daoSession = BaseApplication.get().obtainDaoSession() fun insertNotice( messageId: String, appId: String, clientId: String, @@ -35,7 +35,7 @@ noticeLocaleBean.noticeTime = noticeTime daoSession.noticeLocaleBeanDao.insert(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun deleteNoticeByMessageId(userId: String, messageId: String) { @@ -44,7 +44,7 @@ ).list() daoSession.noticeLocaleBeanDao.deleteInTx(result) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } fun updateNoticeByMessageId(userId: String, messageId: String) { @@ -54,7 +54,7 @@ noticeLocaleBean.isRead = "1" daoSession.noticeLocaleBeanDao.update(noticeLocaleBean) //角标设置 - BadeHelper.setBadgeNum(BaseApplication.obtainInstance(), queryUnReadNotice(userId)) + BadeHelper.setBadgeNum(BaseApplication.get(), queryUnReadNotice(userId)) } diff --git a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt index f9aee19..ce4f0fb 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/LocaleConstant.kt @@ -25,6 +25,7 @@ const val PASSWORD = "password" const val DEFAULT_SERVER_CONFIG = "defaultServerConfig" const val DEFAULT_SERVER = "http://60.208.121.150:5001" +// const val DEFAULT_SERVER = "http://111.198.10.15:11308" const val USER_DETAIL_MODEL = "userDetailModel" const val APP_AUTHORITY = "com.casic.zq.smartwell.fileprovider" diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt index 160128b..7af353f 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitService.kt @@ -240,7 +240,9 @@ @POST("/job/searchList") suspend fun obtainSearchResult( @Header("token") token: String, - @Body requestBody: RequestBody + @Body requestBody: RequestBody, + @QueryMap limit: Map, + @QueryMap offset: Map ): String /** diff --git a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt index ec3c442..da21266 100644 --- a/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/app/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -193,8 +193,40 @@ /** * 查询工单 */ - suspend fun obtainSearchResult(requestBody: RequestBody): String { - return api.obtainSearchResult(AuthenticationHelper.token!!, requestBody) + suspend fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ): String { + val paramObject = JSONObject() + paramObject.put("keywords", keywords) + paramObject.put("alarmContent", alarmContent) + paramObject.put("alarmLevel", alarmLevel) + paramObject.put("jobStatus", jobStatus) + paramObject.put("deptId", deptId) + paramObject.put("beginTime", beginTime) + paramObject.put("endTime", endTime) + 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.obtainSearchResult( + AuthenticationHelper.token!!, + requestBody, + limitMap, + offsetMap + ) } /** diff --git a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt index 9e5cdd9..517b04d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/ChangePasswordActivity.kt @@ -34,11 +34,11 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - userViewModel.loadState.observe(this, { + userViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "修改中,请稍后") is LoadState.Success -> { @@ -49,7 +49,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt index 3429375..d38039e 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/LoginActivity.kt @@ -4,7 +4,10 @@ import android.os.CountDownTimer import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R -import com.casic.app.smartwell.utils.* +import com.casic.app.smartwell.utils.AuthenticationHelper +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.utils.LocaleConstant +import com.casic.app.smartwell.utils.RSAUtils import com.casic.app.smartwell.vm.AuthenticateViewModel import com.casic.app.smartwell.vm.LoginViewModel import com.casic.app.smartwell.vm.UserViewModel @@ -34,19 +37,19 @@ // 设置默认账号密码 userNameView.setText(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) userPasswordView.setText(SaveKeyValues.getValue(LocaleConstant.PASSWORD, "") as String) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + authenticateViewModel = ViewModelProvider(this)[AuthenticateViewModel::class.java] + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { - authenticateViewModel.loadState.observe(this, { + authenticateViewModel.loadState.observe(this) { LoadingDialogHub.show(this, "登录中,请稍后") - }) + } - loginViewModel.loadState.observe(this, { + loginViewModel.loadState.observe(this) { LoadingDialogHub.dismiss() - }) + } } override fun initEvent() { @@ -62,8 +65,7 @@ * */ val newServerConfig = "http://$address:$port" SaveKeyValues.putValue( - LocaleConstant.DEFAULT_SERVER_CONFIG, - newServerConfig + LocaleConstant.DEFAULT_SERVER_CONFIG, newServerConfig ) object : CountDownTimer(2000, 1000) { override fun onTick(millisUntilFinished: Long) { @@ -94,7 +96,7 @@ SaveKeyValues.putValue(LocaleConstant.PASSWORD, userPassword) authenticateViewModel.obtainPublicKey() } - authenticateViewModel.keyModel.observe(this, { + authenticateViewModel.keyModel.observe(this) { if (it.code == 200) {//用code判断,别的判断可能有坑 val keyString = it.data!!.publicKey!! /** @@ -109,7 +111,7 @@ RSAUtils.encryptDataByPublicKey(userPassword.toByteArray(), publicKey!!) //登录并获取Token,POST请求 loginViewModel.enter(account, dataByPublicKey) - loginViewModel.enterResultModel.observe(this, { loginResult -> + loginViewModel.enterResultModel.observe(this) { loginResult -> if (loginResult.code == 200) { AuthenticationHelper.saveToken(loginResult.data!!.token!!) //获取token之后保存用户信息 @@ -118,8 +120,8 @@ this.navigatePageTo() finish() } - }) + } } - }) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt index 50581da..920e610 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/MainActivity.kt @@ -52,16 +52,16 @@ override fun initData() { //推送,多次调用 SDK 初始化并无影响。 PushManager.getInstance().initialize(this) - pushViewModel = ViewModelProvider(this).get(PushViewModel::class.java) + pushViewModel = ViewModelProvider(this)[PushViewModel::class.java] weakReferenceHandler = WeakReferenceHandler { pushViewModel.registerPush(it.obj as String) true } - pushViewModel.registerResultModel.observe(this, { + pushViewModel.registerResultModel.observe(this) { if (it.code == 200) { Log.d(kTag, "推送注册结果: ${it.toJson()}") } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt index e860d71..d45c619 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderCompletedDetailActivity.kt @@ -23,7 +23,6 @@ class OrderCompletedDetailActivity : KotlinBaseActivity() { - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private val context: Context = this@OrderCompletedDetailActivity @@ -39,22 +38,10 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -148,6 +135,19 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime } - }) + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt index a860cdf..3e09024 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderInHandleDetailActivity.kt @@ -12,9 +12,16 @@ import androidx.lifecycle.ViewModelProvider import com.casic.app.smartwell.R import com.casic.app.smartwell.callback.OnImageCompressListener -import com.casic.app.smartwell.extensions.* -import com.casic.app.smartwell.utils.* -import com.casic.app.smartwell.vm.* +import com.casic.app.smartwell.extensions.combineImagePath +import com.casic.app.smartwell.extensions.compressImage +import com.casic.app.smartwell.extensions.reformat +import com.casic.app.smartwell.extensions.toChinese +import com.casic.app.smartwell.utils.GlideLoadEngine +import com.casic.app.smartwell.utils.LoadingDialogHub +import com.casic.app.smartwell.vm.OperationViewModel +import com.casic.app.smartwell.vm.UploadImageViewModel +import com.casic.app.smartwell.vm.UserViewModel +import com.casic.app.smartwell.vm.WorkOrderViewModel import com.casic.app.smartwell.widgets.SingleChoiceDialog import com.casic.app.smartwell.widgets.TimeLineBottomSheet import com.gyf.immersionbar.ImmersionBar @@ -43,7 +50,6 @@ class OrderInHandleDetailActivity : KotlinBaseActivity() { private val kTag = "OrderInHandleDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,82 +72,18 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 + weakReferenceHandler = WeakReferenceHandler(callback) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter - weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //处理完成工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - @SuppressLint("SetTextI18n") - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = "${text.length}/100" - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) - + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!!//初始化图片九宫格 workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -196,8 +138,7 @@ override fun onConfirmClick() { } - }).build() - .show() + }).build().show() } } else { stateTipsView.visibility = View.GONE @@ -255,7 +196,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -294,7 +235,7 @@ } }).build().show() } - }) + } //提交工单处理 submitButton.setOnClickListener { @@ -337,6 +278,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //处理完成工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + @SuppressLint("SetTextI18n") + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = "${text.length}/100" + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -357,21 +378,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt index c9a1e73..2438c44 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -42,7 +42,6 @@ class OrderNotConfirmedDetailActivity : KotlinBaseActivity() { private val kTag = "OrderNotConfirmedDetailActivity" - private lateinit var jobId: String private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel private lateinit var userViewModel: UserViewModel @@ -66,83 +65,19 @@ } override fun initData() { - this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! + val jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! //初始化图片九宫格 imageAdapter = EditableImageAdapter(this, 3, 13f) addImageRecyclerView.adapter = imageAdapter weakReferenceHandler = WeakReferenceHandler(callback) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - uploadImageViewModel.loadState.observe(this, { - when (it) { - LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") - else -> LoadingDialogHub.dismiss() - } - }) - - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - - //确认工单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - sceneEditView.addTextChangedListener(object : TextWatcher { - override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { - - } - - override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - - } - - override fun afterTextChanged(s: Editable?) { - val text = s.toString().trim() - inputLengthView.text = String.format("${text.length}/100") - if (text.length > 100) { - inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) - "现场情况字符不能超过100个字符".show(context) - } else { - inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) - } - } - }) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + uploadImageViewModel = ViewModelProvider(this)[UploadImageViewModel::class.java] + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -204,7 +139,7 @@ transferOrderButton.setOnClickListener { userViewModel.obtainSubordinate("0", "", "leader,member") } - userViewModel.subordinateModel.observe(this, { subordinate -> + userViewModel.subordinateModel.observe(this) { subordinate -> if (subordinate.code == 200) { val roleArray: ArrayList = ArrayList() //下级流转人员集合 subordinate.data?.forEach { dataBean -> @@ -243,7 +178,7 @@ } }).build().show() } - }) + } //提交 submitButton.setOnClickListener { @@ -298,6 +233,86 @@ }).build().show() } } + } + + uploadImageViewModel.resultModel.observe(this) { + if (it.code == 200) { + val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 + if (sumItemCount <= 4) { + val url = it.data.toString() + if (url.isNotBlank()) { + imagePaths.add(url) + realPaths.add(url.combineImagePath()) + } + imageAdapter.setupImage(images = realPaths) + } else { + "最多只能上传3张图片".show(this) + } + } + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + uploadImageViewModel.loadState.observe(this) { + when (it) { + LoadState.Loading -> LoadingDialogHub.show(this, "图片上传中,请稍后...") + else -> LoadingDialogHub.dismiss() + } + } + + //转单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "转单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + + //确认工单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + sceneEditView.addTextChangedListener(object : TextWatcher { + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + + } + + override fun afterTextChanged(s: Editable?) { + val text = s.toString().trim() + inputLengthView.text = String.format("${text.length}/100") + if (text.length > 100) { + inputLengthView.setTextColor(R.color.redTextColor.convertColor(context)) + "现场情况字符不能超过100个字符".show(context) + } else { + inputLengthView.setTextColor(R.color.subTextColor.convertColor(context)) + } + } }) imageAdapter.setOnItemClickListener(object : EditableImageAdapter.OnItemClickListener { @@ -318,21 +333,6 @@ imageAdapter.deleteImage(position) } }) - uploadImageViewModel.resultModel.observe(this, { - if (it.code == 200) { - val sumItemCount: Int = imageAdapter.itemCount + 1 //每上传一张图片,图片总数都是在原有的基础上+1 - if (sumItemCount <= 4) { - val url = it.data.toString() - if (url.isNotBlank()) { - imagePaths.add(url) - realPaths.add(url.combineImagePath()) - } - imageAdapter.setupImage(images = realPaths) - } else { - "最多只能上传3张图片".show(this) - } - } - }) } private fun selectPicture() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt index fcf0071..31593b3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/OrderNotProcessedDetailActivity.kt @@ -45,37 +45,12 @@ override fun initData() { this.jobId = intent.getStringExtra(Constant.INTENT_PARAM)!! - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] workOrderViewModel.obtainWorkOrderDetail(jobId) - } - - override fun observeRequestState() { - //数据加载状态处理 - workOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - this.finish() - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] alarmContentView.text = orderDetail.alarmContentName @@ -149,7 +124,7 @@ } wellViewModel.obtainWellDetail(wellId) } - wellViewModel.wellDetailModel.observe(this, { well -> + wellViewModel.wellDetailModel.observe(this) { well -> if (well.code == 200) { val wellDetail = well.data!! val lat = wellDetail.latGaode.toString() @@ -164,8 +139,34 @@ ) } } - }) + } } - }) + } + } + + override fun observeRequestState() { + //数据加载状态处理 + workOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + this.finish() + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt index 221ad4a..24fd4a2 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchOrderActivity.kt @@ -11,6 +11,7 @@ import com.casic.app.smartwell.model.OrderStatusModel import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.AlarmViewModel +import com.casic.app.smartwell.vm.UserViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel import com.gyf.immersionbar.ImmersionBar import com.jzxiang.pickerview.TimePickerDialog @@ -28,17 +29,20 @@ class SearchOrderActivity : KotlinBaseActivity() { + private lateinit var userViewModel: UserViewModel private lateinit var alarmViewModel: AlarmViewModel private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var inflater: LayoutInflater private lateinit var contentTypeAdapter: TagAdapter private lateinit var orderStatusAdapter: TagAdapter + private lateinit var levelAdapter: TagAdapter> private val context: Context = this@SearchOrderActivity private var contentModels: MutableList = ArrayList() private var orderStatusModels: MutableList = ArrayList() private var alarmContentType = "" private var alarmLevel = "" private var orderState = "" + private var deptId = "" override fun initLayoutView(): Int = R.layout.activity_order_search @@ -53,19 +57,18 @@ override fun initData() { inflater = LayoutInflater.from(this) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.obtainUserDetail() + userViewModel.userDetailModel.observe(this) { + if (it.code == 200) { + deptId = it.data.deptId + } + } + //告警内容 - alarmViewModel = ViewModelProvider(this).get(AlarmViewModel::class.java) - //工单状态 - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } - - override fun observeRequestState() { - - } - - override fun initEvent() { + alarmViewModel = ViewModelProvider(this)[AlarmViewModel::class.java] alarmViewModel.obtainAlarmContentType("1") - alarmViewModel.listModel.observe(this, { + alarmViewModel.listModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = AlarmContentModel.DataBean.ListBean() @@ -103,8 +106,11 @@ true } } - }) + } + //工单状态 + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] + workOrderViewModel.obtainOrderStatus() /** * 章丘项目只有一/二级报警 * */ @@ -115,7 +121,7 @@ map["value"] = i.toLevel() levelMaps.add(map) } - val levelAdapter = object : TagAdapter>(levelMaps) { + levelAdapter = object : TagAdapter>(levelMaps) { override fun getView( parent: FlowLayout?, position: Int, map: Map? ): View { @@ -132,9 +138,7 @@ this.alarmLevel = levelMaps[position]["value"].toString() true } - - workOrderViewModel.obtainOrderStatus() - workOrderViewModel.orderStatusModel.observe(this, { + workOrderViewModel.orderStatusModel.observe(this) { if (it.code == 200) { //构造一个默认值 val bean = OrderStatusModel.DataBean() @@ -165,8 +169,14 @@ true } } - }) + } + } + override fun observeRequestState() { + + } + + override fun initEvent() { startTimeView.setOnClickListener { TimePickerDialog.Builder() .setThemeColor(R.color.mainThemeColor.convertColor(this)) @@ -207,6 +217,7 @@ alarmContentType, alarmLevel, orderState, + deptId, startTimeView.text.toString(), endTimeView.text.toString() ) diff --git a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt index c0c442a..e85a453 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SearchResultActivity.kt @@ -9,7 +9,6 @@ import com.casic.app.smartwell.extensions.showEmptyPage import com.casic.app.smartwell.model.SearchResultModel import com.casic.app.smartwell.utils.LoadingDialogHub -import com.casic.app.smartwell.utils.LocaleConstant import com.casic.app.smartwell.vm.OperationViewModel import com.casic.app.smartwell.vm.SearchOrderViewModel import com.casic.app.smartwell.vm.WorkOrderViewModel @@ -27,9 +26,6 @@ import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* import kotlinx.android.synthetic.main.include_empty_view.* -import okhttp3.MediaType.Companion.toMediaType -import okhttp3.RequestBody.Companion.toRequestBody -import org.json.JSONObject class SearchResultActivity : KotlinBaseActivity() { private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -59,39 +55,12 @@ override fun initData() { args = intent.getStringArrayListExtra(Constant.INTENT_PARAM)!! weakReferenceHandler = WeakReferenceHandler(callback) - searchOrderViewModel = ViewModelProvider(this).get(SearchOrderViewModel::class.java) - operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) - workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) - } + searchOrderViewModel = ViewModelProvider(this)[SearchOrderViewModel::class.java] + operationViewModel = ViewModelProvider(this)[OperationViewModel::class.java] + workOrderViewModel = ViewModelProvider(this)[WorkOrderViewModel::class.java] - override fun observeRequestState() { - searchOrderViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - //接单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") - is LoadState.Success -> { - LoadingDialogHub.dismiss() - //接单成功之后刷新列表 - dataBeans.removeAt(clickedPosition) - searchResultAdapter.notifyItemRemoved(clickedPosition) - searchResultAdapter.notifyItemRangeChanged( - clickedPosition, dataBeans.size - clickedPosition - ) - } - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { obtainSearchResult() - searchOrderViewModel.listModel.observe(this, { + searchOrderViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -115,21 +84,9 @@ } weakReferenceHandler.sendEmptyMessage(2022040101) } - }) - - resultRefreshLayout.setOnRefreshListener { - isRefresh = true - //刷新之后页码重置 - pageIndex = 1 - obtainSearchResult() - } - resultRefreshLayout.setOnLoadMoreListener { - isLoadMore = true - pageIndex++ - obtainSearchResult() } - workOrderViewModel.detailModel.observe(this, { + workOrderViewModel.detailModel.observe(this) { if (it.code == 200) { val orderDetail = it.data!![0] val orderFlow = orderDetail.flow!! @@ -142,23 +99,59 @@ "抱歉,无法查到该工单的流转记录".show(this) } } - }) + } + } + + override fun observeRequestState() { + searchOrderViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + //接单状态处理 + operationViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "接单中,请稍后") + is LoadState.Success -> { + LoadingDialogHub.dismiss() + //接单成功之后刷新列表 + dataBeans.removeAt(clickedPosition) + searchResultAdapter.notifyItemRemoved(clickedPosition) + searchResultAdapter.notifyItemRangeChanged( + clickedPosition, dataBeans.size - clickedPosition + ) + } + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + resultRefreshLayout.setOnRefreshListener { + isRefresh = true + //刷新之后页码重置 + pageIndex = 1 + obtainSearchResult() + } + resultRefreshLayout.setOnLoadMoreListener { + isLoadMore = true + pageIndex++ + obtainSearchResult() + } } private fun obtainSearchResult() { - val paramObject = JSONObject() - paramObject.put("keywords", args[0]) - paramObject.put("alarmContent", args[1]) - paramObject.put("alarmLevel", args[2]) - paramObject.put("jobStatus", args[3]) - paramObject.put("beginTime", args[4]) - paramObject.put("endTime", args[5]) - paramObject.put("limit", LocaleConstant.PAGE_LIMIT) - paramObject.put("offset", pageIndex) - val requestBody = paramObject.toString().toRequestBody( - "application/json;charset=UTF-8".toMediaType() + searchOrderViewModel.obtainSearchResult( + args[0], + args[1], + args[2], + args[3], + args[4], + args[5], + args[6], + pageIndex ) - searchOrderViewModel.obtainSearchResult(requestBody) } private val callback = Handler.Callback { diff --git a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt index b60a8ab..f031966 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/SplashScreenActivity.kt @@ -17,14 +17,14 @@ * 获取token之后保存用户信息 * */ userViewModel.obtainUserDetail() - userViewModel.userDetailModel.observe(this@SplashScreenActivity, { + userViewModel.userDetailModel.observe(this@SplashScreenActivity) { if (it.code == 200) { navigatePageTo() } else { navigatePageTo() } finish() - }) + } } override fun onTick(millisUntilFinished: Long) { @@ -39,7 +39,7 @@ } override fun initData() { - userViewModel = ViewModelProvider(this).get(UserViewModel::class.java) + userViewModel = ViewModelProvider(this)[UserViewModel::class.java] } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt index ba47ddd..5eb088d 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/UserDetailActivity.kt @@ -50,7 +50,14 @@ userDeptView.text = userDataModel.deptName userPhoneView.text = userDataModel.phone } - loginViewModel = ViewModelProvider(this).get(LoginViewModel::class.java) + loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java] + loginViewModel.outResultModel.observe(this) { + if (it.code == 200) { + AuthenticationHelper.removeToken() + this.navigatePageTo() + PageNavigationManager.finishAllActivity() + } + } } override fun observeRequestState() { @@ -78,12 +85,5 @@ override fun onCancelClick() {} }).build().show() } - loginViewModel.outResultModel.observe(this, { - if (it.code == 200) { - AuthenticationHelper.removeToken() - this.navigatePageTo() - PageNavigationManager.finishAllActivity() - } - }) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt index 25d2ab3..efede87 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellDetailActivity.kt @@ -41,26 +41,9 @@ override fun initData() { val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainWellDetail(wellId) - - //监控内容 - monitorLayout.setOnClickListener { - this.navigatePageTo(wellId) - } - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { - wellViewModel.wellDetailModel.observe(this, { + wellViewModel.wellDetailModel.observe(this) { if (it.code == 200) { val wellDetail = it.data!! wellCodeView.text = wellDetail.wellCode @@ -135,6 +118,24 @@ ) } } - }) + } + + //监控内容 + monitorLayout.setOnClickListener { + this.navigatePageTo(wellId) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt index 7ac89fe..dceb2e3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellManagementActivity.kt @@ -57,7 +57,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -65,10 +65,10 @@ } easyPopupWindow.setupPopupData(items) } - }) + } obtainWellList() - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -92,7 +92,7 @@ } weakReferenceHandler.sendEmptyMessage(2022032501) } - }) + } } override fun observeRequestState() { diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt index ea70c86..55777a3 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellMonitorActivity.kt @@ -19,7 +19,6 @@ class WellMonitorActivity : KotlinBaseActivity() { - private lateinit var wellId: String private lateinit var wellViewModel: WellViewModel override fun initLayoutView(): Int = R.layout.activity_well_monitor @@ -34,22 +33,10 @@ } override fun initData() { - this.wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - } - - override fun observeRequestState() { - wellViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") - else -> LoadingDialogHub.dismiss() - } - }) - } - - override fun initEvent() { + val wellId = intent.getStringExtra(Constant.INTENT_PARAM)!! + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] wellViewModel.obtainMonitorResult(wellId) - wellViewModel.monitorModel.observe(this, { + wellViewModel.monitorModel.observe(this) { if (it.code == 200) { if (it.data?.size == 0) { emptyView!!.showEmptyPage("抱歉,该点位下无设备,或设备已离线") { @@ -60,6 +47,19 @@ sensorListView!!.adapter = SensorListAdapter(this, it.data!!) } } - }) + } + } + + override fun observeRequestState() { + wellViewModel.loadState.observe(this) { + when (it) { + is LoadState.Loading -> LoadingDialogHub.show(this, "数据加载中,请稍后") + else -> LoadingDialogHub.dismiss() + } + } + } + + override fun initEvent() { + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt index 947b549..afe6c2f 100644 --- a/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt +++ b/app/src/main/java/com/casic/app/smartwell/view/WellOperationActivity.kt @@ -56,11 +56,11 @@ easyPopupWindow = WellTypePopupWindow(this) easyPopupWindow.setBackgroundDrawable(null) weakReferenceHandler = WeakReferenceHandler(callback) - wellViewModel = ViewModelProvider(this).get(WellViewModel::class.java) - wellListViewModel = ViewModelProvider(this).get(WellListViewModel::class.java) + wellViewModel = ViewModelProvider(this)[WellViewModel::class.java] + wellListViewModel = ViewModelProvider(this)[WellListViewModel::class.java] wellViewModel.obtainWellType() - wellViewModel.wellTypeModel.observe(this, { + wellViewModel.wellTypeModel.observe(this) { if (it.code == 200) { items.add(WellTypeModel("", "全\u3000部")) it.data.wellTypes!!.forEach { value -> @@ -68,9 +68,9 @@ } easyPopupWindow.setupPopupData(items) } - }) + } - wellListViewModel.listModel.observe(this, { + wellListViewModel.listModel.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows when { @@ -94,10 +94,10 @@ } weakReferenceHandler.sendEmptyMessage(2022032801) } - }) + } //撤防布防状态监听 - wellViewModel.commonResultModel.observe(this, { + wellViewModel.commonResultModel.observe(this) { if (it.code == 200) { val rowsBean = dataBeans[clickedPosition] if (rowsBean.bfztName == "布防") { @@ -108,7 +108,7 @@ rowsBean.bfztName = "布防" } } - }) + } } override fun onResume() { @@ -118,7 +118,7 @@ } override fun observeRequestState() { - wellViewModel.loadState.observe(this, { + wellViewModel.loadState.observe(this) { when (it) { is LoadState.Loading -> LoadingDialogHub.show(this, "处理中,请稍后") is LoadState.Success -> { @@ -127,7 +127,7 @@ } else -> LoadingDialogHub.dismiss() } - }) + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt index a2e6542..bd1396a 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AlarmViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt index 44179f5..2fdcbd8 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/AuthenticateViewModel.kt @@ -27,9 +27,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/DeviceViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt index 70e25b8..8eaef56 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/DeviceViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/LoginViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt index e144850..a465783 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/LoginViewModel.kt @@ -28,14 +28,14 @@ enterResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) - "登录成功".show(BaseApplication.obtainInstance()) + "登录成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun out() = launch({ @@ -46,9 +46,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt index eaf90d2..fdab23e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/OperationViewModel.kt @@ -20,14 +20,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "接单成功".show(BaseApplication.obtainInstance()) + "接单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun confirmWorkOrder( @@ -40,14 +40,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单确认成功".show(BaseApplication.obtainInstance()) + "工单确认成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun transferWorkOrder(id: String, userId: String) = launch({ @@ -56,14 +56,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "转单成功".show(BaseApplication.obtainInstance()) + "转单成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun completeWorkOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ @@ -72,13 +72,13 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "工单处理成功".show(BaseApplication.obtainInstance()) + "工单处理成功".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/PushViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt index 6b088e5..303cc21 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/PushViewModel.kt @@ -25,9 +25,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/SearchOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt index 2acc184..6b90a12 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/SearchOrderViewModel.kt @@ -12,16 +12,26 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState -import okhttp3.RequestBody class SearchOrderViewModel : BaseViewModel() { private val gson by lazy { Gson() } val listModel = MutableLiveData() - fun obtainSearchResult(requestBody: RequestBody) = launch({ + fun obtainSearchResult( + keywords: String, + alarmContent: String, + alarmLevel: String, + jobStatus: String, + deptId: String, + beginTime: String, + endTime: String, + offset: Int + ) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.obtainSearchResult(requestBody) + val response = RetrofitServiceManager.obtainSearchResult( + keywords, alarmContent, alarmLevel, jobStatus, deptId, beginTime, endTime, offset + ) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success @@ -30,10 +40,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UploadImageViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt index 8149543..63d5008 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UploadImageViewModel.kt @@ -30,10 +30,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/UserViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt index f66b2a2..aad1256 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/UserViewModel.kt @@ -41,7 +41,7 @@ SaveKeyValues.removeKey(LocaleConstant.USER_DETAIL_MODEL) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) /** @@ -55,10 +55,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun changePassword(oldPwd: String, newPwd: String) = launch({ @@ -67,14 +67,14 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "修改成功,请重新登录".show(BaseApplication.obtainInstance()) + "修改成功,请重新登录".show(BaseApplication.get()) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun updateVersion() = launch({ @@ -88,10 +88,10 @@ ).data } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/WellListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt index 660274d..a0d753f 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellListViewModel.kt @@ -35,10 +35,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainAllWell() = launch({ @@ -49,9 +49,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/WellViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt index f70795b..0cad03e 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WellViewModel.kt @@ -39,10 +39,10 @@ map["total"] = convertString(data.getString("total")) countResultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) private fun convertString(value: String): String { @@ -61,10 +61,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainWellDetail(id: String) = launch({ @@ -78,11 +78,11 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainOperationResult(id: String, state: String) = launch({ @@ -91,17 +91,17 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - "操作成功".show(BaseApplication.obtainInstance()) + "操作成功".show(BaseApplication.get()) commonResultModel.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainMonitorResult(id: String) = launch({ @@ -115,10 +115,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { 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/app/smartwell/vm/WorkOrderListViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt index 6417e90..db84680 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderListViewModel.kt @@ -25,10 +25,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainNotAcceptOderList(page: Int) = launch({ @@ -39,10 +39,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainNotHandleOderList(page: Int) = launch({ @@ -53,9 +53,9 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + 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/app/smartwell/vm/WorkOrderViewModel.kt b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt index 9282f74..eb19dca 100644 --- a/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt +++ b/app/src/main/java/com/casic/app/smartwell/vm/WorkOrderViewModel.kt @@ -36,10 +36,10 @@ map["over"] = data.getString("over") resultModel.value = map } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainOrderStatus() = launch({ @@ -50,10 +50,10 @@ response, object : TypeToken() {}.type ) } else { - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) fun obtainWorkOrderDetail(id: String) = launch({ @@ -67,10 +67,10 @@ ) } else { loadState.value = LoadState.Fail - response.toErrorMessage().show(BaseApplication.obtainInstance()) + response.toErrorMessage().show(BaseApplication.get()) } }, { loadState.value = LoadState.Fail - it.printStackTrace() + it.cause.toString().show(BaseApplication.get()) }) } \ No newline at end of file