diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index cf20076..3a226ca 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -348,34 +348,6 @@ ): String /** - * 查找同一单位下的用户 - * - * @param hasMine 是否包含本人，1包含, 0不包含 - * @param roleTips 角色类型，例：leader,member - */ - @FormUrlEncoded - @POST("/mgr/simplelist") - suspend fun obtainSubordinate( - @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? - ): String - - /** - * 转单 - * - * @param id 工单id - * @param transferPerson 转单人，转给谁 - */ - @FormUrlEncoded - @POST("/job/transferJob") - suspend fun transferWorkOrder( - @Header("token") token: String, - @Field("id") id: String, - @Field("transferPerson") transferPerson: String - ): String - - /** * 确认工单 * @param id 工单id * @param firstState 现场情况描述 diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index cf20076..3a226ca 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -348,34 +348,6 @@ ): String /** - * 查找同一单位下的用户 - * - * @param hasMine 是否包含本人，1包含, 0不包含 - * @param roleTips 角色类型，例：leader,member - */ - @FormUrlEncoded - @POST("/mgr/simplelist") - suspend fun obtainSubordinate( - @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? - ): String - - /** - * 转单 - * - * @param id 工单id - * @param transferPerson 转单人，转给谁 - */ - @FormUrlEncoded - @POST("/job/transferJob") - suspend fun transferWorkOrder( - @Header("token") token: String, - @Field("id") id: String, - @Field("transferPerson") transferPerson: String - ): String - - /** * 确认工单 * @param id 工单id * @param firstState 现场情况描述 diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 9b0e1c9..2eca950 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -305,20 +305,6 @@ } /** - * 查找同一单位下的用户 - */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) - } - - /** - * 转单 - */ - suspend fun transferWorkOrder(id: String, userId: String): String { - return api.transferWorkOrder(AuthenticationHelper.token!!, id, userId) - } - - /** * 确认工单 */ suspend fun confirmWorkOrder( diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index cf20076..3a226ca 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -348,34 +348,6 @@ ): String /** - * 查找同一单位下的用户 - * - * @param hasMine 是否包含本人，1包含, 0不包含 - * @param roleTips 角色类型，例：leader,member - */ - @FormUrlEncoded - @POST("/mgr/simplelist") - suspend fun obtainSubordinate( - @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? - ): String - - /** - * 转单 - * - * @param id 工单id - * @param transferPerson 转单人，转给谁 - */ - @FormUrlEncoded - @POST("/job/transferJob") - suspend fun transferWorkOrder( - @Header("token") token: String, - @Field("id") id: String, - @Field("transferPerson") transferPerson: String - ): String - - /** * 确认工单 * @param id 工单id * @param firstState 现场情况描述 diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 9b0e1c9..2eca950 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -305,20 +305,6 @@ } /** - * 查找同一单位下的用户 - */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) - } - - /** - * 转单 - */ - suspend fun transferWorkOrder(id: String, userId: String): String { - return api.transferWorkOrder(AuthenticationHelper.token!!, id, userId) - } - - /** * 确认工单 */ suspend fun confirmWorkOrder( diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 090003d..2c84ec7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -15,11 +15,9 @@ import com.casic.qd.smartwell.base.BaseActivity import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.utils.* -import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.SingleChoiceDialog import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType @@ -39,7 +37,6 @@ private val kTag = "OrderInHandleDetailActivity" private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -63,7 +60,6 @@ workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) @@ -181,7 +177,6 @@ val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - transferOrderButton.visibility = View.GONE transferTipsView.visibility = View.VISIBLE transferTipsView.setOnClickListener { TimeLineBottomSheet.Builder() @@ -190,57 +185,8 @@ .build().show() } } else { - transferOrderButton.visibility = View.VISIBLE transferTipsView.visibility = View.GONE } - //转单 - transferOrderButton.setOnClickListener { - authenticateViewModel.obtainSubordinate("0", "leader,member") - } - authenticateViewModel.subordinateModel.observe(this, { subordinate -> - if (subordinate.code == 200) { - if (subordinate.data!!.isEmpty()) { - "无下级转单人员，无法转单".show() - } else { - val roleArray: ArrayList = ArrayList() //下级流转人员集合 - subordinate.data?.forEach { dataBean -> - roleArray.add(dataBean.name.toString()) - } - SingleChoiceDialog.Builder() - .setContext(this) - .setChoiceItemTitles(roleArray) - .setOnSingleChoiceClickListener(object : - SingleChoiceDialog.OnSingleChoiceClickListener { - override fun onItemClick(position: Int) { - val personBean = subordinate.data!![position] - AlertControlDialog.Builder() - .setContext(context) - .setTitle("操作提示") - .setMessage("确定要转单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val orderId = orderDetail.jobId.toString() - if (orderId.isBlank()) { - "工单ID异常，无法转单".show() - return - } - operationViewModel.transferWorkOrder( - orderId, personBean.id!! - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - }).build().show() - } - } - }) //提交工单处理 submitButton.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index cf20076..3a226ca 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -348,34 +348,6 @@ ): String /** - * 查找同一单位下的用户 - * - * @param hasMine 是否包含本人，1包含, 0不包含 - * @param roleTips 角色类型，例：leader,member - */ - @FormUrlEncoded - @POST("/mgr/simplelist") - suspend fun obtainSubordinate( - @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? - ): String - - /** - * 转单 - * - * @param id 工单id - * @param transferPerson 转单人，转给谁 - */ - @FormUrlEncoded - @POST("/job/transferJob") - suspend fun transferWorkOrder( - @Header("token") token: String, - @Field("id") id: String, - @Field("transferPerson") transferPerson: String - ): String - - /** * 确认工单 * @param id 工单id * @param firstState 现场情况描述 diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 9b0e1c9..2eca950 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -305,20 +305,6 @@ } /** - * 查找同一单位下的用户 - */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) - } - - /** - * 转单 - */ - suspend fun transferWorkOrder(id: String, userId: String): String { - return api.transferWorkOrder(AuthenticationHelper.token!!, id, userId) - } - - /** * 确认工单 */ suspend fun confirmWorkOrder( diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 090003d..2c84ec7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -15,11 +15,9 @@ import com.casic.qd.smartwell.base.BaseActivity import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.utils.* -import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.SingleChoiceDialog import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType @@ -39,7 +37,6 @@ private val kTag = "OrderInHandleDetailActivity" private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -63,7 +60,6 @@ workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) @@ -181,7 +177,6 @@ val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - transferOrderButton.visibility = View.GONE transferTipsView.visibility = View.VISIBLE transferTipsView.setOnClickListener { TimeLineBottomSheet.Builder() @@ -190,57 +185,8 @@ .build().show() } } else { - transferOrderButton.visibility = View.VISIBLE transferTipsView.visibility = View.GONE } - //转单 - transferOrderButton.setOnClickListener { - authenticateViewModel.obtainSubordinate("0", "leader,member") - } - authenticateViewModel.subordinateModel.observe(this, { subordinate -> - if (subordinate.code == 200) { - if (subordinate.data!!.isEmpty()) { - "无下级转单人员，无法转单".show() - } else { - val roleArray: ArrayList = ArrayList() //下级流转人员集合 - subordinate.data?.forEach { dataBean -> - roleArray.add(dataBean.name.toString()) - } - SingleChoiceDialog.Builder() - .setContext(this) - .setChoiceItemTitles(roleArray) - .setOnSingleChoiceClickListener(object : - SingleChoiceDialog.OnSingleChoiceClickListener { - override fun onItemClick(position: Int) { - val personBean = subordinate.data!![position] - AlertControlDialog.Builder() - .setContext(context) - .setTitle("操作提示") - .setMessage("确定要转单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val orderId = orderDetail.jobId.toString() - if (orderId.isBlank()) { - "工单ID异常，无法转单".show() - return - } - operationViewModel.transferWorkOrder( - orderId, personBean.id!! - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - }).build().show() - } - } - }) //提交工单处理 submitButton.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt index 1f1b5de..c9adeac 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt @@ -27,7 +27,11 @@ override fun initLayoutView(): Int = R.layout.activity_order_management override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "工单管理" + rightOptionView.setOnClickListener { + navigatePageTo() + } } override fun initData() { @@ -40,8 +44,6 @@ } override fun initEvent() { - rightOptionView.setOnClickListener { - navigatePageTo() - } + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index cf20076..3a226ca 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -348,34 +348,6 @@ ): String /** - * 查找同一单位下的用户 - * - * @param hasMine 是否包含本人，1包含, 0不包含 - * @param roleTips 角色类型，例：leader,member - */ - @FormUrlEncoded - @POST("/mgr/simplelist") - suspend fun obtainSubordinate( - @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? - ): String - - /** - * 转单 - * - * @param id 工单id - * @param transferPerson 转单人，转给谁 - */ - @FormUrlEncoded - @POST("/job/transferJob") - suspend fun transferWorkOrder( - @Header("token") token: String, - @Field("id") id: String, - @Field("transferPerson") transferPerson: String - ): String - - /** * 确认工单 * @param id 工单id * @param firstState 现场情况描述 diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 9b0e1c9..2eca950 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -305,20 +305,6 @@ } /** - * 查找同一单位下的用户 - */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) - } - - /** - * 转单 - */ - suspend fun transferWorkOrder(id: String, userId: String): String { - return api.transferWorkOrder(AuthenticationHelper.token!!, id, userId) - } - - /** * 确认工单 */ suspend fun confirmWorkOrder( diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 090003d..2c84ec7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -15,11 +15,9 @@ import com.casic.qd.smartwell.base.BaseActivity import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.utils.* -import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.SingleChoiceDialog import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType @@ -39,7 +37,6 @@ private val kTag = "OrderInHandleDetailActivity" private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -63,7 +60,6 @@ workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) @@ -181,7 +177,6 @@ val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - transferOrderButton.visibility = View.GONE transferTipsView.visibility = View.VISIBLE transferTipsView.setOnClickListener { TimeLineBottomSheet.Builder() @@ -190,57 +185,8 @@ .build().show() } } else { - transferOrderButton.visibility = View.VISIBLE transferTipsView.visibility = View.GONE } - //转单 - transferOrderButton.setOnClickListener { - authenticateViewModel.obtainSubordinate("0", "leader,member") - } - authenticateViewModel.subordinateModel.observe(this, { subordinate -> - if (subordinate.code == 200) { - if (subordinate.data!!.isEmpty()) { - "无下级转单人员，无法转单".show() - } else { - val roleArray: ArrayList = ArrayList() //下级流转人员集合 - subordinate.data?.forEach { dataBean -> - roleArray.add(dataBean.name.toString()) - } - SingleChoiceDialog.Builder() - .setContext(this) - .setChoiceItemTitles(roleArray) - .setOnSingleChoiceClickListener(object : - SingleChoiceDialog.OnSingleChoiceClickListener { - override fun onItemClick(position: Int) { - val personBean = subordinate.data!![position] - AlertControlDialog.Builder() - .setContext(context) - .setTitle("操作提示") - .setMessage("确定要转单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val orderId = orderDetail.jobId.toString() - if (orderId.isBlank()) { - "工单ID异常，无法转单".show() - return - } - operationViewModel.transferWorkOrder( - orderId, personBean.id!! - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - }).build().show() - } - } - }) //提交工单处理 submitButton.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt index 1f1b5de..c9adeac 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt @@ -27,7 +27,11 @@ override fun initLayoutView(): Int = R.layout.activity_order_management override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "工单管理" + rightOptionView.setOnClickListener { + navigatePageTo() + } } override fun initData() { @@ -40,8 +44,6 @@ } override fun initEvent() { - rightOptionView.setOnClickListener { - navigatePageTo() - } + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index a34bacf..d527f47 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -14,11 +14,9 @@ import com.casic.qd.smartwell.base.BaseActivity import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.utils.* -import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.SingleChoiceDialog import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType @@ -38,7 +36,6 @@ private val kTag = "OrderNotConfirmedDetailActivity" private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -65,7 +62,6 @@ workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) @@ -130,7 +126,6 @@ //工单流转细节 val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - transferOrderButton.visibility = View.GONE transferTipsView.visibility = View.VISIBLE transferTipsView.setOnClickListener { TimeLineBottomSheet.Builder() @@ -139,61 +134,11 @@ .build().show() } } else { - transferOrderButton.visibility = View.VISIBLE transferTipsView.visibility = View.GONE } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - //转单 - transferOrderButton.setOnClickListener { - authenticateViewModel.obtainSubordinate("0", "leader,member") - } - authenticateViewModel.subordinateModel.observe(this, { subordinate -> - if (subordinate.code == 200) { - if (subordinate.data!!.isEmpty()) { - "无下级转单人员，无法转单".show() - } else { - val roleArray: ArrayList = ArrayList() //下级流转人员集合 - subordinate.data?.forEach { dataBean -> - roleArray.add(dataBean.name.toString()) - } - SingleChoiceDialog.Builder() - .setContext(this) - .setChoiceItemTitles(roleArray) - .setOnSingleChoiceClickListener(object : - SingleChoiceDialog.OnSingleChoiceClickListener { - override fun onItemClick(position: Int) { - val personBean = subordinate.data!![position] - AlertControlDialog.Builder() - .setContext(context) - .setTitle("操作提示") - .setMessage("确定要转单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val orderId = orderDetail.jobId.toString() - if (orderId.isBlank()) { - "工单ID异常，无法转单".show() - return - } - operationViewModel.transferWorkOrder( - orderId, personBean.id!! - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - }).build().show() - } - } - }) - //提交 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index cf20076..3a226ca 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -348,34 +348,6 @@ ): String /** - * 查找同一单位下的用户 - * - * @param hasMine 是否包含本人，1包含, 0不包含 - * @param roleTips 角色类型，例：leader,member - */ - @FormUrlEncoded - @POST("/mgr/simplelist") - suspend fun obtainSubordinate( - @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? - ): String - - /** - * 转单 - * - * @param id 工单id - * @param transferPerson 转单人，转给谁 - */ - @FormUrlEncoded - @POST("/job/transferJob") - suspend fun transferWorkOrder( - @Header("token") token: String, - @Field("id") id: String, - @Field("transferPerson") transferPerson: String - ): String - - /** * 确认工单 * @param id 工单id * @param firstState 现场情况描述 diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 9b0e1c9..2eca950 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -305,20 +305,6 @@ } /** - * 查找同一单位下的用户 - */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) - } - - /** - * 转单 - */ - suspend fun transferWorkOrder(id: String, userId: String): String { - return api.transferWorkOrder(AuthenticationHelper.token!!, id, userId) - } - - /** * 确认工单 */ suspend fun confirmWorkOrder( diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 090003d..2c84ec7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -15,11 +15,9 @@ import com.casic.qd.smartwell.base.BaseActivity import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.utils.* -import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.SingleChoiceDialog import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType @@ -39,7 +37,6 @@ private val kTag = "OrderInHandleDetailActivity" private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -63,7 +60,6 @@ workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) @@ -181,7 +177,6 @@ val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - transferOrderButton.visibility = View.GONE transferTipsView.visibility = View.VISIBLE transferTipsView.setOnClickListener { TimeLineBottomSheet.Builder() @@ -190,57 +185,8 @@ .build().show() } } else { - transferOrderButton.visibility = View.VISIBLE transferTipsView.visibility = View.GONE } - //转单 - transferOrderButton.setOnClickListener { - authenticateViewModel.obtainSubordinate("0", "leader,member") - } - authenticateViewModel.subordinateModel.observe(this, { subordinate -> - if (subordinate.code == 200) { - if (subordinate.data!!.isEmpty()) { - "无下级转单人员，无法转单".show() - } else { - val roleArray: ArrayList = ArrayList() //下级流转人员集合 - subordinate.data?.forEach { dataBean -> - roleArray.add(dataBean.name.toString()) - } - SingleChoiceDialog.Builder() - .setContext(this) - .setChoiceItemTitles(roleArray) - .setOnSingleChoiceClickListener(object : - SingleChoiceDialog.OnSingleChoiceClickListener { - override fun onItemClick(position: Int) { - val personBean = subordinate.data!![position] - AlertControlDialog.Builder() - .setContext(context) - .setTitle("操作提示") - .setMessage("确定要转单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val orderId = orderDetail.jobId.toString() - if (orderId.isBlank()) { - "工单ID异常，无法转单".show() - return - } - operationViewModel.transferWorkOrder( - orderId, personBean.id!! - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - }).build().show() - } - } - }) //提交工单处理 submitButton.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt index 1f1b5de..c9adeac 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt @@ -27,7 +27,11 @@ override fun initLayoutView(): Int = R.layout.activity_order_management override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "工单管理" + rightOptionView.setOnClickListener { + navigatePageTo() + } } override fun initData() { @@ -40,8 +44,6 @@ } override fun initEvent() { - rightOptionView.setOnClickListener { - navigatePageTo() - } + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index a34bacf..d527f47 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -14,11 +14,9 @@ import com.casic.qd.smartwell.base.BaseActivity import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.utils.* -import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.SingleChoiceDialog import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType @@ -38,7 +36,6 @@ private val kTag = "OrderNotConfirmedDetailActivity" private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -65,7 +62,6 @@ workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) @@ -130,7 +126,6 @@ //工单流转细节 val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - transferOrderButton.visibility = View.GONE transferTipsView.visibility = View.VISIBLE transferTipsView.setOnClickListener { TimeLineBottomSheet.Builder() @@ -139,61 +134,11 @@ .build().show() } } else { - transferOrderButton.visibility = View.VISIBLE transferTipsView.visibility = View.GONE } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - //转单 - transferOrderButton.setOnClickListener { - authenticateViewModel.obtainSubordinate("0", "leader,member") - } - authenticateViewModel.subordinateModel.observe(this, { subordinate -> - if (subordinate.code == 200) { - if (subordinate.data!!.isEmpty()) { - "无下级转单人员，无法转单".show() - } else { - val roleArray: ArrayList = ArrayList() //下级流转人员集合 - subordinate.data?.forEach { dataBean -> - roleArray.add(dataBean.name.toString()) - } - SingleChoiceDialog.Builder() - .setContext(this) - .setChoiceItemTitles(roleArray) - .setOnSingleChoiceClickListener(object : - SingleChoiceDialog.OnSingleChoiceClickListener { - override fun onItemClick(position: Int) { - val personBean = subordinate.data!![position] - AlertControlDialog.Builder() - .setContext(context) - .setTitle("操作提示") - .setMessage("确定要转单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val orderId = orderDetail.jobId.toString() - if (orderId.isBlank()) { - "工单ID异常，无法转单".show() - return - } - operationViewModel.transferWorkOrder( - orderId, personBean.id!! - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - }).build().show() - } - } - }) - //提交 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt index a416f02..3aaa8a7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt @@ -5,7 +5,6 @@ import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.OwnerShipModel import com.casic.qd.smartwell.model.PublicKeyModel -import com.casic.qd.smartwell.model.SubordinateModel import com.casic.qd.smartwell.utils.Constant import com.casic.qd.smartwell.utils.LoadState import com.casic.qd.smartwell.utils.SaveKeyValues @@ -19,7 +18,6 @@ private val gson = Gson() val keyModel = MutableLiveData() val resultModel = MutableLiveData() - val subordinateModel = MutableLiveData() fun obtainPublicKey() = launch({ loadState.value = LoadState.Loading @@ -64,21 +62,4 @@ }, { it.printStackTrace() }) - - /** - * 转单下一级人员 - * */ - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - subordinateModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - it.printStackTrace() - }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index cf20076..3a226ca 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -348,34 +348,6 @@ ): String /** - * 查找同一单位下的用户 - * - * @param hasMine 是否包含本人，1包含, 0不包含 - * @param roleTips 角色类型，例：leader,member - */ - @FormUrlEncoded - @POST("/mgr/simplelist") - suspend fun obtainSubordinate( - @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? - ): String - - /** - * 转单 - * - * @param id 工单id - * @param transferPerson 转单人，转给谁 - */ - @FormUrlEncoded - @POST("/job/transferJob") - suspend fun transferWorkOrder( - @Header("token") token: String, - @Field("id") id: String, - @Field("transferPerson") transferPerson: String - ): String - - /** * 确认工单 * @param id 工单id * @param firstState 现场情况描述 diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 9b0e1c9..2eca950 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -305,20 +305,6 @@ } /** - * 查找同一单位下的用户 - */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) - } - - /** - * 转单 - */ - suspend fun transferWorkOrder(id: String, userId: String): String { - return api.transferWorkOrder(AuthenticationHelper.token!!, id, userId) - } - - /** * 确认工单 */ suspend fun confirmWorkOrder( diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 090003d..2c84ec7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -15,11 +15,9 @@ import com.casic.qd.smartwell.base.BaseActivity import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.utils.* -import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.SingleChoiceDialog import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType @@ -39,7 +37,6 @@ private val kTag = "OrderInHandleDetailActivity" private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -63,7 +60,6 @@ workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) @@ -181,7 +177,6 @@ val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - transferOrderButton.visibility = View.GONE transferTipsView.visibility = View.VISIBLE transferTipsView.setOnClickListener { TimeLineBottomSheet.Builder() @@ -190,57 +185,8 @@ .build().show() } } else { - transferOrderButton.visibility = View.VISIBLE transferTipsView.visibility = View.GONE } - //转单 - transferOrderButton.setOnClickListener { - authenticateViewModel.obtainSubordinate("0", "leader,member") - } - authenticateViewModel.subordinateModel.observe(this, { subordinate -> - if (subordinate.code == 200) { - if (subordinate.data!!.isEmpty()) { - "无下级转单人员，无法转单".show() - } else { - val roleArray: ArrayList = ArrayList() //下级流转人员集合 - subordinate.data?.forEach { dataBean -> - roleArray.add(dataBean.name.toString()) - } - SingleChoiceDialog.Builder() - .setContext(this) - .setChoiceItemTitles(roleArray) - .setOnSingleChoiceClickListener(object : - SingleChoiceDialog.OnSingleChoiceClickListener { - override fun onItemClick(position: Int) { - val personBean = subordinate.data!![position] - AlertControlDialog.Builder() - .setContext(context) - .setTitle("操作提示") - .setMessage("确定要转单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val orderId = orderDetail.jobId.toString() - if (orderId.isBlank()) { - "工单ID异常，无法转单".show() - return - } - operationViewModel.transferWorkOrder( - orderId, personBean.id!! - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - }).build().show() - } - } - }) //提交工单处理 submitButton.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt index 1f1b5de..c9adeac 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt @@ -27,7 +27,11 @@ override fun initLayoutView(): Int = R.layout.activity_order_management override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "工单管理" + rightOptionView.setOnClickListener { + navigatePageTo() + } } override fun initData() { @@ -40,8 +44,6 @@ } override fun initEvent() { - rightOptionView.setOnClickListener { - navigatePageTo() - } + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index a34bacf..d527f47 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -14,11 +14,9 @@ import com.casic.qd.smartwell.base.BaseActivity import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.utils.* -import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.SingleChoiceDialog import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType @@ -38,7 +36,6 @@ private val kTag = "OrderNotConfirmedDetailActivity" private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -65,7 +62,6 @@ workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) @@ -130,7 +126,6 @@ //工单流转细节 val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - transferOrderButton.visibility = View.GONE transferTipsView.visibility = View.VISIBLE transferTipsView.setOnClickListener { TimeLineBottomSheet.Builder() @@ -139,61 +134,11 @@ .build().show() } } else { - transferOrderButton.visibility = View.VISIBLE transferTipsView.visibility = View.GONE } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - //转单 - transferOrderButton.setOnClickListener { - authenticateViewModel.obtainSubordinate("0", "leader,member") - } - authenticateViewModel.subordinateModel.observe(this, { subordinate -> - if (subordinate.code == 200) { - if (subordinate.data!!.isEmpty()) { - "无下级转单人员，无法转单".show() - } else { - val roleArray: ArrayList = ArrayList() //下级流转人员集合 - subordinate.data?.forEach { dataBean -> - roleArray.add(dataBean.name.toString()) - } - SingleChoiceDialog.Builder() - .setContext(this) - .setChoiceItemTitles(roleArray) - .setOnSingleChoiceClickListener(object : - SingleChoiceDialog.OnSingleChoiceClickListener { - override fun onItemClick(position: Int) { - val personBean = subordinate.data!![position] - AlertControlDialog.Builder() - .setContext(context) - .setTitle("操作提示") - .setMessage("确定要转单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val orderId = orderDetail.jobId.toString() - if (orderId.isBlank()) { - "工单ID异常，无法转单".show() - return - } - operationViewModel.transferWorkOrder( - orderId, personBean.id!! - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - }).build().show() - } - } - }) - //提交 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt index a416f02..3aaa8a7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt @@ -5,7 +5,6 @@ import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.OwnerShipModel import com.casic.qd.smartwell.model.PublicKeyModel -import com.casic.qd.smartwell.model.SubordinateModel import com.casic.qd.smartwell.utils.Constant import com.casic.qd.smartwell.utils.LoadState import com.casic.qd.smartwell.utils.SaveKeyValues @@ -19,7 +18,6 @@ private val gson = Gson() val keyModel = MutableLiveData() val resultModel = MutableLiveData() - val subordinateModel = MutableLiveData() fun obtainPublicKey() = launch({ loadState.value = LoadState.Loading @@ -64,21 +62,4 @@ }, { it.printStackTrace() }) - - /** - * 转单下一级人员 - * */ - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - subordinateModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - it.printStackTrace() - }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/OperationViewModel.kt index 76e2b7e..dce8610 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/OperationViewModel.kt @@ -9,7 +9,7 @@ import com.casic.qd.smartwell.utils.retrofit.RetrofitServiceManager /** - * 转单、接单、处理等vm + * 接单、处理等vm * */ class OperationViewModel : BaseViewModel() { @@ -48,22 +48,6 @@ it.printStackTrace() }) - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) - fun completeOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.completeOrder(id, handleMessage, handlePhotos) diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt index cf20076..3a226ca 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitService.kt @@ -348,34 +348,6 @@ ): String /** - * 查找同一单位下的用户 - * - * @param hasMine 是否包含本人，1包含, 0不包含 - * @param roleTips 角色类型，例：leader,member - */ - @FormUrlEncoded - @POST("/mgr/simplelist") - suspend fun obtainSubordinate( - @Header("token") token: String, - @Field("hasMine") hasMine: String?, - @Field("roleTips") roleTips: String? - ): String - - /** - * 转单 - * - * @param id 工单id - * @param transferPerson 转单人，转给谁 - */ - @FormUrlEncoded - @POST("/job/transferJob") - suspend fun transferWorkOrder( - @Header("token") token: String, - @Field("id") id: String, - @Field("transferPerson") transferPerson: String - ): String - - /** * 确认工单 * @param id 工单id * @param firstState 现场情况描述 diff --git a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt index 9b0e1c9..2eca950 100644 --- a/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/qd/smartwell/utils/retrofit/RetrofitServiceManager.kt @@ -305,20 +305,6 @@ } /** - * 查找同一单位下的用户 - */ - suspend fun obtainSubordinate(hasMine: String?, roleTips: String?): String { - return api.obtainSubordinate(AuthenticationHelper.token!!, hasMine, roleTips) - } - - /** - * 转单 - */ - suspend fun transferWorkOrder(id: String, userId: String): String { - return api.transferWorkOrder(AuthenticationHelper.token!!, id, userId) - } - - /** * 确认工单 */ suspend fun confirmWorkOrder( diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 090003d..2c84ec7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -15,11 +15,9 @@ import com.casic.qd.smartwell.base.BaseActivity import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.utils.* -import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.SingleChoiceDialog import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType @@ -39,7 +37,6 @@ private val kTag = "OrderInHandleDetailActivity" private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -63,7 +60,6 @@ workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) @@ -181,7 +177,6 @@ val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - transferOrderButton.visibility = View.GONE transferTipsView.visibility = View.VISIBLE transferTipsView.setOnClickListener { TimeLineBottomSheet.Builder() @@ -190,57 +185,8 @@ .build().show() } } else { - transferOrderButton.visibility = View.VISIBLE transferTipsView.visibility = View.GONE } - //转单 - transferOrderButton.setOnClickListener { - authenticateViewModel.obtainSubordinate("0", "leader,member") - } - authenticateViewModel.subordinateModel.observe(this, { subordinate -> - if (subordinate.code == 200) { - if (subordinate.data!!.isEmpty()) { - "无下级转单人员，无法转单".show() - } else { - val roleArray: ArrayList = ArrayList() //下级流转人员集合 - subordinate.data?.forEach { dataBean -> - roleArray.add(dataBean.name.toString()) - } - SingleChoiceDialog.Builder() - .setContext(this) - .setChoiceItemTitles(roleArray) - .setOnSingleChoiceClickListener(object : - SingleChoiceDialog.OnSingleChoiceClickListener { - override fun onItemClick(position: Int) { - val personBean = subordinate.data!![position] - AlertControlDialog.Builder() - .setContext(context) - .setTitle("操作提示") - .setMessage("确定要转单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val orderId = orderDetail.jobId.toString() - if (orderId.isBlank()) { - "工单ID异常，无法转单".show() - return - } - operationViewModel.transferWorkOrder( - orderId, personBean.id!! - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - }).build().show() - } - } - }) //提交工单处理 submitButton.setOnClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt index 1f1b5de..c9adeac 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderManagementActivity.kt @@ -27,7 +27,11 @@ override fun initLayoutView(): Int = R.layout.activity_order_management override fun setupTopBarLayout() { + leftBackView.setOnClickListener { finish() } titleView.text = "工单管理" + rightOptionView.setOnClickListener { + navigatePageTo() + } } override fun initData() { @@ -40,8 +44,6 @@ } override fun initEvent() { - rightOptionView.setOnClickListener { - navigatePageTo() - } + } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index a34bacf..d527f47 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -14,11 +14,9 @@ import com.casic.qd.smartwell.base.BaseActivity import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.utils.* -import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.SingleChoiceDialog import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType @@ -38,7 +36,6 @@ private val kTag = "OrderNotConfirmedDetailActivity" private lateinit var workOrderViewModel: WorkOrderViewModel private lateinit var uploadImageViewModel: UploadImageViewModel - private lateinit var authenticateViewModel: AuthenticateViewModel private lateinit var operationViewModel: OperationViewModel private lateinit var imageAdapter: NineGridImageAdapter private lateinit var weakReferenceHandler: WeakReferenceHandler @@ -65,7 +62,6 @@ workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) uploadImageViewModel = ViewModelProvider(this).get(UploadImageViewModel::class.java) - authenticateViewModel = ViewModelProvider(this).get(AuthenticateViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) weakReferenceHandler = WeakReferenceHandler(callback) @@ -130,7 +126,6 @@ //工单流转细节 val orderFlow = orderDetail.flow!! if (orderFlow.size != 0) { - transferOrderButton.visibility = View.GONE transferTipsView.visibility = View.VISIBLE transferTipsView.setOnClickListener { TimeLineBottomSheet.Builder() @@ -139,61 +134,11 @@ .build().show() } } else { - transferOrderButton.visibility = View.VISIBLE transferTipsView.visibility = View.GONE } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - //转单 - transferOrderButton.setOnClickListener { - authenticateViewModel.obtainSubordinate("0", "leader,member") - } - authenticateViewModel.subordinateModel.observe(this, { subordinate -> - if (subordinate.code == 200) { - if (subordinate.data!!.isEmpty()) { - "无下级转单人员，无法转单".show() - } else { - val roleArray: ArrayList = ArrayList() //下级流转人员集合 - subordinate.data?.forEach { dataBean -> - roleArray.add(dataBean.name.toString()) - } - SingleChoiceDialog.Builder() - .setContext(this) - .setChoiceItemTitles(roleArray) - .setOnSingleChoiceClickListener(object : - SingleChoiceDialog.OnSingleChoiceClickListener { - override fun onItemClick(position: Int) { - val personBean = subordinate.data!![position] - AlertControlDialog.Builder() - .setContext(context) - .setTitle("操作提示") - .setMessage("确定要转单吗") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(object : - AlertControlDialog.OnDialogButtonClickListener { - override fun onConfirmClick() { - val orderId = orderDetail.jobId.toString() - if (orderId.isBlank()) { - "工单ID异常，无法转单".show() - return - } - operationViewModel.transferWorkOrder( - orderId, personBean.id!! - ) - } - - override fun onCancelClick() { - - } - }).build().show() - } - }).build().show() - } - } - }) - //提交 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt index a416f02..3aaa8a7 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/AuthenticateViewModel.kt @@ -5,7 +5,6 @@ import com.casic.qd.smartwell.extensions.* import com.casic.qd.smartwell.model.OwnerShipModel import com.casic.qd.smartwell.model.PublicKeyModel -import com.casic.qd.smartwell.model.SubordinateModel import com.casic.qd.smartwell.utils.Constant import com.casic.qd.smartwell.utils.LoadState import com.casic.qd.smartwell.utils.SaveKeyValues @@ -19,7 +18,6 @@ private val gson = Gson() val keyModel = MutableLiveData() val resultModel = MutableLiveData() - val subordinateModel = MutableLiveData() fun obtainPublicKey() = launch({ loadState.value = LoadState.Loading @@ -64,21 +62,4 @@ }, { it.printStackTrace() }) - - /** - * 转单下一级人员 - * */ - fun obtainSubordinate(hasMine: String?, roleTips: String?) = launch({ - val response = RetrofitServiceManager.obtainSubordinate(hasMine, roleTips) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - subordinateModel.value = gson.fromJson( - response, object : TypeToken() {}.type - ) - } else { - response.toErrorMessage().show() - } - }, { - it.printStackTrace() - }) } \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/vm/OperationViewModel.kt b/app/src/main/java/com/casic/qd/smartwell/vm/OperationViewModel.kt index 76e2b7e..dce8610 100644 --- a/app/src/main/java/com/casic/qd/smartwell/vm/OperationViewModel.kt +++ b/app/src/main/java/com/casic/qd/smartwell/vm/OperationViewModel.kt @@ -9,7 +9,7 @@ import com.casic.qd.smartwell.utils.retrofit.RetrofitServiceManager /** - * 转单、接单、处理等vm + * 接单、处理等vm * */ class OperationViewModel : BaseViewModel() { @@ -48,22 +48,6 @@ it.printStackTrace() }) - fun transferWorkOrder(id: String, userId: String) = launch({ - loadState.value = LoadState.Loading - val response = RetrofitServiceManager.transferWorkOrder(id, userId) - val responseCode = response.separateResponseCode() - if (responseCode == 200) { - loadState.value = LoadState.Success - "转单成功".show() - } else { - loadState.value = LoadState.Fail - response.toErrorMessage().show() - } - }, { - loadState.value = LoadState.Fail - it.printStackTrace() - }) - fun completeOrder(id: String, handleMessage: String, handlePhotos: String) = launch({ loadState.value = LoadState.Loading val response = RetrofitServiceManager.completeOrder(id, handleMessage, handlePhotos) diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 9759156..856c296 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -224,27 +224,9 @@ - - -