Frankensteinly 1 год назад
Родитель
Сommit
0765293d9c

+ 9 - 3
app/src/main/java/com/grkj/iscs/view/presenter/SystemSettingPresenter.kt

@@ -66,9 +66,15 @@ class SystemSettingPresenter : BasePresenter<ISystemSettingView>() {
             ToastUtils.tip(R.string.please_input_row)
             return
         }
-        if (column.isEmpty()) {
-            ToastUtils.tip(R.string.please_input_column)
-            return
+        if (type == DOCK_TYPE_KEY) {
+            if (column.isEmpty()) {
+                ToastUtils.tip(R.string.please_input_column)
+                return
+            }
+            if (column.toInt() != 1 || column.toInt() != 2) {
+                ToastUtils.tip(R.string.column_must_be_1_or_2)
+                return
+            }
         }
         if (dockList.any { it.row == row && it.column == column }) {
             ToastUtils.tip(R.string.row_and_column_conflict)

+ 2 - 1
app/src/main/res/values/strings.xml

@@ -285,6 +285,7 @@
     <string name="row">行</string>
     <string name="column">列</string>
     <string name="please_input_row">请输入行号</string>
-    <string name="please_input_column">请输入列号</string>
+    <string name="please_input_column">请输入钥匙列号</string>
     <string name="row_and_column_conflict">存在相同的行列号,请重新输入</string>
+    <string name="column_must_be_1_or_2">钥匙列号只能输入1或者2</string>
 </resources>