添加主板配置补充校验逻辑；优化设备状态页不同item显示判断

app/src/main/java/com/grkj/iscs/view/fragment/DeviceStatusFragment.kt

@@ -94,7 +94,7 @@ class DeviceStatusFragment : BaseMvpFragment<IDeviceStatusView, DeviceStatusPres
         }
 
         override fun isForViewType(item: DockStatusBO?, position: Int): Boolean {
-            return item?.dockList?.any { it.type == DOCK_TYPE_KEY } == true
+            return item?.dockList?.all { it.type == DOCK_TYPE_KEY } == true
         }
     }
 
@@ -114,7 +114,7 @@ class DeviceStatusFragment : BaseMvpFragment<IDeviceStatusView, DeviceStatusPres
         }
 
         override fun isForViewType(item: DockStatusBO?, position: Int): Boolean {
-            return item?.dockList?.any { it.type == DOCK_TYPE_LOCK } == true
+            return item?.dockList?.all { it.type == DOCK_TYPE_LOCK } == true
         }
     }
 

app/src/main/java/com/grkj/iscs/view/presenter/SystemSettingPresenter.kt

@@ -86,6 +86,10 @@ class SystemSettingPresenter : BasePresenter<ISystemSettingView>() {
                     ToastUtils.tip(R.string.row_and_column_conflict)
                     return
                 }
+                if (dockList.any { it.row == row && it.type != type }) {
+                    ToastUtils.tip(R.string.row_conflict)
+                    return
+                }
             } else if (type == DOCK_TYPE_LOCK) {
                 if (dockList.any { it.row == row }) {
                     ToastUtils.tip(R.string.row_conflict)