Ray Zhang 12 лет назад
Родитель
Сommit
7180681972

+ 1 - 1
Apex/AndroidManifest.xml

@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.usai.apex"
     android:versionCode="4"
-    android:versionName="A140411" >
+    android:versionName="A140412" >
 
     <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
     <uses-sdk

Разница между файлами не показана из-за своего большого размера
+ 227 - 171
Apex/proguard/dump.txt


+ 2 - 0
Apex/proguard/mapping.txt

@@ -7598,6 +7598,7 @@ com.usai.apex.BaiduMapFragment$MyGeneralListener -> com.usai.apex.h:
 com.usai.apex.BaiduMapFragment$MyOverlay -> com.usai.apex.i:
     com.usai.apex.BaiduMapFragment this$0 -> d
     boolean onTap(int) -> onTap
+    boolean onTap(com.baidu.platform.comapi.basestruct.GeoPoint,com.baidu.mapapi.map.MapView) -> onTap
 com.usai.apex.BaiduMapFragment$SearchTask -> com.usai.apex.j:
     int errorcode -> a
     com.usai.apex.BaiduMapFragment this$0 -> b
@@ -8328,6 +8329,7 @@ com.usai.util.dbUtil -> com.usai.a.g:
     void CloseCursor(android.database.Cursor) -> a
     android.database.sqlite.SQLiteDatabase OpenDB$47195b57(android.content.Context,boolean) -> a
     java.lang.String get_fields(java.lang.String,java.lang.String) -> a
+    void cleanhistory() -> a
     void savehistory(java.lang.String,java.lang.String) -> b
     java.util.List get_searchhistory(java.lang.String) -> a
     int get_count(android.database.sqlite.SQLiteDatabase,java.lang.String,java.lang.String) -> a

+ 2 - 0
Apex/proguard/seeds.txt

@@ -3240,6 +3240,8 @@ com.usai.apex.R$string: int action_deleteall
 com.usai.apex.R$string: int action_forget_password
 com.usai.apex.R$string: int action_forgot_password
 com.usai.apex.R$string: int action_help
+com.usai.apex.R$string: int action_saved_detail
+com.usai.apex.R$string: int action_search_history
 com.usai.apex.R$string: int action_settings
 com.usai.apex.R$string: int action_sign_in_register
 com.usai.apex.R$string: int action_sign_in_short

+ 1 - 1
Apex/proguard/usage.txt

@@ -3472,7 +3472,7 @@ com.usai.util.Network:
     public static final int RESULT_VER_LOW
     61:61:public Network()
 com.usai.util.SqlOpenHelper:
-    22:22:public int get_RecordCount(java.lang.String)
+    25:25:public int get_RecordCount(java.lang.String)
 com.usai.util.commonUtil:
     14:14:public commonUtil()
 com.usai.util.dbUtil:

+ 0 - 29
Apex/res/raw/about.htm

