1.修改Android RedAnt Mobile日期选择显示不全。

2.修改Android RedAnt Mobile Search、Search Setting按钮图标不正确。
3.修改Android RedAnt Mobile Search Result Menu。
4.修改Android RedAnt Mobile多选排序。
5.修改Android RedAnt Mobile Model界面对齐方式。

RedAnt Mobile/app/src/main/java/com/usai/redant/CommonEditor/CommonEditorActivity.java

@@ -47,6 +47,7 @@ import com.usai.redant.CommonEditor.CommonEditor.CommonEditorSectionHeaderHolder
 import com.usai.redant.CommonEditor.CommonEditor.CommonEditorSignatureCellHolder;
 import com.usai.redant.CommonEditor.CommonEditor.CommonEditorSwitchCellHolder;
 import com.usai.redant.CommonEditor.CommonEditor.CommonEditorTextViewCellHolder;
+import com.usai.redant.CommonEditor.EnumSelectAndSort.EnumSelectAndSortActivity;
 import com.usai.redant.redantmobile.R;
 import com.usai.redant.util.Network;
 
@@ -150,11 +151,15 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
             outState.putString("request_url",service_url);
         }
 
+        if (getTitle() != null) {
+            outState.putString("title",getTitle().toString());
+        }
+
         outState.putInt("url_type",url_type);
         outState.putBundle("params",selfParams);
     }
 
-    public static Intent build(Context context,Class cls,int URLType,String requestURL,Bundle params) {
+    public static Intent build(Context context,Class cls,String title,int URLType,String requestURL,Bundle params) {
 
         if (context == null || cls == null) {
             return null;
@@ -172,6 +177,11 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
             intent.putExtra("params",params);
         }
 
+
+        if (title != null) {
+            intent.putExtra("title",title);
+        }
+
         return intent;
     }
 
@@ -236,10 +246,14 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
             service_url = savedInstanceState.getString("request_url");
             url_type = savedInstanceState.getInt("url_type");
             selfParams = savedInstanceState.getBundle("params");
+            String title = savedInstanceState.getString("title");
+            setTitle(title);
 
         } else {
             service_url = getIntent().getStringExtra("request_url");
             url_type = getIntent().getIntExtra("url_type",URL_REMOTE);
+            String title = getIntent().getStringExtra("title");
+            setTitle(title);
 
             Bundle params = getIntent().getBundleExtra("params");
             if (params != null) {
@@ -2160,7 +2174,10 @@ public class CommonEditorActivity extends AppCompatActivity implements View.OnLa
                     boolean singleSelect = single_select.toLowerCase().equals("true");
                     String cadedate_str = cadedate_json.toString();
                     intent = new EnumSlectActivity.Builder().build(mCtx,title,max_select,groupPosition,childPosition,cadedate_str,singleSelect,true);
-//                    intent = new EnumSelectAndSortActivity.Builder().build(mCtx,title,max_select,groupPosition,childPosition,cadedate_str,singleSelect,true);
+                    boolean sort = item_json.getBoolean("sort");
+                    if (sort) {
+                        intent = new EnumSelectAndSortActivity.Builder().build(mCtx,title,max_select,groupPosition,childPosition,cadedate_str,singleSelect,true);
+                    }
                     request_code = 10;
 
                 } // enum

RedAnt Mobile/app/src/main/java/com/usai/redant/Result/SearchResultActivity.java

@@ -126,64 +126,112 @@ public class SearchResultActivity extends AppCompatActivity implements AbsListVi
         outState.putBundle("query_params",mParams);
     }
 
+    // 动态修改Menu
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.result_menu,menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        menu.clear();
 
