Solve the problem that the log from the background cannot automatically wrap -- 解决后台传来的log无法自动换行的问题(resolve: #14418)

Import some icons -- 导入部分图标(resolve: #14414)
Optimize UI layout and display -- 优化界面布局和显示(issue50: #14405)

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

@@ -68,10 +68,10 @@ public class OnlineDataProvider extends com.usai.redant.rautils.utils.Network
 
 
 	//DEBUG
-	public static String		BASE_URL						= "http://192.168.0.149/ACE_ISF_NEW";
+//	public static String		BASE_URL						= "http://192.168.0.149/ACE_ISF_NEW";
 
 	//RELEASE
-//	public static String		BASE_URL						= "https://ra.united-us.net/doc/bk";
+	public static String		BASE_URL						= "https://ra.united-us.net/doc/bk";
 
 
 //	URL

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/dashcell/error/HomeDashACEM1CellE.java

@@ -1,6 +1,7 @@
 package com.usai.ratradefiling.home.dashcell.error;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;
@@ -110,6 +111,9 @@ public class HomeDashACEM1CellE extends LinearLayout {
         return this;
     }
     public HomeDashACEM1CellE setLog(String log) {
+        if(!TextUtils.isEmpty(log))
+            log=log.replace(",",", ");
+
         logTv.setText(log);
         logTv.forceLayout();
         return this;

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/dashcell/error/HomeDashACICellE.java

@@ -1,6 +1,7 @@
 package com.usai.ratradefiling.home.dashcell.error;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;
@@ -109,6 +110,9 @@ public class HomeDashACICellE extends LinearLayout {
         return this;
     }
     public HomeDashACICellE setLog(String log) {
+        if(!TextUtils.isEmpty(log))
+            log=log.replace(",",", ");
+
         logTv.setText(log);
         logTv.forceLayout();
         return this;

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/dashcell/error/HomeDashISFCellE.java

@@ -1,6 +1,7 @@
 package com.usai.ratradefiling.home.dashcell.error;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;
@@ -109,6 +110,9 @@ public class HomeDashISFCellE extends LinearLayout {
         return this;
     }
     public HomeDashISFCellE setLog(String log) {
+        if(!TextUtils.isEmpty(log))
+            log=log.replace(",",", ");
+
         logTv.setText(log);
         logTv.forceLayout();
         return this;

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/dashcell/error/HomeDasheManifestCellE.java

@@ -1,6 +1,7 @@
 package com.usai.ratradefiling.home.dashcell.error;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.widget.LinearLayout;
@@ -109,6 +110,9 @@ public class HomeDasheManifestCellE extends LinearLayout {
         return this;
     }
     public HomeDasheManifestCellE setLog(String log) {
+        if(!TextUtils.isEmpty(log))
+            log=log.replace(",",", ");
+
         logTv.setText(log);
         logTv.forceLayout();
         return this;

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/dashmodel/error/HomeDashACEM1ModelE.java

@@ -42,6 +42,8 @@ public class HomeDashACEM1ModelE extends ResultBaseModel
                 json.put("sn", sn);
             }
             if (log != null) {
+
+
                 json.put("log", log);
             }
 //            if (detail != null) {

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/dashmodel/error/HomeDashACIModelE.java

@@ -42,6 +42,7 @@ public class HomeDashACIModelE extends ResultBaseModel
                 json.put("sn", sn);
             }
             if (log != null) {
+
                 json.put("log", log);
             }
 //            if (detail != null) {

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/dashmodel/error/HomeDashISFModelE.java

@@ -42,6 +42,7 @@ public class HomeDashISFModelE extends ResultBaseModel
                 json.put("sn", sn);
             }
             if (log != null) {
+
                 json.put("log", log);
             }
 //            if (detail != null) {

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/home/dashmodel/error/HomeDasheManifestModelE.java

@@ -36,6 +36,7 @@ public class HomeDasheManifestModelE extends ResultBaseModel
 
         try {
             if (log != null) {
+
                 json.put("log", log);
             }
             if (ccn != null) {

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/cell/ResultACEM1Cell.java

@@ -1,6 +1,7 @@
 package com.usai.ratradefiling.result.cell;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
@@ -120,6 +121,9 @@ public class ResultACEM1Cell extends LinearLayout {
     }
 
     public ResultACEM1Cell setLog(String log) {
+
+        if(!TextUtils.isEmpty(log))
+            log=log.replace(",",", ");
         logTV.setText(log);
         logTV.forceLayout();
         return this;

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/cell/ResultACICell.java

@@ -1,6 +1,7 @@
 package com.usai.ratradefiling.result.cell;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
@@ -120,6 +121,9 @@ public class ResultACICell extends LinearLayout {
     }
 
     public ResultACICell setLog(String log) {
+        if(!TextUtils.isEmpty(log))
+            log=log.replace(",",", ");
+
         logTV.setText(log);
         logTV.forceLayout();
         return this;

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/cell/ResultISFCell.java

@@ -1,6 +1,7 @@
 package com.usai.ratradefiling.result.cell;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
@@ -122,6 +123,9 @@ public class ResultISFCell extends LinearLayout {
     }
 
     public ResultISFCell setLog(String log) {
+        if(!TextUtils.isEmpty(log))
+            log=log.replace(",",", ");
+
         logTV.setText(log);
         logTV.forceLayout();
         return this;

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/cell/ResulteManifestCell.java

@@ -1,6 +1,7 @@
 package com.usai.ratradefiling.result.cell;
 
 import android.content.Context;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
@@ -120,6 +121,9 @@ public class ResulteManifestCell extends LinearLayout {
     }
 
     public ResulteManifestCell setLog(String log) {
+        if(!TextUtils.isEmpty(log))
+            log=log.replace(",",", ");
+
         logTV.setText(log);
         logTV.forceLayout();
         return this;

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/model/ResultACEM1Model.java

@@ -47,6 +47,7 @@ public class ResultACEM1Model extends ResultBaseModel
                 json.put("mbol", mbol);
             }
             if (log != null) {
+
                 json.put("log", log);
             }
             if (date != null) {

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/model/ResultACIModel.java

@@ -51,6 +51,7 @@ public class ResultACIModel extends ResultBaseModel
                 json.put("icon", icon);
             }
             if (log != null) {
+
                 json.put("log", log);
             }
             if (date != null) {

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/model/ResultISFModel.java

@@ -47,6 +47,7 @@ public class ResultISFModel extends ResultBaseModel
                 json.put("transactionno", transactionno);
             }
             if (log != null) {
+
                 json.put("log", log);
             }
             if (isftype != null) {

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/result/model/ResulteManifestModel.java

@@ -47,6 +47,7 @@ public class ResulteManifestModel extends ResultBaseModel
                 json.put("primary_ccn", primary_ccn);
             }
             if (log != null) {
+
                 json.put("log", log);
             }
             if (date != null) {

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

@@ -6,20 +6,15 @@
                                                        android:orientation="vertical"
     >
 
-    <RelativeLayout
-        android:id="@+id/apex_result_ship_top"
-        android:layout_width="match_parent"
-        android:layout_height="15dp"
-        >
 
-    </RelativeLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
-        android:layout_marginBottom="5dp"
+        android:layout_marginBottom="0dp"
+        android:layout_marginTop="5dp"
         android:background="@drawable/result_cell_bg"
         android:clipChildren="true"
         android:orientation="horizontal"

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

@@ -6,20 +6,15 @@
                                                        android:orientation="vertical"
     >
 
-    <RelativeLayout
-        android:id="@+id/apex_result_ship_top"
-        android:layout_width="match_parent"
-        android:layout_height="15dp"
-        >
 
-    </RelativeLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
-        android:layout_marginBottom="5dp"
+        android:layout_marginBottom="0dp"
+        android:layout_marginTop="5dp"
         android:background="@drawable/result_cell_bg"
         android:clipChildren="true"
         android:orientation="horizontal"

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

@@ -6,20 +6,14 @@
                                                        android:orientation="vertical"
     >
 
-    <RelativeLayout
-        android:id="@+id/apex_result_ship_top"
-        android:layout_width="match_parent"
-        android:layout_height="15dp"
-        >
-
-    </RelativeLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
-        android:layout_marginBottom="5dp"
+        android:layout_marginBottom="0dp"
+        android:layout_marginTop="5dp"
         android:background="@drawable/result_cell_bg"
         android:clipChildren="true"
         android:orientation="horizontal"

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

@@ -6,20 +6,13 @@
                                                        android:orientation="vertical"
     >
 
-    <RelativeLayout
-        android:id="@+id/apex_result_ship_top"
-        android:layout_width="match_parent"
-        android:layout_height="15dp"
-        >
-
-    </RelativeLayout>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
-        android:layout_marginBottom="5dp"
+        android:layout_marginBottom="0dp"
+        android:layout_marginTop="5dp"
         android:background="@drawable/result_cell_bg"
         android:clipChildren="true"
         android:orientation="horizontal"

ApexDrivers/ratradefiling/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

ApexDrivers/ratradefiling/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>