Common editor is required *The mark is not displayed in red -- common editor 必填项*标记没有红色显示(resolve: #14516)

Common editor 部分控件disable 处理逻辑错误(resolve: #14514)
Common editor parsing the disable option error, causing all controls to be grayed out -- Common editor 解析disable 选项出错，导致所有控件无法变灰 (resolve: #14513)

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

@@ -2173,8 +2173,8 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
                 JSONObject item_json = content_data_control.optJSONArray(groupPosition).optJSONObject(childPosition);
                 String control = item_json.optString("control");
                 if (control.equals("enum")) {
-                    int disable = item_json.optInt("disable");
-                    if (disable == 1 || readonly) {
+                    boolean disable = item_json.optBoolean("disable");
+                    if (disable  || readonly) {
                         return false;
                     }
                     JSONObject cadedate_json = item_json.optJSONObject("cadedate");
@@ -2327,7 +2327,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
         String value = null;
         String align = "";
         int capital = 0;
-        int disable = 0;
+        boolean disable = false;
 
         // 重用时先保存
         if (holder.text_view.getText().length() > 0) {
@@ -2346,7 +2346,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
             value = item_json.optString("value");
             align = item_json.optString("align");
             capital = item_json.optInt("capital");
-            disable = item_json.optInt("disable");
+            disable = item_json.optBoolean("disable");
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -2378,7 +2378,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
             break;
         }
 
-        if (disable == 1 || readonly) {
+        if (disable|| readonly) {
             holder.text_view.setEnabled(false);
             holder.text_view.setTextColor(Color.LTGRAY);
         } else {
@@ -2420,7 +2420,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
         String img_url_up_0 = null;
         String img_url_up_1 = null;
         String img_url_up_2 = null;
-        int disable = 0;
+        boolean disable = false;
 
         holder.group = group;
         holder.child = child;
@@ -2446,7 +2446,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
 
             title = item_json.optString("aname");
             value = item_json.optString("value");
-            disable = item_json.optInt("disable");
+            disable = item_json.optBoolean("disable");
             img_url_0 = item_json.optString("img_url_0");
             img_url_up_0 = item_json.optString("img_url_aname_0");
             img_url_1 = item_json.optString("img_url_1");
@@ -2458,7 +2458,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
             e.printStackTrace();
         }
 
-        if (disable == 1 || readonly) {
+        if (disable|| readonly) {
             holder.editable = false;
         } else {
             holder.editable = true;
@@ -2564,7 +2564,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
         String value = null;
         String align = null;
         int capital = 0;
-        int disable = 0;
+        boolean disable = false;
         String keyboard = null;
         String required = null;
 
@@ -2587,7 +2587,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
             value = item_json.optString("value");
             align = item_json.optString("align");
             capital = item_json.optInt("capital");
-            disable = item_json.optInt("disable");
+            disable = item_json.optBoolean("disable");
             keyboard = item_json.optString("keyboard");
 
             if (!keyboard.equals("number") && !keyboard.equals("int")) {
@@ -2643,7 +2643,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
 
         holder.text_field.setInputType(inputType);
 
-        if (disable == 1 || readonly) {
+        if (disable|| readonly) {
             holder.text_field.setEnabled(false);
             holder.text_field.setTextColor(Color.LTGRAY);
         } else {
@@ -2899,7 +2899,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
         String title = null;
         String value = "";
         JSONObject cadedate_json = null;
-        int disable = 0;
+        boolean disable = false;
         String align = null;
         String required = null;
 
@@ -2912,11 +2912,11 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
 
             title = item_json.optString("aname");
             cadedate_json = item_json.optJSONObject("cadedate");
-            disable = item_json.optInt("disable");
+            disable = item_json.optBoolean("disable");
             align = item_json.optString("align");
             required = item_json.optString("required");
 
-            if (disable == 1 && readonly) {
+            if (disable || readonly) {
                 holder.value_lb.setTextColor(Color.LTGRAY);
             } else {
                 holder.value_lb.setTextColor(Color.BLACK);
@@ -3261,7 +3261,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
         holder.min_et.setText(min_str);
         holder.max_et.setText(max_str);
 
-//        if (disable == 1 || readonly) {
+//        if (disable|| readonly) {
 //            holder.text_field.setEnabled(false);
 //            holder.text_field.setTextColor(Color.LTGRAY);
 //        } else {

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_edit_auto_complete_cell.xml

@@ -35,12 +35,11 @@
                 android:id="@+id/start_mark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignTop="@id/name_lb"
                 android:layout_toEndOf="@id/name_lb"
                 android:layout_toRightOf="@id/name_lb"
-                android:layout_alignTop="@id/name_lb"
                 android:text="*"
-                android:textColor="#000000"
-                />
+                android:textColor="#D50000" />
 
         </RelativeLayout>
 

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_edit_auto_complete_cell_small.xml

@@ -36,12 +36,11 @@
                 android:id="@+id/start_mark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignTop="@id/name_lb"
                 android:layout_toEndOf="@id/name_lb"
                 android:layout_toRightOf="@id/name_lb"
-                android:layout_alignTop="@id/name_lb"
                 android:text="*"
-                android:textColor="#000000"
-                />
+                android:textColor="#D50000" />
 
         </RelativeLayout>
 

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_edit_cell.xml

@@ -35,12 +35,11 @@
                 android:id="@+id/start_mark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignTop="@id/name_lb"
                 android:layout_toEndOf="@id/name_lb"
                 android:layout_toRightOf="@id/name_lb"
-                android:layout_alignTop="@id/name_lb"
                 android:text="*"
-                android:textColor="#000000"
-                />
+                android:textColor="#D50000" />
 
         </RelativeLayout>
 

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_edit_cell_small.xml

@@ -36,12 +36,11 @@
                 android:id="@+id/start_mark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignTop="@id/name_lb"
                 android:layout_toEndOf="@id/name_lb"
                 android:layout_toRightOf="@id/name_lb"
-                android:layout_alignTop="@id/name_lb"
                 android:text="*"
-                android:textColor="#000000"
-                />
+                android:textColor="#D50000" />
 
         </RelativeLayout>
 

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_enum_cell.xml

@@ -30,16 +30,16 @@
                 android:gravity="start|center_vertical"
                 android:textAlignment="textStart"
                 />
+
             <TextView
                 android:id="@+id/start_mark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignTop="@id/enum_title_lb"
                 android:layout_toEndOf="@id/enum_title_lb"
                 android:layout_toRightOf="@id/enum_title_lb"
-                android:layout_alignTop="@id/enum_title_lb"
                 android:text="*"
-                android:textColor="#000000"
-                />
+                android:textColor="#D50000" />
 
         </RelativeLayout>
 

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_enum_cell_small.xml

@@ -30,16 +30,16 @@
                 android:gravity="start|center_vertical"
                 android:textAlignment="textStart"
                 />
+
             <TextView
                 android:id="@+id/start_mark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignTop="@id/enum_title_lb"
                 android:layout_toEndOf="@id/enum_title_lb"
                 android:layout_toRightOf="@id/enum_title_lb"
-                android:layout_alignTop="@id/enum_title_lb"
                 android:text="*"
-                android:textColor="#000000"
-                />
+                android:textColor="#D50000" />
 
         </RelativeLayout>
 

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_signature_cell.xml

@@ -35,12 +35,11 @@
                android:id="@+id/start_mark"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+               android:layout_alignTop="@id/signature_title_lb"
                android:layout_toEndOf="@id/signature_title_lb"
                android:layout_toRightOf="@id/signature_title_lb"
-               android:layout_alignTop="@id/signature_title_lb"
                android:text="*"
-               android:textColor="#000000"
-               />
+               android:textColor="#D50000" />
 
        </RelativeLayout>
 

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_signature_cell_small.xml

@@ -35,12 +35,11 @@
                android:id="@+id/start_mark"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
+               android:layout_alignTop="@id/signature_title_lb"
                android:layout_toEndOf="@id/signature_title_lb"
                android:layout_toRightOf="@id/signature_title_lb"
-               android:layout_alignTop="@id/signature_title_lb"
                android:text="*"
-               android:textColor="#000000"
-               />
+               android:textColor="#D50000" />
 
        </RelativeLayout>
 

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_switch_cell.xml

@@ -19,16 +19,16 @@
             android:textColor="#000000"
             android:text="Label"
             />
+
         <TextView
             android:id="@+id/start_mark"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_alignTop="@id/switch_title_lb"
             android:layout_toEndOf="@id/switch_title_lb"
             android:layout_toRightOf="@id/switch_title_lb"
-            android:layout_alignTop="@id/switch_title_lb"
             android:text="*"
-            android:textColor="#000000"
-            />
+            android:textColor="#D50000" />
 
         <Switch
             android:id="@+id/switch_cell_switch"

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_switch_cell_small.xml

@@ -26,16 +26,16 @@
                 android:textColor="#000000"
                 android:text="Label"
                 />
+
             <TextView
                 android:id="@+id/start_mark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignTop="@id/switch_title_lb"
                 android:layout_toEndOf="@id/switch_title_lb"
                 android:layout_toRightOf="@id/switch_title_lb"
-                android:layout_alignTop="@id/switch_title_lb"
                 android:text="*"
-                android:textColor="#000000"
-                />
+                android:textColor="#D50000" />
 
 
         </RelativeLayout>

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_text_view_cell.xml

@@ -29,16 +29,16 @@
                 android:textAlignment="textStart"
                 android:layout_centerVertical="true"
                 />
+
             <TextView
                 android:id="@+id/start_mark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignTop="@id/name_lb"
                 android:layout_toEndOf="@id/name_lb"
                 android:layout_toRightOf="@id/name_lb"
-                android:layout_alignTop="@id/name_lb"
                 android:text="*"
-                android:textColor="#000000"
-                />
+                android:textColor="#D50000" />
 
         </RelativeLayout>
 

ApexDrivers/CommonEditorLib/src/main/res/layout/common_editor_text_view_cell_small.xml

@@ -29,16 +29,16 @@
                 android:textAlignment="textStart"
                 android:layout_centerVertical="true"
                 />
+
             <TextView
                 android:id="@+id/start_mark"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_alignTop="@id/name_lb"
                 android:layout_toEndOf="@id/name_lb"
                 android:layout_toRightOf="@id/name_lb"
-                android:layout_alignTop="@id/name_lb"
                 android:text="*"
-                android:textColor="#000000"
-                />
+                android:textColor="#D50000" />
 
         </RelativeLayout>
 

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/dataprovider/OfflineDataProvider.java

@@ -12,6 +12,7 @@ import org.json.JSONObject;
 import java.io.File;
 
 import static com.usai.redant.rautils.utils.RAUtil.getJsonFromAsset;
+import static java.lang.Thread.sleep;
 
 public class OfflineDataProvider {
 
@@ -38,6 +39,13 @@ public class OfflineDataProvider {
                 e.printStackTrace();
             }
         }
+        try
+        {
+            sleep(2000);
+        } catch (InterruptedException e)
+        {
+            e.printStackTrace();
+        }
         return commObj;
     }
 

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/ResultPresenter.java

@@ -393,7 +393,7 @@ public class ResultPresenter implements ResultAdapter.ResultAdapterDataSource
                             JSONObject item = items.optJSONObject(i);
                             if (item != null) {
 
-                                Log.e("DEBUG!!!", "operationCompletion: "+i );
+//                                Log.e("DEBUG!!!", "operationCompletion: "+i );
                                 ResultBaseModel model = makeModel(item);
                                 if (model != null) {
                                     models.add(model);