The saved query and log list shows incomplete content -- 保存的查询和log列表显示内容不全(resolve: #14460)

Change Typo: Save detail -> Save log(resolve: #14459)
Function panel setting add verification logic -- function panel 设置增加验证逻辑(resolve: #14458)
result After the custom field is not saved, it will be refreshed when returned -- result 自定义字段后，没有保存，返回也会刷新(resolve: #14446)
Hook backend interface -- 挂后台接口(resolve: #14335)
Optimize UI layout and display -- 优化界面布局和显示(resolve: #14395)

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/WebActivity.java

@@ -82,6 +82,7 @@ public class WebActivity extends AppCompatActivity
 
 		WebSettings settings=wv.getSettings();
 
+		settings.setCacheMode(WebSettings.LOAD_NO_CACHE);
 		settings.setJavaScriptEnabled(true);
 		// 设置可以支持缩放
 //		settings.setSupportZoom(true);

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/fields/CustomizeFieldsActivity.java

@@ -449,11 +449,13 @@ public class CustomizeFieldsActivity extends Activity implements
 //			db.setTransactionSuccessful();
 //			db.endTransaction();
 //			dbUtil.CloseDB(db);
+			setResult(1);
 			finish();
 //			 Log.d("fields",);
 			break;
 		}
 		case R.id.btncancel:
+			setResult(0);
 			finish();
 			break;
 		default:

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/FunctionPanelSettingActivity.java

@@ -1,26 +1,17 @@
 package com.usai.ratradefiling.home;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
-import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.usai.ratradefiling.R;
 import com.usai.ratradefiling.TradeFilingApplication;
 import com.usai.ratradefiling.dataprovider.RADataProvider;
-import com.usai.ratradefiling.fields.CustomizeFieldsActivity;
 import com.usai.ratradefiling.fields.DragListView;
 import com.usai.redant.rautils.utils.FileManager;
 import com.usai.redant.rautils.utils.RAConverter;
@@ -68,21 +59,21 @@ public class FunctionPanelSettingActivity extends AppCompatActivity implements
 
         int hidePosition = adapter.getPosition(mHideField);
         // hide -> display && displayCount >= maxDisplayCount
-//        if (from > hidePosition && to < hidePosition && hidePosition > maxDisplayCount) {
-//
-//            new AlertDialog.Builder(this)
-//                    .setTitle("Warning")
-//                    .setMessage("the maximums count of display items is " + maxDisplayCount)
-//                    .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
-//                        @Override
-//                        public void onClick(DialogInterface dialog, int which) {
-//
-//                        }
-//                    })
-//                    .show();
-//
-//            return false;
-//        }
+        if (from < hidePosition && to >= hidePosition && hidePosition <3) {
+
+            new AlertDialog.Builder(this)
+                    .setTitle("Warning")
+                    .setMessage("You must set at least 1 function visiable! ")
+                    .setPositiveButton("Ok", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+
+                        }
+                    })
+                    .show();
+
+            return false;
+        }
 
         return true;
     }
@@ -124,11 +115,8 @@ public class FunctionPanelSettingActivity extends AppCompatActivity implements
         initData();
 
         DragListView dragListView = (DragListView) findViewById(R.id.drag_list);
-//
-//        if (forNewResult) {
-//
-//            dragListView.setDelegate(this);
-//        }
+
+            dragListView.setDelegate(this);
 
         adapter = new FunctionPanelSettingActivity.DragListAdapter(this, list);
         dragListView.setAdapter(adapter);

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

@@ -234,13 +234,15 @@ public class SavedDetailFragment extends TFListFragment
 											// private SearchResult result;
 
 		class Holder {
-			TextView message,time;
+			TextView message,time,type,company;
 			ImageView icon;
 
 			Holder(View cell) {
 				message = (TextView) cell.findViewById(R.id.tv_title);// 找某个控件
 				time = (TextView) cell.findViewById(R.id.tv_detail);
 				icon = (ImageView)cell.findViewById(R.id.iv_thumb);
+				type = (TextView) cell.findViewById(R.id.tv_type);
+				company = (TextView) cell.findViewById(R.id.tv_company);
 				cell.setTag(this);
 			}
 
@@ -274,7 +276,52 @@ public class SavedDetailFragment extends TFListFragment
 
 
 			String module_name = (String) searchresult.getData().get(position).get("module_name");
-			int rid= RAUtil.iconName2Rid(getActivity(),module_name);
+
+
+			String icon_name=null;
+			String type=null;
+			if(module_name.equals("acem1"))
+			{
+				icon_name="flag_us";
+				type = "ACEM-1";
+			}
+			else if (module_name.equals("isf"))
+			{
+				icon_name="flag_us";
+				type = "ISF";
+			}
+			else if(module_name.equals("aci"))
+				{
+					icon_name="flag_ca";
+					type = "ACI";
+				}
+				else if(module_name.equals("emanifest"))
+					{
+						icon_name="flag_ca";
+						type = "eManifest";
+					}
+					else
+					{
+						icon_name="ic_customer";
+						type = "Customer";
+					}
+			int rid= RAUtil.iconName2Rid(getActivity(),icon_name);
+
+
+
+			if(TextUtils.isEmpty(type))
+			{
+				type = "";
+			}
+			holder.type.setText(type );
+
+			String company =(String) searchresult.getData().get(position).get("company_name");
+			if(TextUtils.isEmpty(company))
+			{
+				company = "";
+			}
+			holder.company.setText(company );
+
 
 			holder.message.setText(searchresult.getData().get(position).get("name")
 					.toString());// 给该控件设置数据(数据从集合类中来)

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

@@ -189,13 +189,15 @@ public class SavedSearchFragment extends TFListFragment
 											// private SearchResult result;
 
 		class Holder {
-			TextView message,time;
+			TextView message,time,type,company;
 			ImageView icon;
 
 			Holder(View cell) {
 				message = (TextView) cell.findViewById(R.id.tv_title);// 找某个控件
 				time = (TextView) cell.findViewById(R.id.tv_detail);
 				icon = (ImageView)cell.findViewById(R.id.iv_thumb);
+				type = (TextView) cell.findViewById(R.id.tv_type);
+				company = (TextView) cell.findViewById(R.id.tv_company);
 				cell.setTag(this);
 			}
 
@@ -233,7 +235,50 @@ public class SavedSearchFragment extends TFListFragment
 			}
 
 			String module_name = (String) searchresult.getData().get(position).get("module_name");
-			int rid= RAUtil.iconName2Rid(getActivity(),module_name);
+
+			String icon_name=null;
+			String type=null;
+			if(module_name.equals("acem1"))
+			{
+				icon_name="flag_us";
+				type = "ACEM-1";
+			}
+			else if (module_name.equals("isf"))
+			{
+				icon_name="flag_us";
+				type = "ISF";
+			}
+			else if(module_name.equals("aci"))
+			{
+				icon_name="flag_ca";
+				type = "ACI";
+			}
+			else if(module_name.equals("emanifest"))
+			{
+				icon_name="flag_ca";
+				type = "eManifest";
+			}
+			else
+			{
+				icon_name="ic_customer";
+				type = "Customer";
+			}
+			int rid= RAUtil.iconName2Rid(getActivity(),icon_name);
+
+
+
+			if(TextUtils.isEmpty(type))
+			{
+				type = "";
+			}
+			holder.type.setText(type );
+
+			String company =(String) searchresult.getData().get(position).get("company_name");
+			if(TextUtils.isEmpty(company))
+			{
+				company = "";
+			}
+			holder.company.setText(company );
 
 			holder.message.setText(name);// 给该控件设置数据(数据从集合类中来)
 

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

@@ -165,8 +165,12 @@ public class ResultActivity extends AppCompatActivity implements ResultPresenter
         super.onActivityResult(requestCode, resultCode, data);
 
         if (requestCode == RequestCode.Field_Setting) {
-            mPresenter.dirty = true;
-            loadData();
+
+            if(resultCode==1)
+            {
+                mPresenter.dirty = true;
+                loadData();
+            }
         }
     }
 

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

@@ -9,23 +9,22 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="56dp">
+        android:layout_height="wrap_content">
 
         <TextView
             android:id="@+id/tv_title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginEnd="16dp"
             android:layout_marginStart="8dp"
-            android:layout_marginTop="4dp"
+            android:layout_marginEnd="10dp"
             android:layout_weight="1"
+            android:gravity="start"
             android:text="Tool name"
             android:textAlignment="viewStart"
-            android:gravity="start"
             android:textColor="@android:color/black"
             android:textSize="14sp"
-            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/tv_type"
             app:layout_constraintStart_toEndOf="@+id/iv_thumb"
             app:layout_constraintTop_toTopOf="@+id/iv_thumb" />
 
@@ -34,7 +33,10 @@
             android:layout_width="42dp"
             android:layout_height="42dp"
             android:layout_marginStart="16dp"
-            android:contentDescription="TODO" android:src="@mipmap/ic_launcher"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:contentDescription="TODO"
+            android:src="@mipmap/ic_launcher"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -43,12 +45,35 @@
             android:id="@+id/tv_detail"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
             android:lines="1"
             android:text="TextView"
             android:textSize="9.7sp"
-            app:layout_constraintStart_toEndOf="@+id/iv_thumb"
-            app:layout_constraintTop_toBottomOf="@+id/tv_title" />
+            app:layout_constraintBottom_toBottomOf="@+id/tv_company"
+            app:layout_constraintEnd_toEndOf="@+id/tv_type"
+            app:layout_constraintTop_toTopOf="@+id/tv_company" />
+
+        <TextView
+            android:id="@+id/tv_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:text="TextView"
+            android:textColor="@android:color/black"
+            android:textSize="12sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/tv_title" />
+
+        <TextView
+            android:id="@+id/tv_company"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="10dp"
+            android:text="TextView"
+            android:textColor="@android:color/black"
+            android:textSize="12sp"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_thumb"
+            app:layout_constraintEnd_toStartOf="@+id/tv_detail"
+            app:layout_constraintStart_toStartOf="@+id/tv_title" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 

ApexDrivers/ratradefiling/src/main/res/values-zh/strings.xml

@@ -74,7 +74,7 @@
 
     <!--Detail-->
 
-    <string name="actoin_add_favorite">Save Detail</string>
+    <string name="actoin_add_favorite">Save Log</string>
     <string name="actoin_share_detail">Share With Someone</string>
 
 

ApexDrivers/ratradefiling/src/main/res/values/strings.xml

@@ -83,7 +83,7 @@
 
     <!--Detail-->
 
-    <string name="actoin_add_favorite">Save Detail</string>
+    <string name="actoin_add_favorite">Save Log</string>
     <string name="actoin_share_detail">Share With Someone</string>