|
@@ -48,62 +48,58 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
|
|
|
getPointData(false)
|
|
getPointData(false)
|
|
|
}
|
|
}
|
|
|
binding.addPoint.setDebouncedClickListener {
|
|
binding.addPoint.setDebouncedClickListener {
|
|
|
- viewModel.initDialogData().observe(this) {
|
|
|
|
|
- AddPointDialog.show(viewModel.workstationData.map {
|
|
|
|
|
- TextDropDownDialog.SimpleTextDropDownEntity(
|
|
|
|
|
- dataId = it.workstationId,
|
|
|
|
|
- dataText = it.workstationName
|
|
|
|
|
- )
|
|
|
|
|
- }, viewModel.rfidTokenData.map {
|
|
|
|
|
- TextDropDownDialog.SimpleTextDropDownEntity(
|
|
|
|
|
- dataId = it.rfidId,
|
|
|
|
|
- dataText = "${it.rfidCode}(${it.rfid})"
|
|
|
|
|
- )
|
|
|
|
|
- }) { data, dialog ->
|
|
|
|
|
- viewModel.validatePointData(data.rfidId ?: 0).observe(this) {
|
|
|
|
|
- viewModel.addIsolationPoint(data).observe(this) {
|
|
|
|
|
- dialog.dismiss()
|
|
|
|
|
- if (it) {
|
|
|
|
|
- TipDialog.show(
|
|
|
|
|
- title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
|
|
|
|
|
- .toString(),
|
|
|
|
|
- dialogType = TipDialog.DialogType.SUCCESS,
|
|
|
|
|
- msg = CommonUtils.getStr(R.string.add_point_succeed).toString(),
|
|
|
|
|
- countDownTime = 10,
|
|
|
|
|
- showConfirm = false,
|
|
|
|
|
- onCancelClick = {
|
|
|
|
|
- getPointData(nextPage = false)
|
|
|
|
|
- }
|
|
|
|
|
- )
|
|
|
|
|
- } else {
|
|
|
|
|
- TipDialog.show(
|
|
|
|
|
- title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
|
|
|
|
|
- .toString(),
|
|
|
|
|
- dialogType = TipDialog.DialogType.ERROR,
|
|
|
|
|
- msg = CommonUtils.getStr(R.string.add_point_failed).toString(),
|
|
|
|
|
- countDownTime = 10,
|
|
|
|
|
- showConfirm = false,
|
|
|
|
|
- onCancelClick = {
|
|
|
|
|
- getPointData(nextPage = false)
|
|
|
|
|
- }
|
|
|
|
|
- )
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ AddPointDialog.show(viewModel.workstationData.map {
|
|
|
|
|
+ TextDropDownDialog.SimpleTextDropDownEntity(
|
|
|
|
|
+ dataId = it.workstationId,
|
|
|
|
|
+ dataText = it.workstationName
|
|
|
|
|
+ )
|
|
|
|
|
+ }, viewModel.rfidTokenData.map {
|
|
|
|
|
+ TextDropDownDialog.SimpleTextDropDownEntity(
|
|
|
|
|
+ dataId = it.rfidId,
|
|
|
|
|
+ dataText = "${it.rfidCode}(${it.rfid})"
|
|
|
|
|
+ )
|
|
|
|
|
+ }) { data, dialog ->
|
|
|
|
|
+ viewModel.validatePointData(data.rfidId ?: 0).observe(this) {
|
|
|
|
|
+ viewModel.addIsolationPoint(data).observe(this) {
|
|
|
|
|
+ dialog.dismiss()
|
|
|
|
|
+ if (it) {
|
|
|
|
|
+ TipDialog.show(
|
|
|
|
|
+ title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
|
|
|
|
|
+ .toString(),
|
|
|
|
|
+ dialogType = TipDialog.DialogType.SUCCESS,
|
|
|
|
|
+ msg = CommonUtils.getStr(R.string.add_point_succeed).toString(),
|
|
|
|
|
+ countDownTime = 10,
|
|
|
|
|
+ showConfirm = false,
|
|
|
|
|
+ onCancelClick = {
|
|
|
|
|
+ getPointData(nextPage = false)
|
|
|
|
|
+ }
|
|
|
|
|
+ )
|
|
|
|
|
+ } else {
|
|
|
|
|
+ TipDialog.show(
|
|
|
|
|
+ title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
|
|
|
|
|
+ .toString(),
|
|
|
|
|
+ dialogType = TipDialog.DialogType.ERROR,
|
|
|
|
|
+ msg = CommonUtils.getStr(R.string.add_point_failed).toString(),
|
|
|
|
|
+ countDownTime = 10,
|
|
|
|
|
+ showConfirm = false,
|
|
|
|
|
+ onCancelClick = {
|
|
|
|
|
+ getPointData(nextPage = false)
|
|
|
|
|
+ }
|
|
|
|
|
+ )
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
binding.filterPoint.setDebouncedClickListener {
|
|
binding.filterPoint.setDebouncedClickListener {
|
|
|
- viewModel.initDialogData().observe(this) {
|
|
|
|
|
- FilterPointDialog.show(viewModel.workstationData.map {
|
|
|
|
|
- TextDropDownDialog.SimpleTextDropDownEntity(
|
|
|
|
|
- dataId = it.workstationId,
|
|
|
|
|
- dataText = it.workstationName
|
|
|
|
|
- )
|
|
|
|
|
- }) {
|
|
|
|
|
- viewModel.pointFilterData = it
|
|
|
|
|
- getPointData(nextPage = false)
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ FilterPointDialog.show(viewModel.workstationData.map {
|
|
|
|
|
+ TextDropDownDialog.SimpleTextDropDownEntity(
|
|
|
|
|
+ dataId = it.workstationId,
|
|
|
|
|
+ dataText = it.workstationName
|
|
|
|
|
+ )
|
|
|
|
|
+ }) {
|
|
|
|
|
+ viewModel.pointFilterData = it
|
|
|
|
|
+ getPointData(nextPage = false)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
binding.refreshLayout.setOnRefreshListener {
|
|
binding.refreshLayout.setOnRefreshListener {
|
|
@@ -154,47 +150,45 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
|
|
|
showToast(CommonUtils.getStr(R.string.point_in_use).toString())
|
|
showToast(CommonUtils.getStr(R.string.point_in_use).toString())
|
|
|
return@setDebouncedClickListener
|
|
return@setDebouncedClickListener
|
|
|
}
|
|
}
|
|
|
- viewModel.initDialogData().observe(this@PointMangeFragment) {
|
|
|
|
|
- UpdatePointDialog.show(item, viewModel.workstationData.map {
|
|
|
|
|
- TextDropDownDialog.SimpleTextDropDownEntity(
|
|
|
|
|
- dataId = it.workstationId,
|
|
|
|
|
- dataText = it.workstationName
|
|
|
|
|
- )
|
|
|
|
|
- }, viewModel.rfidTokenData.map {
|
|
|
|
|
- TextDropDownDialog.SimpleTextDropDownEntity(
|
|
|
|
|
- dataId = it.rfidId,
|
|
|
|
|
- dataText = "${it.rfidCode}(${it.rfid})"
|
|
|
|
|
- )
|
|
|
|
|
- }) { data, dialog ->
|
|
|
|
|
- viewModel.updateIsolationPoint(data).observe(this@PointMangeFragment) {
|
|
|
|
|
- dialog.dismiss()
|
|
|
|
|
- if (it) {
|
|
|
|
|
- TipDialog.show(
|
|
|
|
|
- title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
|
|
|
|
|
- .toString(),
|
|
|
|
|
- dialogType = TipDialog.DialogType.SUCCESS,
|
|
|
|
|
- msg = CommonUtils.getStr(R.string.update_point_succeed)
|
|
|
|
|
- .toString(),
|
|
|
|
|
- countDownTime = 10,
|
|
|
|
|
- showConfirm = false,
|
|
|
|
|
- onCancelClick = {
|
|
|
|
|
- getPointData(nextPage = false)
|
|
|
|
|
- }
|
|
|
|
|
- )
|
|
|
|
|
- } else {
|
|
|
|
|
- TipDialog.show(
|
|
|
|
|
- title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
|
|
|
|
|
- .toString(),
|
|
|
|
|
- dialogType = TipDialog.DialogType.ERROR,
|
|
|
|
|
- msg = CommonUtils.getStr(R.string.update_point_failed)
|
|
|
|
|
- .toString(),
|
|
|
|
|
- countDownTime = 10,
|
|
|
|
|
- showConfirm = false,
|
|
|
|
|
- onCancelClick = {
|
|
|
|
|
- getPointData(nextPage = false)
|
|
|
|
|
- }
|
|
|
|
|
- )
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ UpdatePointDialog.show(item, viewModel.workstationData.map {
|
|
|
|
|
+ TextDropDownDialog.SimpleTextDropDownEntity(
|
|
|
|
|
+ dataId = it.workstationId,
|
|
|
|
|
+ dataText = it.workstationName
|
|
|
|
|
+ )
|
|
|
|
|
+ }, viewModel.rfidTokenData.map {
|
|
|
|
|
+ TextDropDownDialog.SimpleTextDropDownEntity(
|
|
|
|
|
+ dataId = it.rfidId,
|
|
|
|
|
+ dataText = "${it.rfidCode}(${it.rfid})"
|
|
|
|
|
+ )
|
|
|
|
|
+ }) { data, dialog ->
|
|
|
|
|
+ viewModel.updateIsolationPoint(data).observe(this@PointMangeFragment) {
|
|
|
|
|
+ dialog.dismiss()
|
|
|
|
|
+ if (it) {
|
|
|
|
|
+ TipDialog.show(
|
|
|
|
|
+ title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_succeed)
|
|
|
|
|
+ .toString(),
|
|
|
|
|
+ dialogType = TipDialog.DialogType.SUCCESS,
|
|
|
|
|
+ msg = CommonUtils.getStr(R.string.update_point_succeed)
|
|
|
|
|
+ .toString(),
|
|
|
|
|
+ countDownTime = 10,
|
|
|
|
|
+ showConfirm = false,
|
|
|
|
|
+ onCancelClick = {
|
|
|
|
|
+ getPointData(nextPage = false)
|
|
|
|
|
+ }
|
|
|
|
|
+ )
|
|
|
|
|
+ } else {
|
|
|
|
|
+ TipDialog.show(
|
|
|
|
|
+ title = CommonUtils.getStr(com.grkj.ui_base.R.string.action_failed)
|
|
|
|
|
+ .toString(),
|
|
|
|
|
+ dialogType = TipDialog.DialogType.ERROR,
|
|
|
|
|
+ msg = CommonUtils.getStr(R.string.update_point_failed)
|
|
|
|
|
+ .toString(),
|
|
|
|
|
+ countDownTime = 10,
|
|
|
|
|
+ showConfirm = false,
|
|
|
|
|
+ onCancelClick = {
|
|
|
|
|
+ getPointData(nextPage = false)
|
|
|
|
|
+ }
|
|
|
|
|
+ )
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -205,6 +199,7 @@ class PointMangeFragment : BaseFragment<FragmentPointManageBinding>() {
|
|
|
super.initData()
|
|
super.initData()
|
|
|
viewModel.pointFilterData = null
|
|
viewModel.pointFilterData = null
|
|
|
viewModel.getInUsePointData().observe(this) {}
|
|
viewModel.getInUsePointData().observe(this) {}
|
|
|
|
|
+ viewModel.initDialogData().observe(this) {}
|
|
|
getPointData(nextPage = false)
|
|
getPointData(nextPage = false)
|
|
|
}
|
|
}
|
|
|
|
|
|