|
@@ -16,6 +16,7 @@ import com.google.android.flexbox.FlexboxLayoutManager
|
|
|
import com.google.android.flexbox.JustifyContent
|
|
import com.google.android.flexbox.JustifyContent
|
|
|
import com.grkj.data.config.ISCSConfig
|
|
import com.grkj.data.config.ISCSConfig
|
|
|
import com.grkj.data.data.EventConstants
|
|
import com.grkj.data.data.EventConstants
|
|
|
|
|
+import com.grkj.data.data.MMKVConstants
|
|
|
import com.grkj.data.enums.HardwareMode
|
|
import com.grkj.data.enums.HardwareMode
|
|
|
import com.grkj.data.hardware.DockData
|
|
import com.grkj.data.hardware.DockData
|
|
|
import com.grkj.data.hardware.modbus.DockBean
|
|
import com.grkj.data.hardware.modbus.DockBean
|
|
@@ -29,6 +30,7 @@ import com.grkj.iscs.features.init.viewmodel.InitDeviceRegistrationKeyAndLockVie
|
|
|
import com.grkj.shared.model.EventBean
|
|
import com.grkj.shared.model.EventBean
|
|
|
import com.grkj.ui_base.base.BaseFragment
|
|
import com.grkj.ui_base.base.BaseFragment
|
|
|
import com.grkj.ui_base.utils.CommonUtils
|
|
import com.grkj.ui_base.utils.CommonUtils
|
|
|
|
|
+import com.sik.sikcore.extension.getMMKVData
|
|
|
import com.sik.sikcore.extension.setDebouncedClickListener
|
|
import com.sik.sikcore.extension.setDebouncedClickListener
|
|
|
import com.sik.sikcore.thread.ThreadUtils
|
|
import com.sik.sikcore.thread.ThreadUtils
|
|
|
import dagger.hilt.android.AndroidEntryPoint
|
|
import dagger.hilt.android.AndroidEntryPoint
|
|
@@ -64,7 +66,13 @@ class InitDeviceRegistrationKeyAndLockFragment :
|
|
|
navController.navigate(R.id.action_initDeviceRegistrationKeyAndLockFragment_to_initCardRegistrationFragment)
|
|
navController.navigate(R.id.action_initDeviceRegistrationKeyAndLockFragment_to_initCardRegistrationFragment)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- binding.dockRv.linear().dividerSpace(
|
|
|
|
|
|
|
+ binding.dockRv.apply {
|
|
|
|
|
+ if (MMKVConstants.KEY_HARDWARE_MODE.getMMKVData(HardwareMode.MODBUS.name) == HardwareMode.MODBUS.name) {
|
|
|
|
|
+ linear()
|
|
|
|
|
+ } else {
|
|
|
|
|
+ grid(2)
|
|
|
|
|
+ }
|
|
|
|
|
+ }.dividerSpace(
|
|
|
requireContext().resources.getDimension(com.grkj.ui_base.R.dimen.iscs_space_4)
|
|
requireContext().resources.getDimension(com.grkj.ui_base.R.dimen.iscs_space_4)
|
|
|
.toInt(), DividerOrientation.GRID
|
|
.toInt(), DividerOrientation.GRID
|
|
|
).setup {
|
|
).setup {
|
|
@@ -99,7 +107,13 @@ class InitDeviceRegistrationKeyAndLockFragment :
|
|
|
val keyDatas = keyDock.flatMap { it.keyData }
|
|
val keyDatas = keyDock.flatMap { it.keyData }
|
|
|
val newKeyDock = DockData.KeyDock()
|
|
val newKeyDock = DockData.KeyDock()
|
|
|
newKeyDock.keyData.addAll(keyDatas)
|
|
newKeyDock.keyData.addAll(keyDatas)
|
|
|
- val newKeyDockList = newKeyDock.keyData.chunked(4).map { subList ->
|
|
|
|
|
|
|
+ val newKeyDockList = newKeyDock.keyData.let {
|
|
|
|
|
+ if (MMKVConstants.KEY_HARDWARE_MODE.getMMKVData(HardwareMode.MODBUS.name) == HardwareMode.MODBUS.name) {
|
|
|
|
|
+ it.chunked(4)
|
|
|
|
|
+ }else{
|
|
|
|
|
+ it.chunked(2)
|
|
|
|
|
+ }
|
|
|
|
|
+ }.map { subList ->
|
|
|
DockData.KeyDock().apply { keyData.addAll(subList) }
|
|
DockData.KeyDock().apply { keyData.addAll(subList) }
|
|
|
}
|
|
}
|
|
|
val lockDock = HardwareMode.getCurrentHardwareMode().getLockDockData()
|
|
val lockDock = HardwareMode.getCurrentHardwareMode().getLockDockData()
|
|
@@ -130,7 +144,13 @@ class InitDeviceRegistrationKeyAndLockFragment :
|
|
|
lockDock: DockData.LockDock,
|
|
lockDock: DockData.LockDock,
|
|
|
) {
|
|
) {
|
|
|
val itemBinding = getBinding<ItemDeviceRegistrationLockLayoutBinding>()
|
|
val itemBinding = getBinding<ItemDeviceRegistrationLockLayoutBinding>()
|
|
|
- itemBinding.rvLockLayout.grid(10).dividerSpace(10, DividerOrientation.GRID).setup {
|
|
|
|
|
|
|
+ itemBinding.rvLockLayout.apply {
|
|
|
|
|
+ if (MMKVConstants.KEY_HARDWARE_MODE.getMMKVData(HardwareMode.MODBUS.name) == HardwareMode.MODBUS.name) {
|
|
|
|
|
+ grid(10)
|
|
|
|
|
+ } else {
|
|
|
|
|
+ grid(5)
|
|
|
|
|
+ }
|
|
|
|
|
+ }.dividerSpace(10, DividerOrientation.GRID).setup {
|
|
|
addType<DockData.LockDock.LockBean>(R.layout.item_device_registration_lock)
|
|
addType<DockData.LockDock.LockBean>(R.layout.item_device_registration_lock)
|
|
|
onBind {
|
|
onBind {
|
|
|
val itemLockBinding = getBinding<ItemDeviceRegistrationLockBinding>()
|
|
val itemLockBinding = getBinding<ItemDeviceRegistrationLockBinding>()
|