-        if (item.getItemId() == R.id.result_menu) {
 
+        if (resultData != null) {
             try {
+                JSONArray menu_json = resultData.getJSONArray("menu");
 
-                JSONArray menu = resultData.getJSONArray("menu");
+                if (menu_json != null && menu_json.length() > 0) {
 
-                if (menu.length() > 0) {
-                    ArrayList<String> titleList = new ArrayList<>();
-
-                    for (int i = 0; i < menu.length(); i++) {
-                        JSONObject json = menu.getJSONObject(i);
+                    for (int i = 0; i < menu_json.length(); i++) {
+                        JSONObject json = menu_json.getJSONObject(i);
                         String title = json.getString("title");
-                        titleList.add(title);
+                        menu.add(0, i, 0, title);
                     }
+                }
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
 
-                    new AlertDialog.Builder(mContext)
-                            .setSingleChoiceItems((String[])titleList.toArray(new String[titleList.size()]), -1, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
+        return true;
+    }
 
-                                    try {
-                                        JSONArray menu = resultData.getJSONArray("menu");
-                                        JSONObject json = menu.getJSONObject(which);
+//    @Override
+//    public boolean onCreateOptionsMenu(Menu menu) {
+//        getMenuInflater().inflate(R.menu.result_menu,menu);
+//        return true;
+//    }
 
-                                        String actionType = json.getString("action");
-                                        String url = json.optString("url");
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
 
-                                        if (actionType.equals("download")) {
-                                            export(url);
-                                        } else if (actionType.equals("save")) {
-                                            if(BuildConfig.DEBUG && true){
-                                                //do something for assert aim
-                                                Log.e("Result", "onOptionsItemSelected DialogClick: not implement");
-                                            }
-                                        }
+//        if (item.getItemId() == R.id.result_menu) {
+//
+//            try {
+//
+//                JSONArray menu = resultData.getJSONArray("menu");
+//
+//                if (menu.length() > 0) {
+//                    ArrayList<String> titleList = new ArrayList<>();
+//
+//                    for (int i = 0; i < menu.length(); i++) {
+//                        JSONObject json = menu.getJSONObject(i);
+//                        String title = json.getString("title");
+//                        titleList.add(title);
+//                    }
+//
+//                    new AlertDialog.Builder(mContext)
+//                            .setSingleChoiceItems((String[])titleList.toArray(new String[titleList.size()]), -1, new DialogInterface.OnClickListener() {
+//                                @Override
+//                                public void onClick(DialogInterface dialog, int which) {
+//
+//                                    try {
+//                                        JSONArray menu = resultData.getJSONArray("menu");
+//                                        JSONObject json = menu.getJSONObject(which);
+//
+//                                        String actionType = json.getString("action");
+//                                        String url = json.optString("url");
+//
+//                                        if (actionType.equals("download")) {
+//                                            export(url);
+//                                        } else if (actionType.equals("save")) {
+//                                            if(BuildConfig.DEBUG && true){
+//                                                //do something for assert aim
+//                                                Log.e("Result", "onOptionsItemSelected DialogClick: not implement");
+//                                            }
+//                                        }
+//
+//                                    } catch (JSONException exception) {
+//                                        Log.d("Result", "onClick: ",exception);
+//                                    }
+//                                    dialog.dismiss();
+//                                }
+//                            })
+//                            .show();
+//                }
+//
+//            } catch (JSONException e) {
+//                Log.e("Result", "onOptionsItemSelected: ", e);
+//            }
+//
+//        }
 
-                                    } catch (JSONException exception) {
-                                        Log.d("Result", "onClick: ",exception);
-                                    }
-                                    dialog.dismiss();
-                                }
-                            })
-                            .show();
+        int which = item.getItemId();
+        try {
+            JSONArray menu = resultData.getJSONArray("menu");
+            JSONObject json = menu.getJSONObject(which);
+
+            String actionType = json.getString("action");
+            String url = json.optString("url");
+
+            if (actionType.equals("download")) {
+                export(url);
+            } else if (actionType.equals("save")) {
+                if(BuildConfig.DEBUG && true){
+                    //do something for assert aim
+                    Log.e("Result", "onOptionsItemSelected DialogClick: not implement");
                 }
-
-            } catch (JSONException e) {
-                Log.e("Result", "onOptionsItemSelected: ", e);
             }
 
+        } catch (JSONException exception) {
+            Log.d("Result", "onClick: ",exception);
         }
 
         return true;
@@ -1017,7 +1065,7 @@ public class SearchResultActivity extends AppCompatActivity implements AbsListVi
     }
 
     public void showOrderDetail() {
-        Intent intent = OrderDetailActivity.build(mContext,OrderDetailActivity.class,URL_REMOTE,null,new Bundle());
+        Intent intent = OrderDetailActivity.build(mContext,OrderDetailActivity.class,null,URL_REMOTE,null,new Bundle());
 
         startActivity(intent);
     }

RedAnt Mobile/app/src/main/res/layout/activity_date_picker.xml

@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:datePickerMode="spinner"
+        android:calendarViewShown="false"
         android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"/>
 

RedAnt Mobile/app/src/main/res/layout/activity_model.xml

@@ -159,17 +159,14 @@
 
     <Button
         android:id="@+id/btn_type"
-        style="@style/ResultButton"
+        style="@style/ShareButton"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="0dp"
-        android:layout_marginRight="0dp"
-        android:layout_marginTop="8dp"
+        android:layout_height="0dp"
         android:text="Type"
         android:textColor="@color/blue"
         app:layout_constraintBottom_toBottomOf="@+id/barcode_tv"
         app:layout_constraintRight_toRightOf="@+id/note_et"
-        app:layout_constraintTop_toTopOf="@+id/barcode_tv" />
+        app:layout_constraintTop_toTopOf="@+id/barcode_tv"/>
 
 
 </android.support.constraint.ConstraintLayout>

RedAnt Mobile/app/src/main/res/layout/ram_mode_cell.xml

@@ -25,7 +25,7 @@
         android:layout_weight="1"
         android:background="#00000000"
         android:scaleType="centerInside"
-        android:src="@drawable/camera"/>
+        android:src="@drawable/setting"/>
 
 
 

RedAnt Mobile/app/src/main/res/menu/ram_search_menu.xml

@@ -4,7 +4,6 @@
 
     <item android:id="@+id/ram_search_search_btn"
           android:title="Search"
-          android:icon="@drawable/camera"
           app:showAsAction="always">
 
     </item>

RedAnt Mobile/app/src/main/res/menu/ram_search_setting_menu.xml

@@ -6,7 +6,6 @@
         android:id="@+id/ram_search_setting_save"
         android:title="Save"
         app:showAsAction="always"
-        android:icon="@drawable/camera"
         >
 
     </item>