Fix the problem that the background data format error will cause the common editor to crash. -- 修复后台数据格式错误会引起common editor 闪退的问题。(resolve: #14656)

ApexDrivers/CommonEditorLib/src/main/java/com/usai/commoneditorlib/CommonEditorActivity.java

@@ -1282,7 +1282,10 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
                 @Override
                 public void run() {
                     JSONObject refresh_params = get_refresh_param();
+                    if (refresh_params == null)
+                        return;
                     Iterator<String> iterator = refresh_params.keys();
+
                     while (iterator.hasNext()) {
                         String key = iterator.next();
                         String obj_str = "" + refresh_params.optString(key);
@@ -2824,13 +2827,13 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
             holder.startMark.setVisibility(View.INVISIBLE);
         }
 
-        if (cancommit == false && required.equals("true") && (value == null || value.length() == 0)) {
-            // 阴影 red
-            holder.title_lb.setBackground(getResources().getDrawable(R.drawable.red_border));
-        } else {
-            // 无阴影
-            holder.title_lb.setBackground(null);
-        }
+//        if (cancommit == false && required.equals("true") && (value == null || value.length() == 0)) {
+//            // 阴影 red
+//            holder.title_lb.setBackground(getResources().getDrawable(R.drawable.red_border));
+//        } else {
+//            // 无阴影
+//            holder.title_lb.setBackground(null);
+//        }
 
     }
 
@@ -3100,13 +3103,13 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
             holder.startMark.setVisibility(View.INVISIBLE);
         }
 
-        if (cancommit == false && required != null && required.equals("true") && (value == null || value.length() == 0)) {
-            // 阴影 red
-            holder.name_lb.setBackground(getResources().getDrawable(R.drawable.red_border));
-        } else {
-            // 无阴影
-            holder.name_lb.setBackground(null);
-        }
+//        if (cancommit == false && required != null && required.equals("true") && (value == null || value.length() == 0)) {
+//            // 阴影 red
+//            holder.name_lb.setBackground(getResources().getDrawable(R.drawable.red_border));
+//        } else {
+//            // 无阴影
+//            holder.name_lb.setBackground(null);
+//        }
 
 
 
@@ -3257,7 +3260,7 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
             required = item_json.optString("required");
             data = item_json.optJSONObject("data");
             data = item_json.optJSONObject("data");
-
+            disable = item_json.optBoolean("disable",false);
 
             if (disable || readonly) {
                 holder.action_lb.setTextColor(Color.LTGRAY);
@@ -3445,13 +3448,13 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
             }
 
 
-            if (cancommit == false && required.equals("true") && (value == null || value.length() == 0)) {
-                // 阴影 red
-                holder.title_lb.setBackground(getResources().getDrawable(R.drawable.red_border));
-            } else {
-                // 无阴影
-                holder.title_lb.setBackground(null);
-            }
+//            if (cancommit == false && required.equals("true") && (value == null || value.length() == 0)) {
+//                // 阴影 red
+//                holder.title_lb.setBackground(getResources().getDrawable(R.drawable.red_border));
+//            } else {
+//                // 无阴影
+//                holder.title_lb.setBackground(null);
+//            }
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -3648,11 +3651,11 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
             holder.startMark.setVisibility(View.INVISIBLE);
         }
 
-        if (cancommit == false && required.equals("true") && (value == null || value.length() == 0)) {
-            // red shadow
-        } else {
-            // no shadow
-        }
+//        if (cancommit == false && required.equals("true") && (value == null || value.length() == 0)) {
+//            // red shadow
+//        } else {
+//            // no shadow
+//        }
 
     }
 
@@ -3673,11 +3676,11 @@ protected void commonAction(String value, int groupIndex,int itemIndex,JSONObjec
             holder.startMark.setVisibility(View.INVISIBLE);
         }
 
-        if (cancommit == false && required.equals("true") && (value == null || value.length() == 0)) {
-            // red shadow
-        } else {
-            // no shadow
-        }
+//        if (cancommit == false && required.equals("true") && (value == null || value.length() == 0)) {
+//            // red shadow
+//        } else {
+//            // no shadow
+//        }
 
     }
 

ApexDrivers/ratradefiling/build.gradle

@@ -17,8 +17,8 @@ android {
         applicationId "com.usai.ratradefiling"
         minSdkVersion 26
         targetSdkVersion 29
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.1"
 //        ndk.abiFilters 'armeabi-v7a',"arm64-v8a"
 
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

ApexDrivers/ratradefiling/src/debug/assets/edit_isf.json

@@ -64,7 +64,8 @@
       "name": "",
       "value": "editor",
       "refresh": 1,
-      "aname": "ADD PARTY"
+      "aname": "ADD PARTY",
+      "disable": true
     },
     "item_10": {
       "control": "action",

ApexDrivers/ratradefiling/src/debug/assets/edit_party.json

@@ -33,7 +33,7 @@
             "aname": "Addres1s 1",
             "name": "address_11",
             "value": "",
-            "required": "false"
+            "required": "true"
         },
         "item_2": {
             "control": "edit",