Ray Zhang 12 роки тому
батько
коміт
02dc09e7e6

+ 1 - 1
Apex/AndroidManifest.xml

@@ -108,7 +108,7 @@
             android:label="@string/title_activity_help"
             android:screenOrientation="portrait"
             android:theme="@android:style/Theme.Holo.NoActionBar" >
-        </activity>
+        </activity> 
         <activity
             android:name="com.usai.apex.CargoTrackingActivity"
             android:label="@string/title_activity_cargo_tracking" >

+ 28 - 28
Apex/res/layout/activity_result.xml

@@ -4,34 +4,7 @@
     android:layout_height="match_parent"
     tools:context=".ResultActivity" >
 
-    <RelativeLayout
-        android:id="@+id/status"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_centerInParent="true"
-        android:layout_gravity="center"
-        
-        android:orientation="vertical"
-        android:visibility="gone" >
-
-        <TextView
-            android:id="@+id/status_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/progressbar"
-            android:layout_centerHorizontal="true"
-            android:layout_marginBottom="16dp"
-            android:text="Loading..."
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-
-        <ProgressBar
-            android:id="@+id/progressbar"
-            style="?android:attr/progressBarStyleLarge"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_marginTop="41dp" />
-    </RelativeLayout>
+    
 
     <ScrollView
         android:id="@+id/scrollView1"
@@ -60,7 +33,34 @@
             </TableLayout>
         </HorizontalScrollView>
     </ScrollView>
+<RelativeLayout
+        android:id="@+id/status"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_centerInParent="true"
+        android:layout_gravity="center"
+        
+        android:orientation="vertical"
+        android:visibility="gone" >
+
+        <TextView
+            android:id="@+id/status_message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/progressbar"
+            android:layout_centerHorizontal="true"
+            android:layout_marginBottom="16dp"
+            android:text="Loading..."
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
+        <ProgressBar
+            android:id="@+id/progressbar"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginTop="41dp" />
+    </RelativeLayout>
     <LinearLayout
         android:id="@+id/foot"
         android:layout_width="fill_parent"

+ 18 - 1
Apex/src/com/usai/apex/ResultActivity.java

@@ -173,10 +173,27 @@ public class ResultActivity extends Activity {
 			e.printStackTrace();
 		}
 		initTableHeader();
+		if(savedInstanceState!=null)
+		{
+			searchresult=(SearchResult) savedInstanceState.getSerializable("searchresult");
+			if(searchresult.get_totalcount()==-1)
+				requestdata(true);
+			else
+				initTable();
+		}
+		else
 		requestdata(true);
 
 	}
 
+	@Override
+	protected void onDestroy()
+	{
+		if(m_task!=null)
+			m_task.cancel(false);
+		super.onDestroy();
+	}
+
 	private void initTable()
 	{
 		// int loadcount = searchresult.get_count();
@@ -661,7 +678,7 @@ public class ResultActivity extends Activity {
 	@Override
 	protected void onSaveInstanceState(Bundle outState)
 	{
-		// TODO Auto-generated method stub
+		outState.putSerializable("searchresult", searchresult);
 		super.onSaveInstanceState(outState);
 	}
 

+ 6 - 1
Apex/src/com/usai/apex/SearchResult.java

@@ -1,5 +1,6 @@
 package com.usai.apex;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -9,8 +10,12 @@ import org.json.JSONObject;
 
 import android.util.Log;
 
-public class SearchResult
+public class SearchResult implements Serializable
 {
+	/**
+	 * 
+	 */
+	private static final long	serialVersionUID	= 8847830656864696392L;
 	int total_count = -1;
 	// int direction = 1;
 	int offset = 0;