Organize and modify the display of error messages -- 整理和修改出错信息的显示(resolve: #14439)

Package the release version -- 打包release版(resolve: #14464)
Test the release version on a real device -- 真机测试release版(issue10: #14465)
When there is no network connection, the app will crash -- 无网络连接时，app会闪退(resolve: #14466)

ApexDrivers/RAUtilsLibrary/src/main/java/com/usai/redant/rautils/utils/Network.java

@@ -123,6 +123,8 @@ public class Network {
         Log.d(TAG, "getJson begin");
         String ret=null;
 
+
+
         HttpURLConnection connection = null;
 
         try {

ApexDrivers/ratradefiling/build.gradle

@@ -1,7 +1,17 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 28
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a'
+            universalApk true
+        }
+    }
+
+    compileSdkVersion 29
 
     defaultConfig {
         applicationId "com.usai.ratradefiling"
@@ -9,16 +19,27 @@ 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"
     }
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
+            zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+//            debuggable true
+//            minifyEnabled true
+//            zipAlignEnabled true
+//            shrinkResources true
+
+//            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-project.txt'
+//            proguardFiles 'proguard-project.txt'
+        }
     }
 }
 

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

@@ -21,6 +21,7 @@ import android.util.Log;
 //import com.usai.apex.TradeFilingApplication;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.usai.ratradefiling.R;
 import com.usai.ratradefiling.RootActivity;
 import com.usai.ratradefiling.TradeFilingApplication;
 import com.usai.ratradefiling.my.CheckSavedActivity;
@@ -315,7 +316,17 @@ public class OnlineDataProvider extends com.usai.redant.rautils.utils.Network
 	private static JSONObject handleJson(String jsonStr) {
 
 		if (jsonStr == null || jsonStr.isEmpty()) {
-			return null;
+			JSONObject json = new JSONObject();
+			try
+			{
+				json.put("result",RESULT_NET_ERROR);
+				json.put("err_msg",TradeFilingApplication.getInstance().getText(R.string.msg_net_resulterror));
+			} catch (JSONException e)
+			{
+				e.printStackTrace();
+			}
+			return json;
+
 		}
 
 		try {
@@ -534,6 +545,20 @@ public class OnlineDataProvider extends com.usai.redant.rautils.utils.Network
 
 	public static String getJson(String url, Bundle parms)
 	{
+		if(!NetworkIsAvailable())
+		{
+			JSONObject json = new JSONObject();
+			try
+			{
+				json.put("result",RESULT_NET_NOTAVAILABLE);
+			} catch (JSONException e)
+			{
+				e.printStackTrace();
+			}
+			return json.toString();
+		}
+
+
 		prepare_addtional_params(parms);
 		return com.usai.redant.rautils.utils.Network.getJson(url, parms, REQUEST_TIMEOUT);
 	}

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

@@ -62,6 +62,7 @@ import com.usai.ratradefiling.R;
 import com.usai.ratradefiling.TradeFilingApplication;
 import com.usai.ratradefiling.dataprovider.OnlineDataProvider;
 import com.usai.ratradefiling.dataprovider.RADataProvider;
+import com.usai.ratradefiling.my.ChangePasswordActivity;
 import com.usai.redant.rautils.utils.RAUtil;
 
 import org.json.JSONArray;
@@ -1436,7 +1437,18 @@ public class DetailFragment extends Fragment implements OnClickListener /*
 
 					break;
 				}
+				case OnlineDataProvider.RESULT_FAILED_WITH_MESSAGE: {
 
+					String msg =  json.optString("err_msg");
+					Toast toast = Toast.makeText(getActivity()
+									.getApplicationContext(),
+							msg,
+							Toast.LENGTH_LONG);
+					toast.setGravity(Gravity.CENTER, 0, 0);
+					toast.show();
+
+					return;
+				}
 				default:
 					break;
 			}
@@ -1505,7 +1517,7 @@ public class DetailFragment extends Fragment implements OnClickListener /*
 
                             previewPDF(downloadFile.getAbsolutePath(),email,email_subject,email_content);
                         } else {
-                            showAlert("Sorry,there is a wrong.");
+                            showAlert("Sorry, can not open the file.");
                         }
                     }
                 });

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

@@ -103,7 +103,7 @@ public class HomeHeaderView extends RelativeLayout {
         tv_recent.setText(Html.fromHtml(s30));
     }
     private void init() {
-        Log.e("DEBUG", "init: FUNCTION PANEL!!!");
+//        Log.e("DEBUG", "init: FUNCTION PANEL!!!");
         if (initialized) {
             return;
         }
@@ -153,7 +153,7 @@ public class HomeHeaderView extends RelativeLayout {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
 
 
-                Log.e("DEBUG", "onItemClick: FUNCTION PANEL!!!");
+//                Log.e("DEBUG", "onItemClick: FUNCTION PANEL!!!");
 
                 JSONObject item =(JSONObject) function_panel.getItemAtPosition(position);
 

ApexDrivers/ratradefiling/src/main/java/com/usai/ratradefiling/login/LoginFragment.java

@@ -511,8 +511,13 @@ public class LoginFragment extends Fragment/* implements OnClickListener */
 						}
 					}
 
-			} catch (JSONException e) {
+			} catch (Exception e) {
 				e.printStackTrace();
+				Toast toast = Toast.makeText(getActivity()
+								.getApplicationContext(),
+						getText(R.string.msg_net_resulterror), Toast.LENGTH_LONG);
+				toast.setGravity(Gravity.CENTER, 0, 0);
+				toast.show();
 			}
 			// if (netconnect == )
 			// {

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

@@ -1,5 +1,7 @@
 package com.usai.ratradefiling.result;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.os.Bundle;
 import android.text.TextUtils;
 
@@ -11,10 +13,12 @@ import android.text.TextUtils;
 //import com.usai.apex.apexresult.model.ApexResultBookingModel;
 //import com.usai.apex.apexresult.model.ApexResultContainerModel;
 //import com.usai.apex.apexresult.model.ApexResultDocumentModel;
+import com.usai.ratradefiling.R;
 import com.usai.ratradefiling.TradeFilingApplication;
 import com.usai.ratradefiling.base.ResultBaseModel;
 import com.usai.ratradefiling.dataprovider.OnlineDataProvider;
 import com.usai.ratradefiling.dataprovider.RADataProvider;
+import com.usai.ratradefiling.my.ChangePasswordActivity;
 import com.usai.ratradefiling.result.model.ResultACEM1Model;
 import com.usai.ratradefiling.result.model.ResultACIModel;
 import com.usai.ratradefiling.result.model.ResultCustomerModel;
@@ -430,9 +434,12 @@ public class ResultPresenter implements ResultAdapter.ApexResultAdapterDataSourc
 
                 } else {
 
+
+
+
                     String msg = "Sorry, something is wrong.";
                     if (json != null) {
-                        json.optString("err_msg", "Sorry, something is wrong.");
+                        msg=json.optString("err_msg", "Sorry, something is wrong.");
                     }
 
                     if (getDelegate() != null) {

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

@@ -74,7 +74,6 @@
         android:id="@+id/cb_agree"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignBottom="@+id/tv_login"
         android:layout_marginStart="20dp"
         android:layout_marginBottom="50dp"
         android:checked="false"

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

@@ -1,3 +1,3 @@
 <resources>
-    <string name="hello_world">Hello Round World!</string>
+
 </resources>