apex mobile a190316

ApexDrivers/apexmobile/build.gradle

@@ -1,6 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
+
+
+    splits {
+        abi {
+            enable true
+            reset()
+            include 'armeabi-v7a'
+            universalApk true
+        }
+    }
     signingConfigs {
     }
     compileSdkVersion 26
@@ -9,6 +19,9 @@ android {
         applicationId "com.usai.apex"
         minSdkVersion 23
         targetSdkVersion 26
+        versionCode 18
+        versionName "A190316"
+
 //        multiDexEnabled true
 
 //        ndk {
@@ -18,10 +31,6 @@ android {
     buildTypes {
         release {
 
-            ndk {
-                abiFilters "armeabi-v7a"
-                // 指定要ndk需要兼容的架构(这样其他依赖包里mips,x86,armeabi,arm-v8之类的so会被过滤掉)
-            }
 
             minifyEnabled true
             zipAlignEnabled true

ApexDrivers/apexmobile/proguard-project.txt

@@ -25,7 +25,44 @@
 -dontwarn com.google.android.gms.** 
 -dontwarn javax.naming.**
 
+
+
+
+
+#-keep class com.usai.redant.camera.CameraManager
+#-keep class javax.naming.*
+#-keep class com.usai.apex.apexcrm.RAJSInterface {*;}
+
+
+# 保持哪些类不被混淆
+#继承activity,application,service,broadcastReceiver,contentprovider....不进行混淆
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.support.multidex.MultiDexApplication
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class * extends android.view.View
+-keep class android.support.** {*;}## 保留support下的所有类及其内部类
+
+-keep public class com.google.vending.licensing.ILicensingService
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keep class * extends com.usai.redant.apexdrivers.base.NoProguard {*;}
+-keep class javax.naming.*
+#表示不混淆上面声明的类，最后这两个类我们基本也用不上，是接入Google原生的一些服务时使用的。
+#----------------------------------------------------
+
+# 保留继承的
+-keep public class * extends android.support.v4.**
+-keep public class * extends android.support.v7.**
+-keep public class * extends android.support.annotation.**
+
+
 # Remove all Verbose/Debug logging
+
 -optimizations code/removal/simple,code/removal/advanced
 -dontobfuscate
 -assumenosideeffects class android.util.Log {

ApexDrivers/apexmobile/src/main/AndroidManifest.xml

@@ -2,8 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="com.usai.apex"
-          android:versionCode="17"
-          android:versionName="A180723"> <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
+    > <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
   <!--  <uses-sdk android:targetSdkVersion="18"/>-->
 
     <!-- 写联系人权限 -->
@@ -97,6 +96,7 @@
         android:name=".ApexTrackingApplication"
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:screenOrientation="portrait"
         android:theme="@style/FixedActionbarTheme"

ApexDrivers/apexmobile/src/main/java/com/usai/apex/ApexActivity.java

@@ -61,7 +61,11 @@ public class ApexActivity extends FragmentActivity /*
 			packageInfo = null;
 			e.printStackTrace();
 		}
-		if (packageInfo == null)
+
+
+		String able= getResources().getConfiguration().locale.getCountry();
+
+		if (able.equals("CN") /*packageInfo == null*/)
 		{
 			m_bhasgoogleframework = false;
 			System.out.println("没有安装");

ApexDrivers/apexmobile/src/main/java/com/usai/apex/InnerMapActivity.java

@@ -129,7 +129,10 @@ public class InnerMapActivity extends AppCompatActivity implements BaiduMapFragm
 			packageInfo = null;
 			e.printStackTrace();
 		}
-		if (packageInfo == null)
+
+		String able= getResources().getConfiguration().locale.getCountry();
+//        if (packageInfo == null)
+		if (able.equals("CN"))
 		{
 			m_bhasgoogleframework = false;
 			System.out.println("没有安装");

ApexDrivers/apexmobile/src/main/java/com/usai/apex/mainframe/LoginFragment.java

@@ -78,7 +78,7 @@ public class LoginFragment extends Fragment/* implements OnClickListener */
 		View view = inflater.inflate(R.layout.fragment_login, null);
 		TextView tv_ver = (TextView) view.findViewById(R.id.tv_ver);
 		try {
-			tv_ver.setText(getText(R.string.str_ver)+ApexTrackingApplication.get_instance().getPackageManager().getPackageInfo(
+			tv_ver.setText(getText(R.string.str_ver)+"2.66 "+ApexTrackingApplication.get_instance().getPackageManager().getPackageInfo(
 						"com.usai.apex", 0).versionName);
 		} catch (NameNotFoundException e1) {
 			// TODO Auto-generated catch block
@@ -162,7 +162,7 @@ public class LoginFragment extends Fragment/* implements OnClickListener */
 					@Override
 					public boolean onEditorAction(TextView textView, int id,
 							KeyEvent keyEvent) {
-						if (id == R.id.login
+						if (id == 1024
 								|| id == EditorInfo.IME_ACTION_DONE) {
 							InputMethodManager inputMethodManager = (InputMethodManager) getActivity()
 									.getApplicationContext().getSystemService(

ApexDrivers/apexmobile/src/main/java/com/usai/apex/shipmap/ShipMap.java

@@ -105,7 +105,10 @@ public class ShipMap extends RelativeLayout implements GoogleMap.OnMarkerClickLi
             packageInfo = null;
             e.printStackTrace();
         }
-        if (packageInfo == null) {
+        String able= getResources().getConfiguration().locale.getCountry();
+//        if (packageInfo == null)
+        if (able.equals("CN"))
+        {
             mUseGoogleMap = false;
             System.out.println("没有安装");
         } else {

ApexDrivers/apexmobile/src/main/java/com/usai/util/Network.java

@@ -1,18 +1,27 @@
 package com.usai.util;
 
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
+import android.content.Context;
+import android.content.SharedPreferences.Editor;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteStatement;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.usai.apex.ApexTrackingApplication;
+
+import org.apache.http.conn.ssl.SSLSocketFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.File;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
 import java.net.Socket;
-import java.net.URL;
-import java.net.URLEncoder;
 import java.net.UnknownHostException;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
@@ -20,40 +29,11 @@ import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.security.UnrecoverableKeyException;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
 
-import org.apache.http.conn.ssl.SSLSocketFactory;
-
-
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-
-import com.usai.apex.ApexTrackingApplication;
-
-
-import android.content.Context;
-import android.content.SharedPreferences.Editor;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteStatement;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
-import android.os.Bundle;
-import android.os.Environment;
-import android.text.TextUtils;
-import android.util.Log;
-
 public class Network
 {
 	public static final int		BEHAVIOR_SEARCH					= 0;
@@ -89,50 +69,50 @@ public class Network
 	public static final int		RESULT_VER_LOW					= -15;
 
 
-	//release
-//	public static String		URL_HOME						= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_HISTORY						= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_KPI							= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_UPDATE_AUTH					= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_REQUEST_COUNT				= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_REQUEST_RECORDS				= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_RETRIEVE_PASS				= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_ANNOUNCEMENTS				= "https://ra.apexshipping.com/mobile_news.php";
-//	public static String		URL_NEWS						= "https://ra.apexshipping.com/mobile_news.php";
-//	public static String		URL_LOCATIONS					= "https://ra.apexshipping.com/mobile_news.php";
-//	public static String		URL_PUSH						= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_LOG							= "https://ra.apexshipping.com/mobile_news.php";
-//	public static String		URL_SEND_COMM_EMAIL				= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_CHECK_UPDATE				= "https://ra.apexshipping.com/main_new.php";
-
-	// 2019.1.5
-//	public static String		URL_UPLOAD_SQL					= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_FETCH_RESULT				= "https://ra.apexshipping.com/main_new.php";
-//	public static String		URL_SAVE_RESULT					= "https://ra.apexshipping.com/main_new.php";
-
-
-
-//
-////debug
-	public static String		URL_HOME						= "http://192.168.0.138:8899/main_new_26.php";
-	public static String		URL_HISTORY						= "http://192.168.0.138:8899/main_new_26.php";
-	public static String		URL_KPI							= "http://192.168.0.138:8899/main_new_26.php";
-	public static String		URL_UPDATE_AUTH					= "http://192.168.0.138:8899/main_new_26.php";
-	public static String		URL_REQUEST_COUNT				= "http://192.168.0.138:8899/main_new_26.php";
-	public static String		URL_REQUEST_RECORDS				= "http://192.168.0.138:8899/main_new_26.php";
-	public static String		URL_RETRIEVE_PASS				= "http://192.168.0.138:8899/main_new_26.php";
+////	release
+	public static String		URL_HOME						= "https://ra.apexshipping.com/main_new_26.php";
+	public static String		URL_HISTORY						= "https://ra.apexshipping.com/main_new_26.php";
+	public static String		URL_KPI							= "https://ra.apexshipping.com/main_new_26.php";
+	public static String		URL_UPDATE_AUTH					= "https://ra.apexshipping.com/main_new_26.php";
+	public static String		URL_REQUEST_COUNT				= "https://ra.apexshipping.com/main_new_26.php";
+	public static String		URL_REQUEST_RECORDS				= "https://ra.apexshipping.com/main_new_26.php";
+	public static String		URL_RETRIEVE_PASS				= "https://ra.apexshipping.com/main_new_26.php";
 	public static String		URL_ANNOUNCEMENTS				= "https://ra.apexshipping.com/mobile_news.php";
 	public static String		URL_NEWS						= "https://ra.apexshipping.com/mobile_news.php";
 	public static String		URL_LOCATIONS					= "https://ra.apexshipping.com/mobile_news.php";
-	public static String		URL_PUSH						= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_PUSH						= "https://ra.apexshipping.com/main_new_26.php";
 	public static String		URL_LOG							= "https://ra.apexshipping.com/mobile_news.php";
-	public static String		URL_SEND_COMM_EMAIL				= "http://192.168.0.138:8899/main_new_26.php";
-	public static String		URL_CHECK_UPDATE				= "http://192.168.0.138:8899/main_new_26.php";
+	public static String		URL_SEND_COMM_EMAIL				= "https://ra.apexshipping.com/main_new_26.php";
+	public static String		URL_CHECK_UPDATE				= "https://ra.apexshipping.com/main_new_26.php";
+
+
+	public static String		URL_UPLOAD_SQL					= "https://ra.apexshipping.com/main_new_26.php";
+	public static String		URL_FETCH_RESULT				= "https://ra.apexshipping.com/main_new_26.php";
+	public static String		URL_SAVE_RESULT					= "https://ra.apexshipping.com/main_new_26.php";
 
 
-	public static String		URL_UPLOAD_SQL					= "http://192.168.0.138:8899/main_new_26.php";
-	public static String		URL_FETCH_RESULT				= "http://192.168.0.138:8899/main_new_26.php";
-	public static String		URL_SAVE_RESULT					= "http://192.168.0.138:8899/main_new_26.php";
+//
+////
+//////debug
+//	public static String		URL_HOME						= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_HISTORY						= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_KPI							= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_UPDATE_AUTH					= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_REQUEST_COUNT				= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_REQUEST_RECORDS				= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_RETRIEVE_PASS				= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_ANNOUNCEMENTS				= "https://ra.apexshipping.com/mobile_news.php";
+//	public static String		URL_NEWS						= "https://ra.apexshipping.com/mobile_news.php";
+//	public static String		URL_LOCATIONS					= "https://ra.apexshipping.com/mobile_news.php";
+//	public static String		URL_PUSH						= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_LOG							= "https://ra.apexshipping.com/mobile_news.php";
+//	public static String		URL_SEND_COMM_EMAIL				= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_CHECK_UPDATE				= "http://192.168.0.138:8899/main_new_26.php";
+//
+//
+//	public static String		URL_UPLOAD_SQL					= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_FETCH_RESULT				= "http://192.168.0.138:8899/main_new_26.php";
+//	public static String		URL_SAVE_RESULT					= "http://192.168.0.138:8899/main_new_26.php";
 
 
 
@@ -815,7 +795,7 @@ public class Network
 	{
 
 		String TAG = "net_dbg@get_Auth";
-		Log.d(TAG, "u:" + name + ";p:" + password);
+//		Log.d(TAG, "u:" + name + ";p:" + password);
 		if (!Network.NetworkIsAvailable())
 		{
 			Log.d(TAG, "network not available!");

ApexDrivers/apexmobile/src/main/res/layout/apex_result_blinfo_cell.xml

@@ -59,25 +59,23 @@
                     android:singleLine="true"
                     android:text="Consignee"
                     android:textColor="@color/icon_gray"
-                    android:textSize="12.7sp"
+                    android:textSize="12sp"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/tv_title"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="13dp"
                     android:layout_marginStart="13dp"
-                    android:layout_marginRight="3dp"
-                    android:layout_marginEnd="3dp"
                     android:layout_marginTop="8dp"
+                    android:layout_marginEnd="3dp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:text="TextView"
                     android:textColor="@color/icon_gray"
                     android:textSize="12.7sp"
+                    android:textStyle="bold"
                     app:layout_constraintEnd_toStartOf="@id/tv_consignee"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />

ApexDrivers/apexmobile/src/main/res/layout/apex_result_booking_cell.xml

@@ -75,25 +75,23 @@
                     android:singleLine="true"
                     android:text="Consignee"
                     android:textColor="@color/icon_gray"
-                    android:textSize="12.7sp"
+                    android:textSize="12sp"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/tv_title"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="13dp"
                     android:layout_marginStart="13dp"
-                    android:layout_marginRight="3dp"
-                    android:layout_marginEnd="3dp"
                     android:layout_marginTop="8dp"
+                    android:layout_marginEnd="3dp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:text="TextView"
                     android:textColor="@color/icon_gray"
                     android:textSize="12.7sp"
+                    android:textStyle="bold"
                     app:layout_constraintEnd_toStartOf="@id/tv_consignee"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />

ApexDrivers/apexmobile/src/main/res/layout/apex_result_container_cell.xml

@@ -59,25 +59,23 @@
                     android:singleLine="true"
                     android:text="Consignee"
                     android:textColor="@color/icon_gray"
-                    android:textSize="12.7sp"
+                    android:textSize="12sp"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    />
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/tv_title"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="13dp"
                     android:layout_marginStart="13dp"
-                    android:layout_marginRight="3dp"
-                    android:layout_marginEnd="3dp"
                     android:layout_marginTop="8dp"
+                    android:layout_marginEnd="3dp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:text="TextView"
                     android:textColor="@color/icon_gray"
                     android:textSize="12.7sp"
+                    android:textStyle="bold"
                     app:layout_constraintEnd_toStartOf="@id/tv_consignee"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />

ApexDrivers/apexmobile/src/main/res/layout/apex_result_document_cell.xml

@@ -41,13 +41,13 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignTop="@id/apex_result_document_file_type_tv"
-            android:layout_toRightOf="@id/apex_result_document_icon_view"
-            android:layout_toLeftOf="@id/apex_result_document_file_type_tv"
             android:layout_marginLeft="5dp"
-            android:textSize="17sp"
-            android:textColor="#000000"
+            android:layout_toLeftOf="@id/apex_result_document_file_type_tv"
+            android:layout_toRightOf="@id/apex_result_document_icon_view"
             android:text="A1811390637FR.pdf"
-            />
+            android:textColor="#000000"
+            android:textSize="17sp"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/apex_result_document_file_po_tv"

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

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

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

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

ApexDrivers/apexmobile/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>