The release version result does not display the icon -- release 版result不显示图标(resolve: #14477)

Test the release version on a real device -- 真机测试release版(issue40: #14465)
The release version does not display the result menu -- release 版不显示result菜单(resolve: #14478)

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"
     }
@@ -38,7 +38,6 @@ android {
             shrinkResources true
 
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-project.txt'
-//            proguardFiles 'proguard-project.txt'
         }
     }
 }

ApexDrivers/ratradefiling/proguard-project.txt

@@ -27,6 +27,10 @@
 #-keep class com.usai.redant.camera.CameraManager
 -keep class javax.naming.*
 -keep class * extends com.usai.ratradefiling.base.NoProguard {*;}
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
 
 # Remove all Verbose/Debug logging
 

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

@@ -134,7 +134,7 @@ public class ResultAdapter extends BaseAdapter {
                 ResultACEM1Model acem1Model = (ResultACEM1Model)model;
                 ResultACEM1Cell cell = dequeueACEM1Cell(context, convertView);
                 cell.prepareReuse();
-                cell.setHBOL(acem1Model.hbol).setMBOL(acem1Model.mbol).setIcon(acem1Model.getIcon()).setPort(acem1Model.port).setDate(acem1Model.date).setLog(acem1Model.log).setConsignee(acem1Model.consignee);
+                cell.setHBOL(acem1Model.hbol).setMBOL(acem1Model.mbol).setIcon(acem1Model.icon).setPort(acem1Model.port).setDate(acem1Model.date).setLog(acem1Model.log).setConsignee(acem1Model.consignee);
 
                 ArrayList<ResultAddition> additions = acem1Model.getAddition();
                 if (additions != null && additions.size() > 0) {
@@ -151,7 +151,7 @@ public class ResultAdapter extends BaseAdapter {
                 ResultCustomerModel customerModel = (ResultCustomerModel)model;
                 ResultCustomerCell cell = dequeueCustomerCell(context, convertView);
                 cell.prepareReuse();
-                cell.setContactID(customerModel.contactid).setCompany(customerModel.company).setIcon(customerModel.getIcon()).setAddress(customerModel.address);
+                cell.setContactID(customerModel.contactid).setCompany(customerModel.company).setIcon(customerModel.icon).setAddress(customerModel.address);
 
                 ArrayList<ResultAddition> additions = customerModel.getAddition();
                 if (additions != null && additions.size() > 0) {
@@ -168,7 +168,7 @@ public class ResultAdapter extends BaseAdapter {
                 ResultISFModel isfModel = (ResultISFModel)model;
                 ResultISFCell cell = dequeueISFCell(context, convertView);
                 cell.prepareReuse();
-                cell.setBOL(isfModel.bol).setTransactinNo(isfModel.transactionno).setIcon(isfModel.getIcon()).setISFType(isfModel.isftype).setLog(isfModel.log).setConsignee(isfModel.consignee);
+                cell.setBOL(isfModel.bol).setTransactinNo(isfModel.transactionno).setIcon(isfModel.icon).setISFType(isfModel.isftype).setLog(isfModel.log).setConsignee(isfModel.consignee);
 
                 ArrayList<ResultAddition> additions = isfModel.getAddition();
                 if (additions != null && additions.size() > 0) {
@@ -185,7 +185,7 @@ public class ResultAdapter extends BaseAdapter {
                     ResultACIModel aciModel = (ResultACIModel)model;
                     ResultACICell cell = dequeueACICell(context, convertView);
                     cell.prepareReuse();
-                    cell.setHBCCN(aciModel.hbccn).setPrimaryCCN(aciModel.primary_ccn).setIcon(aciModel.getIcon()).setLastAction(aciModel.lastaction).setLog(aciModel.log).setDate(aciModel.date);
+                    cell.setHBCCN(aciModel.hbccn).setPrimaryCCN(aciModel.primary_ccn).setIcon(aciModel.icon).setLastAction(aciModel.lastaction).setLog(aciModel.log).setDate(aciModel.date);
 
                     ArrayList<ResultAddition> additions = aciModel.getAddition();
                     if (additions != null && additions.size() > 0) {
@@ -202,7 +202,7 @@ public class ResultAdapter extends BaseAdapter {
                         ResulteManifestModel emanifestModel = (ResulteManifestModel)model;
                         ResulteManifestCell cell = dequeueeManifestCell(context, convertView);
                         cell.prepareReuse();
-                        cell.setHBCCN(emanifestModel.hbccn).setPrimaryCCN(emanifestModel.primary_ccn).setIcon(emanifestModel.getIcon()).setDate(emanifestModel.date)
+                        cell.setHBCCN(emanifestModel.hbccn).setPrimaryCCN(emanifestModel.primary_ccn).setIcon(emanifestModel.icon).setDate(emanifestModel.date)
                                 .setLog(emanifestModel.log).setPreviousCCN(emanifestModel.previous_ccn).setIsClose(emanifestModel.inclose);
 
                         ArrayList<ResultAddition> additions = emanifestModel.getAddition();

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

@@ -35,6 +35,7 @@ import org.json.JSONObject;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 
 public class ResultPresenter implements ResultAdapter.ApexResultAdapterDataSource {
@@ -293,7 +294,10 @@ public class ResultPresenter implements ResultAdapter.ApexResultAdapterDataSourc
                     }
                     case ResultTypeISF: {
                         ResultISFModel model = new ResultISFModel();
+//                        model.getIcon();
+                        Field[] fields= model.getClass().getFields();
                         model.setValuesForKeysWithJSON(item);
+
                         return model;
                     }
                     case ResultTypeACI: {

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

@@ -24,9 +24,9 @@ public class ResultACEM1Model extends ResultBaseModel
     public ResultACEM1Model() {
 
     }
-    public String getIcon() {
-        return icon;
-    }
+//    public String getIcon() {
+//        return icon;
+//    }
 
     // endregion
 

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

@@ -28,9 +28,9 @@ public class ResultACIModel extends ResultBaseModel
     public ResultACIModel() {
 
     }
-    public String getIcon() {
-        return icon;
-    }
+//    public String getIcon() {
+//        return icon;
+//    }
 
     // endregion
 

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

@@ -23,9 +23,9 @@ public class ResultCustomerModel extends ResultBaseModel
     public ResultCustomerModel() {
 
     }
-    public String getIcon() {
-        return icon;
-    }
+//    public String getIcon() {
+//        return icon;
+//    }
 
     // endregion
 

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

@@ -17,6 +17,7 @@ public class ResultISFModel extends ResultBaseModel
     public String log;
     public String isftype;
     public String consignee;
+
 //    public int transport_stage;
 //    public String consignee;
 
@@ -24,10 +25,12 @@ public class ResultISFModel extends ResultBaseModel
     public ResultISFModel() {
 
     }
-    public String getIcon() {
-        return icon;
-    }
-
+//    public String getIcon() {
+//        return icon;
+//    }
+//    public String getIcon() {
+//        return icon;
+//    }
     // endregion
 
 

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

@@ -25,9 +25,9 @@ public class ResulteManifestModel extends ResultBaseModel
     public ResulteManifestModel() {
 
     }
-    public String getIcon() {
-        return icon;
-    }
+//    public String getIcon() {
+//        return icon;
+//    }
     // endregion