@@ -1,29 +0,0 @@
-<html>
-<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><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><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.
-<br><b><span lang=EN-US style='color:red'>2010</span></b><br>
-20th Anniversary of Apex Maritime. Opened up Apex United Kingdom. Exceeded 200,000 in the Asia to USA trade lane. EVA Airlines recognized Apex Maritime as the top performing export airfreight forwarder in Northern California.
-<br><b><span lang=EN-US style='color:red'>2008</span></b><br>
-Apex opened up 7 new offices at Guangzhou, Zhongshan, Chongqing, Fuzhou, Zengzhou, Guadalajara and Atlanta. AFS Cargo Express started servicing New Jersey, New York, Connecticut and Pennsylvania.
-<br><b><span lang=EN-US style='color:red'>2007</span></b><br>
-Apex opened up 6 new offices at Xian, Rotterdam, Ningbo, Ho Chi Minh City, Wuhan and Jakarta. ULS expanded its operations by opening up a 60,000 square foot warehouse in City of Industry.
-AFS Cargo Express geographic scope was expanded to include Southern California, Arizona and the Midwest.
-<br><b><span lang=EN-US style='color:red'>2006</span></b><br>
-Apex has opened up 7 offices at Portland, OR, Cirebon, Lianyangang, Yantai, Nanjing, Zhongshan and Malaysia.
-<br><b><span lang=EN-US style='color:red'>2005</span></b><br>
-Apex has opened 4 new offices in Asia:Xiamen, Semarang, Surabaya, and Bangkok.
-<br><b><span lang=EN-US style='color:red'>2004</span></b><br>
-Apex has set up 10 new offices: Hong Kong, Shenzhen, Shanghai, Qingdao, Tianjin, Los Angeles, New York, Chicago, Seattle, and Dalian.
-<br><b><span lang=EN-US style='color:red'>2003</span></b><br>
-APEX Freight System, the perishable division, is established and is top performer (by tonnage) in SFO by China Air, EVA Air, Singapore Air, and Cathay Pacific. United Logistic Solutions is established to provide supply chain management, distribution, light production, warehousing, inventory control, and packaging.
-<br><b><span lang=EN-US style='color:red'>1994</span></b><br>
-AFS and AMC trucking divisions are established to service FCL and LCL customers.
-<br><b><span lang=EN-US style='color:red'>1993</span></b><br>
-Starlink Freight System, Inc. is registered as an air freight forwarder.
-<br><b><span lang=EN-US style='color:red'>1990</span></b><br>
-Apex Maritime Co., Inc. is established as an ocean freight forwarder in SFO, CA.
-</html>

+ 2 - 2
Apex/res/values/strings.xml

@@ -105,8 +105,8 @@
     <string name="title_activity_documents">Documents</string>
     <string name="title_activity_localdocuments">Local documents</string>
     <!-- RELEASE KEY -->
-    <!-- <string name="baidu_key">nqBQoSDbxrslhuzW91uViQX7</string> -->
+    <string name="baidu_key">nqBQoSDbxrslhuzW91uViQX7</string>
     <!-- DEBUG KEY -->
-    <string name="baidu_key">tznWFxd3RvSoul1TGQp6GSzo</string>
+    <!-- <string name="baidu_key">tznWFxd3RvSoul1TGQp6GSzo</string> -->
 
 </resources>

+ 4 - 0
Apex/src/com/usai/apex/AnnouncementActivity.java

@@ -75,6 +75,8 @@ public class AnnouncementActivity extends ListActivity
 		Intent intent = new Intent();
 		intent.putExtra("url", searchresult.getData().get(position).get("url")
 				.toString());
+		intent.putExtra("title", searchresult.getData().get(position).get("title")
+				.toString());
 		intent.setClass(this, WebActivity.class);
 		startActivity(intent);
 	}
@@ -98,6 +100,8 @@ public class AnnouncementActivity extends ListActivity
 		adapter = new AnnouncementAdapter(searchresult, this);
 
 		module_name = getIntent().getStringExtra("module_name");
+
+		setTitle(module_name);
 		view_page_footer = LayoutInflater.from(this).inflate(
 				R.layout.view_page_footer, null);
 		getListView().addFooterView(view_page_footer);// 添加底部视图

+ 2 - 0
Apex/src/com/usai/apex/ApexTrackingApplication.java

@@ -1,6 +1,7 @@
 package com.usai.apex;
 
 import com.usai.util.Crypto;
+import com.usai.util.dbUtil;
 
 import android.app.AlarmManager;
 import android.app.Application;
@@ -55,6 +56,7 @@ public class ApexTrackingApplication extends Application
 				e.printStackTrace();
 			}
 		}
+		dbUtil.cleanhistory();
 
 		// Intent serviceintent = new Intent();
 		// serviceintent.setClass(this, ApexPushService.class);

+ 13 - 7
Apex/src/com/usai/apex/WebActivity.java

