Просмотр исходного кода

Modify the cell verification logic of common editor edit and add common text length detection -- 修改common editor edit 单元格校验逻辑,增加普通文本长度检测(resolve: #14664)

Ray Zhang 4 лет назад
Родитель
Сommit
1332d874fb

+ 6 - 5
ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditorActivity.java

@@ -3017,12 +3017,13 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
             disable = item_json.optBoolean("disable");
             keyboard = item_json.optString("keyboard");
 
-            if (!keyboard.equals("number") && !keyboard.equals("int")) {
-                holder.text_field.setFilters(new InputFilter[]{});
-            } else {
-                int lenght = item_json.optInt("length");
+//            if (!keyboard.equals("number") && !keyboard.equals("int")) {
+//                holder.text_field.setFilters(new InputFilter[]{});
+//            } else {
+            int lenght = item_json.optInt("length");
+            if(lenght>0)
                 holder.text_field.setFilters(new InputFilter[]{new InputFilter.LengthFilter(lenght)});
-            }
+//            }
 
 
         } catch (Exception e) {

+ 2 - 1
ApexDrivers/ratradefiling/src/debug/assets/edit_isf.json

@@ -91,7 +91,8 @@
       "value": "DNCYQDFDAL214088",
       "name": "bol",
       "aname": "Bill Of Lading",
-      "required": "true"
+      "required": "true",
+      "length": 5
     },
     "item_1": {
       "control": "enum",

+ 27 - 2
ApexDrivers/ratradefiling/src/debug/assets/edit_party.json

@@ -20,13 +20,38 @@
     ],
     "section_0": {
         "title": "CONTAINER INFORMATION",
-        "count": 7,
+        "count": 10,
+      "item_7": {
+        "control": "edit",
+        "aname": "test 1",
+        "name": "test1",
+        "value": "EMMY''S ARTISAN BAKERY",
+        "required": "false",
+        "length": 5
+      },
+      "item_8": {
+        "control": "edit",
+        "aname": "test 2",
+        "name": "test2",
+        "value": "EMMY''S ARTISAN BAKERY",
+        "required": "false",
+        "length": 5
+      },
+      "item_9": {
+        "control": "edit",
+        "aname": "test 3",
+        "name": "test3",
+        "value": "EMMY''S ARTISAN BAKERY",
+        "required": "false",
+        "length": 5
+      },
         "item_0": {
             "control": "edit",
             "aname": "Addres11s 1",
             "name": "companyname",
             "value": "EMMY''S ARTISAN BAKERY",
-            "required": "false"
+            "required": "false",
+          "length": 5
         },
         "item_1": {
             "control": "edit",

+ 1 - 1
ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/Const.java

@@ -4,7 +4,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 public class Const {
 
-    public static final boolean FAKE_DATA = false;
+    public static final boolean FAKE_DATA = true;
 
     public static final int MY_PERMISSIONS_REQUEST = 1;
     private static final AtomicInteger sNextGeneratedId = new AtomicInteger(1);

+ 2 - 2
ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/dataprovider/OnlineDataProvider.java

@@ -83,10 +83,10 @@ public class OnlineDataProvider extends com.usai.redant.rautils.utils.Network
 
 
 	//DEBUG
-//	public static String		BASE_URL						= "http://192.168.0.161/ACE_ISF_NEW";
+	public static String		BASE_URL						= "http://192.168.0.161/ACE_ISF_NEW";
 
 	//RELEASE
-	public static String		BASE_URL						= "https://ra.united-us.net/doc/bk";
+//	public static String		BASE_URL						= "https://ra.united-us.net/doc/bk";
 
 
 //	URL