apex mobile 2.70

ApexDrivers/apexmobile/build.gradle

@@ -19,8 +19,8 @@ android {
         applicationId "com.usai.apex"
         minSdkVersion 23
         targetSdkVersion 26
-        versionCode 20
-        versionName "A190402"
+        versionCode 21
+        versionName "A190419"
 
 //        multiDexEnabled true
 
@@ -31,7 +31,7 @@ android {
     buildTypes {
         release {
 
-
+            debuggable false
             minifyEnabled true
             zipAlignEnabled true
             shrinkResources true

ApexDrivers/apexmobile/proguard-project.txt

@@ -66,9 +66,9 @@
 -optimizations code/removal/simple,code/removal/advanced
 -dontobfuscate
 -assumenosideeffects class android.util.Log {
-#    public static *** d(...);
-#    public static *** v(...);
-#    public static *** i(...);
+    public static *** d(...);
+    public static *** v(...);
+    public static *** i(...);
 }
 
 

ApexDrivers/apexmobile/src/main/AndroidManifest.xml

@@ -112,28 +112,28 @@
         </provider>
 
         <!-- release key -->
-        <!--<meta-data-->
-            <!--android:name="com.google.android.maps.v2.API_KEY"-->
-            <!--android:value="AIzaSyDdbk58Lx6QzaXcB_hNpSHVp3l_CJeNpoo"/>-->
-        <!--<meta-data-->
-            <!--android:name="com.baidu.lbsapi.API_KEY"-->
-            <!--android:value="nqBQoSDbxrslhuzW91uViQX7"/>-->
-        <!--<meta-data-->
-            <!--android:name="com.google.android.gms.version"-->
-            <!--android:value="@integer/google_play_services_version"/>-->
+        <meta-data
+            android:name="com.google.android.maps.v2.API_KEY"
+            android:value="AIzaSyDdbk58Lx6QzaXcB_hNpSHVp3l_CJeNpoo"/>
+        <meta-data
+            android:name="com.baidu.lbsapi.API_KEY"
+            android:value="nqBQoSDbxrslhuzW91uViQX7"/>
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="@integer/google_play_services_version"/>
 
         <!-- debug key -->
 
 
-         <meta-data
-         android:name="com.google.android.maps.v2.API_KEY"
-         android:value="AIzaSyD6Snyg2SDUGtkC3sOAr979__IDCZnGGuU" />
-         <meta-data
-         android:name="com.baidu.lbsapi.API_KEY"
-         android:value="tznWFxd3RvSoul1TGQp6GSzo" />
-         <meta-data
-         android:name="com.google.android.gms.version"
-         android:value="@integer/google_play_services_version" />
+         <!--<meta-data-->
+         <!--android:name="com.google.android.maps.v2.API_KEY"-->
+         <!--android:value="AIzaSyD6Snyg2SDUGtkC3sOAr979__IDCZnGGuU" />-->
+         <!--<meta-data-->
+         <!--android:name="com.baidu.lbsapi.API_KEY"-->
+         <!--android:value="tznWFxd3RvSoul1TGQp6GSzo" />-->
+         <!--<meta-data-->
+         <!--android:name="com.google.android.gms.version"-->
+         <!--android:value="@integer/google_play_services_version" />-->
 
         <activity
             android:name=".DetailActivity"
@@ -259,21 +259,21 @@
             android:label="@string/title_activity_web"
             android:screenOrientation="portrait"/>
 
-        <receiver
-            android:name=".BootBroadcastReceiver"
-            android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
-            <intent-filter>
-                <action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>
-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
-            </intent-filter>
-        </receiver>
-        <receiver android:name=".Alarmreceiver" android:permission="">
-            <intent-filter>
-                <action android:name="com.usai.apex.push"/>
-                <action android:name="com.usai.apex.push.cancel"/>
-            </intent-filter>
-        </receiver>
+        <!--<receiver-->
+            <!--android:name=".BootBroadcastReceiver"-->
+            <!--android:permission="android.permission.RECEIVE_BOOT_COMPLETED">-->
+            <!--<intent-filter>-->
+                <!--<action android:name="android.intent.action.DOWNLOAD_COMPLETE"/>-->
+                <!--<action android:name="android.intent.action.BOOT_COMPLETED"/>-->
+                <!--<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>-->
+            <!--</intent-filter>-->
+        <!--</receiver>-->
+        <!--<receiver android:name=".Alarmreceiver" android:permission="">-->
+            <!--<intent-filter>-->
+                <!--<action android:name="com.usai.apex.push"/>-->
+                <!--<action android:name="com.usai.apex.push.cancel"/>-->
+            <!--</intent-filter>-->
+        <!--</receiver>-->
 
         <activity
             android:name=".MessageDetailActivity"

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

@@ -153,6 +153,10 @@ public class BaiduMapFragment extends Fragment implements BDLocationListener
 
 				LocationDetail detail = new LocationDetail(company, address,
 						telephone, fax, contact, email);
+//				detail.addr_city = "chengdu";
+//				detail.addr_country = "china";
+//				detail.addr_state = "sichuan";
+//				detail.addr_zip = "610000";
 				marker_detail.put(company, detail);
 
 				Bundle extrainfo = new Bundle();

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

@@ -216,6 +216,11 @@ public class InnerMapActivity extends AppCompatActivity implements BaiduMapFragm
 		PostalAddress postalAddress = new PostalAddress(BaseElement.NEW_ELEMENT_ID);
 		postalAddress.type = PostalAddress.AddressType.TYPE_WORK;
 		postalAddress.street = addr;
+		postalAddress.country = detail.addr_country;
+		postalAddress.postalCode = detail.addr_zip;
+		postalAddress.state = detail.addr_state;
+		postalAddress.city = detail.addr_city;
+
 
 		ArrayList<PostalAddress> postalAddressArrayList = new ArrayList<>();
 		postalAddressArrayList.add(postalAddress);

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

@@ -9,6 +9,7 @@ public class LocationDetail implements Serializable
 	 */
 	private static final long serialVersionUID = -8043239175565480418L;
 	public String Name,Addr,Tel,Fax,Contact,Email;
+	public String addr_country,addr_state,addr_zip,addr_city;
 	public LocationDetail(String name, String addr, String tel, String fax, String contact, String email)
 	{
 //		Name="aa";

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

@@ -39,6 +39,7 @@ import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.Marker;
 import com.google.android.gms.maps.model.MarkerOptions;
+import com.usai.redant.rautils.location.GeoUtils;
 import com.usai.util.Network;
 
 import org.json.JSONException;
@@ -120,7 +121,10 @@ public class ServiceLocationFragment extends Fragment implements
 				String fax = objrec.getString("fax");
 				String contact = objrec.getString("contact");
 				String email = objrec.getString("email");
-
+				String sgmap_china = objrec.getString("gmap_china");
+				boolean gmap_china = false;
+				if(sgmap_china.equals("t"))
+                    gmap_china = true;
 //				String markertext = company;
 //				String city = parts[i + 1];
 //				String postext = parts[i + 2];
@@ -133,7 +137,16 @@ public class ServiceLocationFragment extends Fragment implements
 				double dlatitude=Double.parseDouble(latitude);
 				double dlongitude=Double
 						.parseDouble(longitude);
+				if (gmap_china)
+				{
+					Log.d("service location", "cn 变形: "+area);
+//					Log.d("service location", "cn 变形前: "+dlatitude+","+dlongitude);
+					double bd[] = GeoUtils.wgs84togcj02(dlongitude,dlatitude);
+					dlongitude = bd[0];
+					dlatitude = bd[1];
+//					Log.d("service location", "cn 变形: "+dlatitude+","+dlongitude);
 
+				}
 
 //				String able= getResources().getConfiguration().locale.getCountry();
 //				if (able.equals("CN")&&(area.toLowerCase().equals("southern china")||area.toLowerCase().equals("northern china")||area.toLowerCase().equals("eastern china")||area.toLowerCase().equals("taiwan")))
@@ -154,6 +167,12 @@ public class ServiceLocationFragment extends Fragment implements
 
 				LocationDetail detail = new LocationDetail(company, address,
 						telephone, fax, contact, email);
+
+//				detail.addr_city = "chengdu";
+//				detail.addr_country = "china";
+//				detail.addr_state = "sichuan";
+//				detail.addr_zip = "610000";
+
 				// detail.Name=markertext;
 				// detail.Addr=address;
 				// detail.Tel=tel;

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

@@ -300,6 +300,12 @@ TrackingListSearchResult searchresult	= new TrackingListSearchResult();
             description.setText(result.getData().get(position).get("description")
                     .toString());
 
+            TextView po = (TextView) convertView
+                    .findViewById(R.id.tv_po);
+            String po_no="PO#: "+result.getData().get(position).get("po_no")
+                    .toString();
+            po.setText(po_no);
+
             TextView detail = (TextView) convertView
                     .findViewById(R.id.tv_detail);
             detail.setText(result.getData().get(position).get("detail")

ApexDrivers/apexmobile/src/main/java/com/usai/apex/servicelocationmap/ApexServiceLocationMapFragment.java

@@ -173,6 +173,11 @@ public class ApexServiceLocationMapFragment extends Fragment {
 
                         LocationDetail detail = new LocationDetail(company, address, telephone, fax, contact, email);
 
+//                        detail.addr_city = "chengdu";
+//                        detail.addr_country = "china";
+//                        detail.addr_state = "sichuan";
+//                        detail.addr_zip = "610000";
+
                         GeoPoint geopoint = new GeoPoint(Double.valueOf(latitude), Double.valueOf(longitude));
                         Marker marker = mMapView.addMarker(geopoint, company, city + "\n" + area);
                         mMapView.addWindowInfoForMarker(marker, detail, new ApexMarkerInfoWindow.ApexMarkerInfoWindowClickListener() {

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

@@ -73,7 +73,7 @@ public class Network
 	public static final int		RESULT_VER_LOW					= -15;
 
 
-////	release
+//	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";
@@ -95,8 +95,8 @@ public class Network
 	public static String		URL_SAVE_RESULT					= "https://ra.apexshipping.com/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";
@@ -117,7 +117,7 @@ public class Network
 //	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";
-
+//
 
 
 	public static String get_marketnews(String id, int limit)

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.usai.apex.apexresult.cell.ApexResultBLInfoCell xmlns:android="http://schemas.android.com/apk/res/android"
-                                                       android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
                                                        android:layout_height="wrap_content"
                                                        android:orientation="vertical"
     >
@@ -54,29 +55,30 @@
                     android:id="@+id/tv_consignee"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="3dp"
                     android:layout_marginTop="8dp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:text="Consignee"
+                    android:textAlignment="viewEnd"
                     android:textColor="@color/icon_gray"
                     android:textSize="12sp"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/tv_title"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/tv_title"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="13dp"
                     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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.usai.apex.apexresult.cell.ApexResultBookingCell xmlns:android="http://schemas.android.com/apk/res/android"
-                                                       android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
                                                        android:layout_height="wrap_content"
                                                        android:orientation="vertical"
     >
@@ -70,29 +71,30 @@
                     android:id="@+id/tv_consignee"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="3dp"
                     android:layout_marginTop="8dp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:text="Consignee"
+                    android:textAlignment="viewEnd"
                     android:textColor="@color/icon_gray"
                     android:textSize="12sp"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/tv_title"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/tv_title"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="13dp"
                     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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <com.usai.apex.apexresult.cell.ApexResultContainerCell xmlns:android="http://schemas.android.com/apk/res/android"
-                                                       android:layout_width="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
                                                        android:layout_height="wrap_content"
                                                        android:orientation="vertical"
     >
@@ -54,29 +55,30 @@
                     android:id="@+id/tv_consignee"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="3dp"
                     android:layout_marginTop="8dp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:text="Consignee"
+                    android:textAlignment="viewEnd"
                     android:textColor="@color/icon_gray"
                     android:textSize="12sp"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/tv_title"
                     app:layout_constraintTop_toTopOf="parent" />
 
                 <TextView
                     android:id="@+id/tv_title"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="13dp"
                     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/tracking_list_cell.xml

@@ -4,13 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-              android:background="#EFEFF4"
+    android:background="#EFEFF4"
     android:orientation="vertical">
 
     <android.support.constraint.ConstraintLayout
         android:id="@+id/cell_content_view"
         android:layout_width="match_parent"
-        android:layout_height="96dp"
+        android:layout_height="112dp"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
         android:background="@drawable/list_corner_round_bg"
@@ -20,7 +20,7 @@
             android:id="@+id/iv_status"
             android:layout_width="42dp"
             android:layout_height="42dp"
-            android:layout_marginTop="4dp"
+            android:layout_marginTop="12dp"
             app:layout_constraintStart_toStartOf="@+id/tv_title"
             app:layout_constraintTop_toBottomOf="@+id/tv_time"
             app:srcCompat="@drawable/ic_launcher" />
@@ -29,9 +29,9 @@
             android:id="@+id/tv_title"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="13dp"
             android:layout_marginStart="13dp"
             android:layout_marginTop="8dp"
+            android:layout_marginEnd="13dp"
             android:ellipsize="end"
             android:singleLine="true"
             android:text="TextView"
@@ -45,8 +45,8 @@
             android:id="@+id/tv_time"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
             android:layout_marginTop="2dp"
+            android:layout_marginEnd="8dp"
             android:text="TextView"
             android:textColor="@color/icon_red"
             android:textSize="9.7sp"
@@ -71,6 +71,21 @@
             android:layout_width="0dp"
             android:layout_height="16dp"
             android:layout_marginStart="7dp"
+            android:layout_marginTop="4dp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            android:text="TextView"
+            android:textColor="@color/icon_gray"
+            android:textSize="12.7sp"
+            app:layout_constraintEnd_toEndOf="@+id/tv_title"
+            app:layout_constraintStart_toEndOf="@+id/iv_status"
+            app:layout_constraintTop_toBottomOf="@+id/tv_time" />
+
+        <TextView
+            android:id="@+id/tv_po"
+            android:layout_width="0dp"
+            android:layout_height="16dp"
+            android:layout_marginStart="7dp"
             android:ellipsize="end"
             android:singleLine="true"
             android:text="TextView"
@@ -78,15 +93,15 @@
             android:textSize="12.7sp"
             app:layout_constraintEnd_toEndOf="@+id/tv_title"
             app:layout_constraintStart_toEndOf="@+id/iv_status"
-            app:layout_constraintTop_toTopOf="@+id/iv_status" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_description" />
 
         <TextView
             android:id="@+id/tv_detail"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:layout_marginBottom="2dp"
             android:layout_marginStart="7dp"
             android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
             android:ellipsize="end"
             android:lines="2"
             android:text="TextView"
@@ -95,7 +110,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="@+id/tv_title"
             app:layout_constraintStart_toEndOf="@+id/iv_status"
-            app:layout_constraintTop_toBottomOf="@+id/tv_description" />
+            app:layout_constraintTop_toBottomOf="@+id/tv_po" />
 
         <View