9 лет назад · 33e2ed0e78
--- a/Apex/.classpath
+++ b/Apex/.classpath
@@ -5,5 +5,7 @@
 
															 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
														
 
															 	<classpathentry kind="src" path="gen"/>
														
 
															 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
														
 
															+	<classpathentry kind="lib" path="/BaiduMap_android/BaiduMap_AndroidSDK_v3.7.1/libs/baidumapapi_base_v3_7_1.jar"/>
														
 
															+	<classpathentry kind="lib" path="/BaiduMap_android/BaiduMap_AndroidSDK_v3.7.1/libs/baidumapapi_map_v3_7_1.jar"/>
														
 
															 	<classpathentry kind="output" path="bin/classes"/>
														
 
															 </classpath>
														
--- a/Apex/AndroidManifest.xml
+++ b/Apex/AndroidManifest.xml
@@ -1,8 +1,8 @@
 
															 <?xml version="1.0" encoding="utf-8"?>
														
 
															 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
														
 
															     package="com.usai.apex"
														
 
															-    android:versionCode="6"
														
 
															-    android:versionName="A140520" >
														
 
															+    android:versionCode="7"
														
 
															+    android:versionName="A160422" >
														
 
															     <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
														
 
															     <uses-sdk
														
@@ -107,15 +107,24 @@
 
															        <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" />  
														
 
															+      
														
 
															         <!-- debug key -->
														
 
															 <!--                   <meta-data
														
 
															             android:name="com.google.android.maps.v2.API_KEY"
														
 
															-            android:value="AIzaSyARPN7VaYqWGe1PsgGqp1QlhOoTdiwTqq0" /> -->
														
 
															+            android:value="AIzaSyARPN7VaYqWGe1PsgGqp1QlhOoTdiwTqq0" /> 
														
 
															-
														
 
															+  <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" />
														
--- a/Apex/libs/baidumapapi_base_v3_7_1.jar
+++ b/Apex/libs/baidumapapi_base_v3_7_1.jar
--- a/Apex/libs/baidumapapi_map_v3_7_1.jar
+++ b/Apex/libs/baidumapapi_map_v3_7_1.jar
--- a/Apex/libs/baidumapapi_v2_4_0.jar
+++ b/Apex/libs/baidumapapi_v2_4_0.jar
--- a/Apex/proguard-project.txt
+++ b/Apex/proguard-project.txt
@@ -36,4 +36,5 @@
 
															 -keep class com.baidu.** {*;}
														
 
															+#-keep class com.baidu.mapapi.** {*;}
														
 
															 -keep class vi.com.gdi.bgl.** {*;}
														
--- a/Apex/proguard/dump.txt
+++ b/Apex/proguard/dump.txt
--- a/Apex/proguard/seeds.txt
+++ b/Apex/proguard/seeds.txt
--- a/Apex/proguard/usage.txt
+++ b/Apex/proguard/usage.txt
--- a/Apex/project.properties
+++ b/Apex/project.properties
@@ -12,6 +12,6 @@
 
															 proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt
														
 
															 # Project target.
														
 
															-target=android-14
														
 
															+target=android-19
														
 
															 android.library.reference.1=../google-play-services_lib
														
--- a/Apex/res/raw/about.htm
+++ b/Apex/res/raw/about.htm
@@ -1,7 +1,11 @@
 
															 <html>

														
 
															+<b><span lang=EN-US style='color:red'>2014</span></b><br>

														
 
															+Starlink and Apex Maritime reorganized their air freight departments and promoted Paul Lin to Vice President overseeing Asia, Europe, and USA sales and operations. Apex handled over 300,000 TEUs and was recognized as the third largest NVOCC in the Trans-Pacific trade. 

														
 
															+<br><br>

														
 
															 <b><span lang=EN-US style='color:red'>2013</span></b><br>

														
 
															 Apex India is established. Apex remained the second largest NVOCC from Asia to U.S. for the second consecutive year, according to Zepol.

														
 
															-<br><br><b><span lang=EN-US style='color:red'>2012</span></b><br>

														
 
															+<br><br>

														
 
															+<b><span lang=EN-US style='color:red'>2012</span></b><br>

														
 
															 Apex was recognized as the second largest NVOCC for Asia to USA trade, according to Zepol.com. China Airlines recognized Apex Maritime for exceeding 5 million revenue contribution. Apex Houston was established as a standalone office.

														
 
															 <br><br><b><span lang=EN-US style='color:red'>2011</span></b><br>

														
 
															 In January, ULS moved into its own 143,000 square foot warehouse in Newark, CA. ULS opened up its second 155,000 square foot Newark warehouse in November. China Airlines recognized Apex Maritime for exceeding 1 million revenue contribution.