Import some icons -- 导入部分图标(resolve: #14334)

Hook backend interface -- 挂后台接口(issue20: #14335)
Add background interface public parameter generation function -- 添加后台接口公共参数生成函数(resolve: #14338)

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/list/StaticModelistFragment.java

@@ -33,6 +33,7 @@ public class StaticModelistFragment extends ListFragment {
 
     String ModeName=null;
     String ModeIcon= null;
+    protected boolean showIcon = true;
 
 
 //    public class SimpleRoundCornerAdapter extends  SimpleAdapter{
@@ -77,10 +78,19 @@ public class StaticModelistFragment extends ListFragment {
 
     protected  void setupAdapter(JSONObject jsonobj)
     {
-        adapter        = new SimpleAdapter(this.getActivity(),
-                getData(jsonobj), R.layout.static_modelist_cell, new String[] { "title",
-                "img","detail" }, new int[] { R.id.tv_title, R.id.iv_thumb,R.id.tv_detail });
 
+        if(showIcon)
+        {
+            adapter = new SimpleAdapter(this.getActivity(),
+                    getData(jsonobj), R.layout.static_modelist_cell, new String[]{"title",
+                    "img", "detail"}, new int[]{R.id.tv_title, R.id.iv_thumb, R.id.tv_detail});
+        }
+        else
+        {
+            adapter = new SimpleAdapter(this.getActivity(),
+                    getData(jsonobj), R.layout.static_modelist_noicon_cell, new String[]{"title",
+                     "detail"}, new int[]{R.id.tv_title, R.id.tv_detail});
+        }
         View headerView = initHeaderView();
         if(headerView!=null) {
 //            headerView.setOnClickListener(new View.OnClickListener() {
@@ -96,9 +106,23 @@ public class StaticModelistFragment extends ListFragment {
     protected  void setupAdapter(int rawid)
     {
         JSONObject jsonobj=loadjson(rawid);
-        adapter        = new SimpleAdapter(this.getActivity(),
-                getData(jsonobj), R.layout.static_modelist_cell, new String[] { "title",
-                "img","detail" }, new int[] { R.id.tv_title, R.id.iv_thumb,R.id.tv_detail });
+
+        if(showIcon)
+        {
+            adapter        = new SimpleAdapter(this.getActivity(),
+                    getData(jsonobj), R.layout.static_modelist_cell, new String[] { "title",
+                    "img","detail" }, new int[] { R.id.tv_title, R.id.iv_thumb,R.id.tv_detail });
+        }
+        else
+        {
+            adapter        = new SimpleAdapter(this.getActivity(),
+                    getData(jsonobj), R.layout.static_modelist_noicon_cell, new String[] { "title",
+                    "detail" }, new int[] { R.id.tv_title,R.id.tv_detail });
+        }
+
+
+
+
 
         View headerView = initHeaderView();
         if(headerView!=null) {

ApexDrivers/RAUtilsLibrary/src/main/res/layout/static_modelist_noicon_cell.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/list_bg"
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="56dp">
+
+        <TextView
+            android:id="@+id/tv_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="16dp"
+            android:layout_weight="1"
+            android:gravity="start"
+            android:text="Tool name"
+            android:textAlignment="viewStart"
+            android:textColor="@android:color/black"
+            android:textSize="14sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tv_detail"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="16dp"
+            android:lines="1"
+            android:text="TextView"
+            android:textSize="9.7sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_title" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>

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

@@ -32,6 +32,7 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 import java.util.Iterator;
+import java.util.Locale;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
@@ -75,6 +76,8 @@ public class OnlineDataProvider extends com.usai.redant.rautils.utils.Network
 
 //	URL
 	public static String		URL_HOME						= BASE_URL+"/main_new_29.php";
+	public static String		URL_LOGIN						= BASE_URL+"/main_new_29.php";
+
 	public static String		URL_HISTORY						= BASE_URL+"/main_new_29.php";
 	public static String		URL_KPI							= BASE_URL+"/main_new_29.php";
 	public static String		URL_UPDATE_AUTH					= BASE_URL+"/main_new_29.php";
@@ -120,10 +123,80 @@ public class OnlineDataProvider extends com.usai.redant.rautils.utils.Network
 //	public static String		URL_FETCH_RESULT				= "http://192.168.0.138:8899/main_new_29.php";
 //	public static String		URL_SAVE_RESULT					= "http://192.168.0.138:8899/main_new_29.php";
 //
+private static void prepareParams(Bundle params) {
+	if (params == null) {
+		params = new Bundle();
+	}
+
+	String password = params.getString("password");
+
+	String user = params.getString("name");
+	if (user == null) {
+		user = TradeFilingApplication.get_user();
+		if (!TextUtils.isEmpty(user)) {
+			params.putString("name",user);
+		}
+	}
+
+	if (password == null) {
+		password = TradeFilingApplication.get_pass();
+		if (!TextUtils.isEmpty(password)) {
+			params.putString("password",password);
+		}
+	}
+
+	Locale curLocale = TradeFilingApplication.get_instance().getResources().getConfiguration().locale;
+	String languageCode = curLocale.getLanguage();
+	if (languageCode != null) {
+		params.putString("language",languageCode);
+	}
+
+	String company = TradeFilingApplication.get_company_list().optJSONObject(TradeFilingApplication.get_current_company_index()).optString("id");
+
+	if(TextUtils.isEmpty(params.getString("company"))&&!TextUtils.isEmpty(company))
+	{
+		params.putString("company",company);
+	}
+
+
+	params.putString("platform","android");
+}
+
 
 	public static JSONObject request_login(String user, String password)
 	{
-		return null;
+
+		Bundle params = new Bundle();
+
+		user = TradeFilingApplication.get_user();
+		password = TradeFilingApplication.get_pass();
+
+		if (user != null) {
+			params.putString("name",user); // "WMoy059hzweXPSC74plhBA=="
+		}
+		if (password != null) {
+			params.putString("password",password); // "CzADM7u51eNR7ScfQtJw7w=="
+		}
+
+		prepareParams(params);
+
+		String jsonStr = getJson(URL_LOGIN,params);
+//        if (jsonStr == null || jsonStr.isEmpty()) {
+//            return RESULT_NET_ERROR;
+//        }
+//
+//        try {
+//            JSONObject json = new JSONObject(jsonStr);
+//            int result = json.getInt("result");
+//
+//            return result;
+//
+//        } catch (JSONException e) {
+//            e.printStackTrace();
+//            return RESULT_ERROR;
+//        }
+
+		return handleJson(jsonStr);
 	}
 	public static JSONObject request_signup(String user, String password)
 	{
@@ -1433,98 +1506,7 @@ public class OnlineDataProvider extends com.usai.redant.rautils.utils.Network
 		return null;
 	}
 
-	public static JSONObject request_KPI() {
-
-		Bundle params = new Bundle();
-		params.putString("action","hand_new_kpi");
-
-		boolean personMode = TradeFilingApplication.get_instance().getPersonMode();
-		if (personMode) {
-			params.putString("personal_mode","true");
-		} else {
-			params.putString("personal_mode","false");
-		}
-
-		String jstr = getJson(URL_KPI,params);
-		Log.d("Network", "request_kpi: " + jstr);
-		try {
 
-			if (jstr == null || jstr.length() <= 0)
-			{
-				JSONObject resultJson = new JSONObject();
-				resultJson.put("err_msg","Net Error. Cannot connect to server for now. Please retry later.");
-				resultJson.put("result",RESULT_NET_ERROR);
-				return resultJson;
-			}
-
-			JSONObject jsobj = new JSONObject(jstr);
-			return jsobj;
-
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-
-	public static JSONObject request_history(Bundle params) {
-
-		if (params == null) {
-			params = new Bundle();
-		}
-		params.putString("action","hand_new_home_list_all");
-
-		boolean personMode = TradeFilingApplication.get_instance().getPersonMode();
-		if (personMode) {
-			params.putString("personal_mode","true");
-		} else {
-			params.putString("personal_mode","false");
-		}
-
-		String jstr = getJson(URL_HISTORY,params);
-		Log.d("Network", "request_home: " + jstr);
-		try {
-
-			if (jstr == null || jstr.length() <= 0)
-			{
-				JSONObject resultJson = new JSONObject();
-				resultJson.put("err_msg","Net Error. Cannot connect to server for now. Please retry later.");
-				resultJson.put("result",RESULT_NET_ERROR);
-				return resultJson;
-			}
-
-			JSONObject jsobj = new JSONObject(jstr);
-			return jsobj;
-
-		} catch (JSONException e) {
-			e.printStackTrace();
-		}
-
-		return null;
-	}
-
-	public static JSONObject sendEmail(String email,String cc, String serialNo) {
-
-		Bundle params = new Bundle();
-		if (email == null) {
-			email = "";
-		}
-		if (serialNo == null) {
-			serialNo = "";
-		}
-
-		params.putString("msg",email);
-		params.putString("action","handset_search");
-		params.putString("action_type","save_communication_email");
-		params.putString("serial_no",serialNo);
-
-		if (cc != null) {
-			params.putString("cc",cc);
-		}
-		String jstr = getJson(URL_SEND_COMM_EMAIL,params);
-
-		return handleResponse(jstr);
-	}
 
 	private static JSONObject handleResponse(String jstr) {
 

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

@@ -152,7 +152,7 @@ public class CheckSavedActivity extends AppCompatActivity {
 
 
             String function_name = getIntent().getStringExtra("function_name");
-            if(function_name.equals("Saved Detail"))
+            if(function_name.equals("Saved Log"))
             {
                f = new SavedDetailFragment();
 //                ToolsFragment f = new ToolsFragment();

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

@@ -73,6 +73,7 @@ public class MyFragment extends StaticModelistFragment
     @Override
     public void onActivityCreated(Bundle savedInstanceState)
     {
+        showIcon = false;
         super.onActivityCreated(savedInstanceState);
 
         setupAdapter(R.raw.my);
@@ -100,7 +101,7 @@ public class MyFragment extends StaticModelistFragment
         String 	title = (String) getData(jsonobj).get(position-1).get("title");
 
 //        Intent intent = new Intent();
-        if (title.equals("Saved Detail"))
+        if (title.equals("Saved Log"))
         {
 
 
@@ -108,7 +109,7 @@ public class MyFragment extends StaticModelistFragment
             intent.setClass(getActivity(), CheckSavedActivity.class);
             // intent.putExtra("user", ApexTrackingApplication.get_user());
             // intent.putExtra("password", password);
-            intent.putExtra("function_name", "Saved Detail");
+            intent.putExtra("function_name", "Saved Log");
 ////            intent.putExtra("title", "Booking Search");
             startActivity(intent);
         }

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

@@ -35,7 +35,7 @@
         android:layout_marginTop="8dp"
         app:layout_constraintStart_toStartOf="@+id/tv_container_no"
         app:layout_constraintTop_toBottomOf="@+id/tv_container_no"
-        app:srcCompat="@drawable/action_setting" />
+        app:srcCompat="@drawable/ic_container_blank" />
 
     <LinearLayout
         android:layout_width="0dp"

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

@@ -27,7 +27,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/action_setting" />
+        app:srcCompat="@drawable/ic_container" />
 
     <TextView
         android:id="@+id/tv_seal_no"

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

@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.usai.ratradefiling.home.HomeHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-    android:background="@drawable/gradient_color"
-    >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_alignParentBottom="true"
-        android:background="#e6e6e6"
-        >
-
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="#00000000"
-        android:orientation="vertical">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:id="@+id/new_count_container"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/home_header_new_count_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="0"
-                    android:textAlignment="center"
-                    android:textColor="@color/TFWhite"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="new"
-                    android:textAlignment="center"
-                    android:textColor="@color/TFWhite"
-                    android:textSize="17sp" />
-
-            </LinearLayout>
-
-            <RelativeLayout
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="#00000000"
-                android:gravity="center_vertical">
-
-                <RelativeLayout
-                    android:layout_width="1dp"
-                    android:layout_height="10dp"
-                    android:background="#ffffff" />
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:id="@+id/processing_count_container"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/home_header_processing_count_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="0"
-                    android:textAlignment="center"
-                    android:textColor="@color/TFWhite"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="processing"
-                    android:textAlignment="center"
-                    android:textColor="@color/TFWhite"
-                    android:textSize="17sp" />
-
-            </LinearLayout>
-
-            <RelativeLayout
-                android:layout_width="1dp"
-                android:layout_height="match_parent"
-                android:background="#00000000"
-                android:gravity="center_vertical">
-
-                <RelativeLayout
-                    android:layout_width="1dp"
-                    android:layout_height="10dp"
-                    android:background="#ffffff" />
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:id="@+id/finished_count_container"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:orientation="vertical">
-
-                <TextView
-                    android:id="@+id/home_header_finish_count_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="0"
-                    android:textAlignment="center"
-                    android:textColor="@color/TFWhite"
-                    android:textSize="17sp" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="finish"
-                    android:textAlignment="center"
-                    android:textColor="@color/TFWhite"
-                    android:textSize="17sp" />
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <!-- Action -->
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginTop="10dp"
-            android:layout_marginRight="5dp"
-            android:layout_marginBottom="10dp"
-            android:background="@drawable/home_header_round_corner"
-            android:clipChildren="false"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="5dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/home_header_sign_out_iv"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginTop="2dp"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/action_setting" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginBottom="2dp"
-                    android:text="sign out"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="15sp" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="5dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/home_header_setting_iv"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginTop="2dp"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/action_setting" />
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginBottom="2dp"
-                    android:text="setting"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="15sp" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="5dp"
-                android:layout_weight="1"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <ImageView
-                    android:id="@+id/home_header_available_iv"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_marginTop="2dp"
-                    android:scaleType="centerInside"
-                    android:src="@drawable/action_setting" />
-
-                <TextView
-                    android:id="@+id/home_header_available_tv"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginBottom="2dp"
-                    android:text="available"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="15sp" />
-
-            </LinearLayout>
-
-
-            <LinearLayout
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="5dp"
-                android:layout_weight="1"
-                android:clipChildren="false"
-                android:gravity="center"
-                android:orientation="vertical">
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:clipChildren="false">
-
-                    <ImageView
-                        android:id="@+id/home_header_message_iv"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginTop="2dp"
-                        android:scaleType="centerInside"
-                        android:src="@drawable/action_setting" />
-
-                    <ImageView
-                        android:id="@+id/home_header_message_flag_view"
-                        android:layout_width="20dp"
-                        android:layout_height="20dp"
-                        android:layout_alignTop="@+id/home_header_message_iv"
-                        android:layout_alignRight="@id/home_header_message_iv"
-                        android:layout_marginTop="-6dp"
-                        android:layout_marginRight="-6dp"
-                        android:background="@drawable/action_setting"
-                        android:scaleType="centerInside" />
-
-                </RelativeLayout>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginBottom="2dp"
-                    android:text="@string/message"
-                    android:textAlignment="center"
-                    android:textColor="#000000"
-                    android:textSize="15sp" />
-
-            </LinearLayout>
-
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</com.usai.ratradefiling.home.HomeHeaderView>

ApexDrivers/ratradefiling/src/main/res/menu/customize_fields.xml

@@ -5,10 +5,10 @@
         android:orderInCategory="100"
         android:showAsAction="never"
         android:title="@string/action_settings"/> -->
-    <item
-        android:id="@+id/action_help"
-        android:orderInCategory="200"
-        
-        android:icon="@android:drawable/ic_menu_help"
-        app:showAsAction="always" android:title="@string/action_help"/>
+<!--    <item-->
+<!--        android:id="@+id/action_help"-->
+<!--        android:orderInCategory="200"-->
+<!--        -->
+<!--        android:icon="@android:drawable/ic_menu_help"-->
+<!--        app:showAsAction="always" android:title="@string/action_help"/>-->
 </menu>

ApexDrivers/ratradefiling/src/main/res/menu/quick_search.xml

@@ -4,7 +4,7 @@
     <item
         android:id="@+id/quick_search"
         android:orderInCategory="100"
-        android:icon="@drawable/tab_search"
+        android:icon="@drawable/ic_search"
         android:title="Search"
         android:visible="false"
         app:showAsAction="always" />

ApexDrivers/ratradefiling/src/main/res/menu/result_search_menu.xml

@@ -6,7 +6,7 @@
 
     <item
         android:id="@+id/result_search"
-        android:icon="@drawable/tab_search"
+        android:icon="@drawable/ic_search"
         android:title=""
         app:showAsAction="always"
         />

ApexDrivers/ratradefiling/src/main/res/raw/my.json

@@ -2,8 +2,8 @@
   "remark":"my菜单",
   "modelist": [
     {
-      "name": "Saved Detail",
-      "detail": "View saved detail information",
+      "name": "Saved Log",
+      "detail": "View saved log information",
       "icon": "mode_detail",
       "type": "saved_detail"
     },