ACEM-1 cabinet icon and size font details are misaligned -- ACEM-1 detail 柜子图标与尺寸文字叠加错位 (resolve: #14493)

share function share content is empty --share 功能分享内容为空(resolve: #14489)
Add the delete function of the saved list -- 增加保存列表的删除功能(resolve: #14487)
search time type condition input box error -- search 时间类型条件输入框错误(resolve: #14485)
Uncheck the save password when logging in, it will still be saved -- 登录时不勾保存密码，仍然会保存(resolve: #14472)

ApexDrivers/ratradefiling/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'com.android.application'
 
 android {
 
-    splits {
-        abi {
-            enable true
-            reset()
-            include 'armeabi-v7a'
-            universalApk true
-        }
-    }
+//    splits {
+//        abi {
+//            enable true
+//            reset()
+//            include 'armeabi-v7a'
+//            universalApk true
+//        }
+//    }
 
     compileSdkVersion 29
 
@@ -19,7 +19,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        ndk.abiFilters 'armeabi-v7a',"arm64-v8a"
+//        ndk.abiFilters 'armeabi-v7a',"arm64-v8a"
 
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -120,7 +120,65 @@ public class RADataProvider {
         }
         return array;
     }
+    public static boolean clearSavedList(String type)
+    {
+        String userfilePath = TradeFilingApplication.get_instance().getFilesDir().getPath()+"/"+type+"_"+TradeFilingApplication.get_instance().get_user()+".json";
+//        String  json_user=FileManager.readJson(userfilePath);
+
+
+        JSONArray array=null;
+//        if(TextUtils.isEmpty(json_user))
+//        {
+//            return true;
+//
+//        }
+//        else
+//        {
+            try
+            {
+                array = new JSONArray("[]") ;
+
+            } catch (JSONException e)
+            {
+                array = new JSONArray();
+                e.printStackTrace();
+            }
+
+//        }
+        FileManager.writeJson(array.toString(),userfilePath);
+
 
+        return true;
+    }
+    public static boolean removeSavedList(String type, int index) {
+        String userfilePath = TradeFilingApplication.get_instance().getFilesDir().getPath()+"/"+type+"_"+TradeFilingApplication.get_instance().get_user()+".json";
+        String  json_user=FileManager.readJson(userfilePath);
+
+
+        JSONArray array=null;
+        if(TextUtils.isEmpty(json_user))
+        {
+            return true;
+
+        }
+        else
+        {
+            try
+            {
+                array = new JSONArray(json_user) ;
+                array.remove(index);
+            } catch (JSONException e)
+            {
+                array = new JSONArray();
+                e.printStackTrace();
+            }
+
+        }
+        FileManager.writeJson(array.toString(),userfilePath);
+
+
+        return true;
+    }
     public static boolean saveDetailParametersForModuleWithName(JSONObject param, String module, String name) {
         String userfilePath = TradeFilingApplication.get_instance().getFilesDir().getPath()+"/saved_detail_"+TradeFilingApplication.get_instance().get_user()+".json";
         String  json_user=FileManager.readJson(userfilePath);

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/detail/NewDetailActivity.java

@@ -93,6 +93,8 @@ public class NewDetailActivity extends AppCompatActivity {
             title="eManifest Detail";
                 else if(sub_type.equals("customer"))
                         title="Customer Detail";
+                    else if(sub_type.equals("container"))
+                            title="Container Detail";
         mtitleview.setText(title);
         setTitle(title);
 //

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/my/CheckSavedActivity.java

@@ -18,6 +18,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 
 import com.usai.ratradefiling.R;
+import com.usai.ratradefiling.dataprovider.RADataProvider;
 
 //import com.usai.apex.ApexTrackingApplication;
 //import com.usai.apex.R;
@@ -49,43 +50,40 @@ public class CheckSavedActivity extends AppCompatActivity {
                             public void onClick(DialogInterface dialog,
                                                 int which)
                             {
-//                                SQLiteDatabase db = dbUtil.OpenDB(
-//                                        CheckSavedActivity.this, null, false);
-//                                String function_name = getIntent().getStringExtra("function_name");
-//                                if(function_name.equals("Saved Detail"))
-//                                {
-//
-//                                    db.execSQL(String.format("delete from favorites where user = '%s'", ApexTrackingApplication.get_user()));
-////                                    getSupportFragmentManager().get
-////                                    SavedSearchFragment f = (SavedSearchFragment)getSupportFragmentManager().findFragmentById(R.id.tab1);
-//                                    SavedDetailFragment detail =(SavedDetailFragment) f;
-//                                    detail.clear_result();
-//                                    detail.reload_adapter();
-//                                }
-//                                else if(function_name.equals("Saved Search"))
+
+                                String function_name = getIntent().getStringExtra("function_name");
+                                if(function_name.equals("Saved Log"))
+                                {
+
+                                    RADataProvider.clearSavedList("saved_detail");
+                                    SavedDetailFragment detail =(SavedDetailFragment) f;
+
+                                    detail.clear_result();
+                                    detail.reload_adapter();
+                                }
+                                else if(function_name.equals("Saved Search"))
+                                {
+                                    RADataProvider.clearSavedList("saved_search");
+
+                                    SavedSearchFragment search =(SavedSearchFragment) f;
+                                    search.clear_result();
+                                    search.reload_adapter();
+                                }
+//                                else if(function_name.equals("Saved Documents"))
 //                                {
-//                                    db.execSQL(String.format("delete from history where user = '%s'",ApexTrackingApplication.get_user()));
-////                                    SavedDetailFragment f = (SavedDetailFragment)getSupportFragmentManager().findFragmentById(R.id.tab2);
-//
-//                                    SavedSearchFragment search =(SavedSearchFragment) f;
-//                                    search.clear_result();
-//                                    search.reload_adapter();
+////                                    db.execSQL("delete from favorites");
+//////                                    SavedDetailFragment f = (SavedDetailFragment)getSupportFragmentManager().findFragmentById(R.id.tab2);
+////
+////                                    SavedSearchFragment search =(SavedSearchFragment) f;
+////                                    search.clear_result();
+////                                    search.reload_adapter();
+//                                    SavedDocumentsFragment search =(SavedDocumentsFragment) f;
+//                                    ((SavedDocumentsFragment) f).clear();
 //                                }
-////                                else if(function_name.equals("Saved Documents"))
-////                                {
-//////                                    db.execSQL("delete from favorites");
-////////                                    SavedDetailFragment f = (SavedDetailFragment)getSupportFragmentManager().findFragmentById(R.id.tab2);
-//////
-//////                                    SavedSearchFragment search =(SavedSearchFragment) f;
-//////                                    search.clear_result();
-//////                                    search.reload_adapter();
-////                                    SavedDocumentsFragment search =(SavedDocumentsFragment) f;
-////                                    ((SavedDocumentsFragment) f).clear();
-////                                }
-//
-//
-//                                dbUtil.CloseDB(db);
-//                                dialog.dismiss();
+
+
+
+                                dialog.dismiss();
 
                             }
                         });

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/my/SavedDetailFragment.java

@@ -111,16 +111,12 @@ public class SavedDetailFragment extends TFListFragment
 
 				switch (index) {
 					case 0:
-						// delete
-//						SQLiteDatabase db = dbUtil.OpenDB(getActivity(),
-//								null, false);
-//						db.execSQL("delete from favorites where _id="
-//								+ (Long) searchresult.getData()
-//								.get(position).get("_id"));
-//
-//						dbUtil.CloseDB(db);
-//						searchresult.getData().remove(position);
-//						adapter.notifyDataSetChanged();
+//						 delete
+
+
+						searchresult.getData().remove(position);
+						RADataProvider.removeSavedList("saved_detail",position);
+						adapter.notifyDataSetChanged();
 
 						break;
 				}
@@ -372,6 +368,10 @@ public class SavedDetailFragment extends TFListFragment
 			return datalist.size();
 		}
 
+//		public void remove_record(int index)
+//		{
+//			datalist.remove(index);
+//		}
 		public void add_records(JSONArray array)
 		{
 

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/my/SavedSearchFragment.java

@@ -99,14 +99,13 @@ public class SavedSearchFragment extends TFListFragment
 
 				switch (index) {
 					case 0:
-						// delete
-//						SQLiteDatabase db = dbUtil.OpenDB(getActivity(), null, false);
-//							db.execSQL("delete from history where _id=" + (Long) searchresult.getData().get(position).get("_id"));
-//							dbUtil.CloseDB(db);
-//							searchresult.getData().remove(position);
-//							adapter.notifyDataSetChanged();
-//
-//						break;
+//						 delete
+
+						RADataProvider.removeSavedList("saved_search",position);
+							searchresult.getData().remove(position);
+							adapter.notifyDataSetChanged();
+
+						break;
 				}
 				return false;
 			}

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/search/SearchActivity.java

@@ -251,7 +251,7 @@ public class SearchActivity extends AppCompatActivity implements OnClickListener
 			{
 				JSONObject item = arr.getJSONObject(i);
 				final String aname = item.optString("aname");
-				String field_type = item.optString("string");
+				String field_type = item.optString("type");
 				final String name = item.optString("name");
 
 
@@ -858,12 +858,12 @@ public class SearchActivity extends AppCompatActivity implements OnClickListener
 						String val_to = et_to.getText().toString().trim();
 						if (!TextUtils.isEmpty(val_from))
 						{
-							parms.putString(field_name + "_from", val_from);
+							parms.putString(field_name + "_start", val_from);
 							hascriterion = true;
 						}
 						if (!TextUtils.isEmpty(val_to))
 						{
-							parms.putString(field_name + "_to", val_to);
+							parms.putString(field_name + "_end", val_to);
 							hascriterion = true;
 						}
 					}

ApexDrivers/ratradefiling/src/main/res/layout/detail_cell_container.xml

@@ -115,7 +115,12 @@
         android:id="@+id/tv_size"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="3dp"
+        android:layout_marginBottom="2dp"
         android:text="size"
+        android:textColor="@color/TFRed"
+        android:textSize="10sp"
         app:layout_constraintBottom_toBottomOf="@+id/iv_container_blank"
         app:layout_constraintEnd_toEndOf="@+id/iv_container_blank"
         app:layout_constraintStart_toStartOf="@+id/iv_container_blank"