@@ -1,18 +1,13 @@
 package com.usai.apex;
 
-
 import android.app.Activity;
 import android.os.Bundle;
+import android.webkit.WebSettings;
 import android.webkit.WebView;
 
-
-
-
 public class WebActivity extends Activity
 {
 
-
-
 	@Override
 	protected void onCreate(Bundle savedInstanceState)
 	{
@@ -20,9 +15,20 @@ public class WebActivity extends Activity
 		// setTitle("Booking Result");
 
 		super.onCreate(savedInstanceState);
+
+		String title = getIntent().getStringExtra("title");
+
+		setTitle(title);
 		setContentView(R.layout.fragment_web);
 		String url = getIntent().getStringExtra("url");
-		WebView wv = (WebView) findViewById(R.id.wv_content); 
+		WebView wv = (WebView) findViewById(R.id.wv_content);
+		
+		
+
+		WebSettings settings=wv.getSettings();
+
+		settings.setTextSize(WebSettings.TextSize.LARGER);
+
 		wv.loadUrl(url);
 
 	}

+ 42 - 33
Apex/src/com/usai/util/SqlOpenHelper.java

@@ -9,19 +9,23 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.database.sqlite.SQLiteOpenHelper;
 import android.util.Log;
 
-public class SqlOpenHelper extends SQLiteOpenHelper{
+public class SqlOpenHelper extends SQLiteOpenHelper
+{
+
+	private ArrayList<String>	initSQL	= new ArrayList<String>();
 
-	private ArrayList<String> initSQL = new ArrayList<String>();
 	public void addInitSQL(String sql)
 	{
 		initSQL.add(sql);
-		
+
 	}
+
 	public int get_RecordCount(String tablename)
 	{
 		return 0;
-		
+
 	}
+
 	public SQLiteDatabase OpenDB(boolean writable)
 	{
 		if (writable)
@@ -29,59 +33,64 @@ public class SqlOpenHelper extends SQLiteOpenHelper{
 		else
 			return getReadableDatabase();
 	}
-	
+
 	private void initDB(SQLiteDatabase db)
 	{
-		for(int i=0;i<initSQL.size();i++)
+		for (int i = 0; i < initSQL.size(); i++)
 		{
 			db.execSQL(initSQL.get(i));
 		}
-	
-		
+
 	}
+
 	public SqlOpenHelper(Context context, String name, CursorFactory factory,
-			int version) {
+			int version)
+	{
 		super(context, name, factory, version);
 		// TODO Auto-generated constructor stub
 	}
 
 	@Override
-	public void onCreate(SQLiteDatabase db) {
+	public void onCreate(SQLiteDatabase db)
+	{
 		// TODO Auto-generated method stub
 		initDB(db);
-		
+
 	}
 
 	@Override
-	public void onOpen(SQLiteDatabase db) {
+	public void onOpen(SQLiteDatabase db)
+	{
 		// TODO Auto-generated method stub
 		super.onOpen(db);
 	}
 
 	@Override
-	public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-		Log.d("DB upgrade", "from "+oldVersion + " to "+newVersion);
-		
-		if(newVersion == 2)
+	public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion)
+	{
+		Log.d("DB upgrade", "from " + oldVersion + " to " + newVersion);
+
+		if (newVersion == 2)
 		{
-		db.execSQL("CREATE TABLE push_message ("
-				+ "_id INTEGER PRIMARY KEY," + "s_id VARCHAR(20),"
-				+ "e_id VARCHAR(20)," + "msgcount INTEGER,"
-				+ "message VARCHAR(20)," + "h_time timestamp,"+ "create_time timestamp,"
-				+ "user VARCHAR(20)," + "read BOOLEAN)");
-		db.execSQL("CREATE TABLE favorites ("
-				+ "_id INTEGER PRIMARY KEY," + "name VARCHAR(20),"
-				+ "action VARCHAR(20)," + "module_name VARCHAR(20),"
-				+ "detail_id VARCHAR(20)," + "action_type VARCHAR(20),"
-				+ "create_time timestamp," + "user VARCHAR(20))");
-		db.execSQL("CREATE TABLE history ("
-				+ "_id INTEGER PRIMARY KEY," + "name VARCHAR(20),"
-				+ "action VARCHAR(20)," + "module_name VARCHAR(20),"
-				+ "criterion VARCHAR(20)," + "create_time timestamp,"
-				+ "user VARCHAR(20))");
-		db.execSQL("ALTER TABLE search_history ADD level INTEGER");
+			db.execSQL("CREATE TABLE push_message ("
+					+ "_id INTEGER PRIMARY KEY," + "s_id VARCHAR(20),"
+					+ "e_id VARCHAR(20)," + "msgcount INTEGER,"
+					+ "message VARCHAR(20)," + "h_time timestamp,"
+					+ "create_time timestamp," + "user VARCHAR(20),"
+					+ "read BOOLEAN)");
+			db.execSQL("CREATE TABLE favorites (" + "_id INTEGER PRIMARY KEY,"
+					+ "name VARCHAR(20)," + "params VARCHAR(20),"
+					+ "action VARCHAR(20)," + "module_name VARCHAR(20),"
+					+ "detail_id VARCHAR(20)," + "action_type VARCHAR(20),"
+					+ "create_time timestamp," + "user VARCHAR(20))");
+			db.execSQL("CREATE TABLE history (" + "_id INTEGER PRIMARY KEY,"
+					+ "name VARCHAR(20)," + "params VARCHAR(20),"
+					+ "action VARCHAR(20)," + "module_name VARCHAR(20),"
+					+ "criterion VARCHAR(20)," + "create_time timestamp,"
+					+ "user VARCHAR(20))");
+			db.execSQL("ALTER TABLE search_history ADD level INTEGER");
 		}
-		
+
 	}
 
 }

+ 18 - 5
Apex/src/com/usai/util/dbUtil.java

@@ -268,25 +268,38 @@ public class dbUtil
 		return ret;
 	}
 
+	public static void cleanhistory()
+	{
+		SQLiteDatabase db = OpenDB(ApexTrackingApplication.get_instance()
+				.getApplicationContext(), null, true);
+		db.execSQL("delete from search_history where julianday('now', 'localtime')-julianday(h_time, 'localtime')>30");
+		CloseDB(db);
+	}
+
 	public static void savehistory(String field, String value)
 	{
-		if(TextUtils.isEmpty(value))
+		if (TextUtils.isEmpty(value))
 			return;
 
 		SQLiteDatabase db = OpenDB(ApexTrackingApplication.get_instance()
 				.getApplicationContext(), null, true);
 		int _id = get_recordid(db, "search_history", "user = '"
-				+ ApexTrackingApplication.get_user() + "' and h_field='" + field
-				+ "' and h_val='" + value + "'");
+				+ ApexTrackingApplication.get_user() + "' and h_field='"
+				+ field + "' and h_val='" + value + "'");
 
 		if (_id >= 0)
 		{
-			String sql = "update search_history set h_time = datetime('now', 'localtime') where _id = "+_id;
+			String sql = "update search_history set h_time = datetime('now', 'localtime') where _id = "
+					+ _id;
 			db.execSQL(sql);
 		}
 		else
 		{
-			String sql = "insert into search_history(user,h_field,h_val) values('"+ApexTrackingApplication.get_user()+"','"+field+"','"+value+"')";
+			String sql = "insert into search_history(user,h_field,h_val) values('"
+					+ ApexTrackingApplication.get_user()
+					+ "','"
+					+ field
+					+ "','" + value + "')";
 			db.execSQL(sql);
 		}
 

Некоторые файлы не были показаны из-за большого количества измененных файлов