Remove the common editor part of the window theme settings to make the window style consistent with the app style -- 去掉common editor 部分窗口主题设置，使窗口样式和app样式保持一致(resolve: #14622)

online enum add mapping filling function -- online enum 增加映射填充功能 (issue30: #14624)

ApexDrivers/CommonEditorLib/src/main/AndroidManifest.xml

@@ -8,17 +8,17 @@
     <activity
         android:name=".CommonEditorActivity"
         android:theme="@style/Theme.AppCompat.Light">
-        >
+
     </activity>
     <activity
         android:name=".ImageUploadActivity"
-        android:theme="@style/Theme.AppCompat.Light">
         >
+
     </activity>
     <activity
         android:name=".ImageViewActivity"
-        android:theme="@style/Theme.AppCompat.Light">
         >
+
     </activity>
     <activity
         android:name=".BundleModelActivity"
@@ -42,34 +42,35 @@
     </activity>
     <activity
         android:name=".EnumSlectActivity"
-        android:theme="@style/Theme.AppCompat.Light">
+        >
         >
     </activity>
     <activity
         android:name=".DatePickerActivity"
-        android:theme="@style/Theme.AppCompat.Light">
         >
+
     </activity>
     <activity
         android:name=".MonthPickerActivity"
-        android:theme="@style/Theme.AppCompat.Light">
         >
+
+
     </activity>
     <activity
         android:name=".SignatureActivity"
-        android:theme="@style/Theme.AppCompat.Light">
         >
+
     </activity>
 
 
         <activity
             android:name=".EnumSelectAndSort.EnumSelectAndSortActivity"
-            android:theme="@style/Theme.AppCompat.Light">
+            >
         </activity>
         <activity
             android:name=".EnumSlectOnlineActivity"
-            android:theme="@style/Theme.AppCompat.Light">
+            >
         </activity>
 
-    </application>>
+    </application>
 </manifest>

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

@@ -522,7 +522,25 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
             }
 
         }
+        // online enum select from action
+        if (requestCode == 15) {
 
+            String cadedate_str = data.getStringExtra(EnumSlectActivity.CADEDATE);
+            if (cadedate_str == null || cadedate_str.isEmpty()) {
+                return;
+            }
+            try {
+                JSONObject cadedate = new JSONObject(cadedate_str);
+                int group = data.getIntExtra(EnumSlectActivity.GROUP_POSITION,0);
+                int child = data.getIntExtra(EnumSlectActivity.CHILD_POSITION,0);
+
+                handle_action_return(cadedate,group,child,ACTION_FILL_SECTION);
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+        }
         // date picker
         if (requestCode == 11) {
 //            int group = data.getIntExtra(AddressEditorActivity.GROUP,0);
@@ -2327,6 +2345,7 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
                     }
                     else
                     {
+
                         boolean sort = item_json.optBoolean("sort",false);
 
 
@@ -2340,9 +2359,9 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
                         }
                     }
 
+                    request_code = 10;
 
 
-                    request_code = 10;
 
                 } // enum
                 else if (control.equals("action")) {

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

@@ -38,6 +38,7 @@ import org.w3c.dom.Text;
 
 import java.io.Serializable;
 
+import static com.usai.commoneditorlib.EnumSlectActivity.CADEDATE;
 import static com.usai.redant.rautils.utils.Network.RESULT_LOGIN_ON_OTHER_DEVICE;
 import static com.usai.redant.rautils.utils.RAUtil.getJsonFromAsset;
 import static java.lang.Thread.sleep;
@@ -59,6 +60,8 @@ public class EnumSlectOnlineActivity extends AppCompatActivity
     private final int LoadDataOptionReload = 1;
     private final int LoadDataOptionLoadMore = 2;
 
+    JSONObject online_cadedate;
+
 
     //    Bundle params;
 //    String url;
@@ -490,7 +493,7 @@ public class EnumSlectOnlineActivity extends AppCompatActivity
         if (mDirty != false)
         {
             Intent intent = new Intent();
-//            intent.putExtra(CADEDATE,mCadedate.toString());
+            intent.putExtra(CADEDATE,online_cadedate.toString());
             intent.putExtra(GROUP_POSITION, mGroup);
             intent.putExtra(CHILD_POSITION, mChild);
 
@@ -548,31 +551,36 @@ public class EnumSlectOnlineActivity extends AppCompatActivity
 
 //                    if (mKeywords == null || mKeywords.isEmpty()) {
 
-                    for (int i = 0; i < mCadedate.optInt("count"); i++)
-                    {
-                        JSONObject val_json = mCadedate.optJSONObject("val_" + i);
+                    JSONObject val_json = mCadedate.optJSONObject("val_"+position);
+                    online_cadedate = new JSONObject();
+                    online_cadedate.put("count",1);
+                    online_cadedate.put("val_0",val_json);
 
-                        if (i == position)
-                        {
-                            int select = val_json.optInt("check");
-                            if (select == 0)
-                            {
-                                val_json.put("check", "1");
-                            }
-//                            else
+//                    for (int i = 0; i < mCadedate.optInt("count"); i++)
+//                    {
+//                        JSONObject val_json = mCadedate.optJSONObject("val_" + i);
+//
+//                        if (i == position)
+//                        {
+//                            int select = val_json.optInt("check");
+//                            if (select == 0)
 //                            {
-//                                val_json.put("check", "0");
+//                                val_json.put("check", "1");
 //                            }
-//                            is_worked =true;
-                        }
-                        else
-                        {
-                            val_json.put("check", "0");
-                        }
-                        mCadedate.put("val_" + i, val_json);
-
-
-                    } // for
+////                            else
+////                            {
+////                                val_json.put("check", "0");
+////                            }
+////                            is_worked =true;
+//                        }
+//                        else
+//                        {
+//                            val_json.put("check", "0");
+//                        }
+//                        mCadedate.put("val_" + i, val_json);
+//
+//
+//                    } // for
 
 //                    } // keywords null
 //                    else {
@@ -648,6 +656,9 @@ public class EnumSlectOnlineActivity extends AppCompatActivity
                 else
                 {
 
+                    if(true)
+                        throw new AssertionError("EnumSelectOnlineActivity.multiple select is not impl");
+
                     int index = position;
                     JSONObject val_json = null;
 //                    if (mKeywords == null || mKeywords.isEmpty()) {

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/tfeditor/TFEditorActivity.java

@@ -384,7 +384,7 @@ public class TFEditorActivity extends CommonEditorActivity
 
             Intent intent = new EnumSlectOnlineActivity.Builder().build(mCtx,title,max_select,groupIndex,itemIndex,singleSelect,true,ONLINE_ENUM_URL,params);
 
-            int request_code = 10;
+            int request_code = 15;
 
             startActivityForResult(intent,request_code);
 //            EnumSelectOnlineViewController* enumvc =[[UIStoryboard storyboardWithName:@"CommonEditor" bundle:nil] instantiateViewControllerWithIdentifier:@"EnumSelectOnlineViewController"];
@@ -469,7 +469,7 @@ public class TFEditorActivity extends CommonEditorActivity
 
             Intent intent = new EnumSlectOnlineActivity.Builder().build(mCtx,title,max_select,groupIndex,itemIndex,singleSelect,true,ONLINE_ENUM_URL,params);
 
-            int request_code = 10;
+            int request_code = 15;
 
             startActivityForResult(intent,request_code);
 //            EnumSelectOnlineViewController* enumvc =[[UIStoryboard storyboardWithName:@"CommonEditor" bundle:nil] instantiateViewControllerWithIdentifier:@"EnumSelectOnlineViewController"];