Ray Zhang 12 yıl önce
ebeveyn
işleme
dcd63a9013

+ 3 - 2
Apex/AndroidManifest.xml

@@ -6,8 +6,9 @@
 
     <!-- Copied from Google Maps Library/AndroidManifest.xml. -->
     <uses-sdk
-        android:minSdkVersion="17"
-        android:targetSdkVersion="17" />
+        android:minSdkVersion="14"
+        android:targetSdkVersion="17"
+        android:maxSdkVersion="19" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />

+ 1 - 1
Apex/project.properties

@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-19
+target=android-14

BIN
Apex/res/drawable-hdpi/ic_cargo_tracking.png


BIN
Apex/res/drawable-hdpi/ic_container_detail.png


BIN
Apex/res/drawable-hdpi/ic_down_doc.png


BIN
Apex/res/drawable-hdpi/ic_exit.png


BIN
Apex/res/drawable-hdpi/ic_ocean_blinfo.png


BIN
Apex/res/drawable-hdpi/ic_oceanbooking.png


BIN
Apex/res/drawable-hdpi/ic_password.png


BIN
Apex/res/drawable-mdpi/ic_cargo_tracking.png


BIN
Apex/res/drawable-mdpi/ic_container_detail.png


BIN
Apex/res/drawable-mdpi/ic_down_doc.png


BIN
Apex/res/drawable-mdpi/ic_exit.png


BIN
Apex/res/drawable-mdpi/ic_ocean_blinfo.png


BIN
Apex/res/drawable-mdpi/ic_oceanbooking.png


BIN
Apex/res/drawable-mdpi/ic_password.png


+ 4 - 2
Apex/res/layout/activity_function_select.xml

@@ -2,12 +2,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+   
     tools:context=".FunctionSelectActivity" >
 
     <TableLayout
-        android:layout_width="fill_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
+       
+        android:layout_centerHorizontal="true"
         android:layout_alignParentTop="true" >
 
         <TableRow

+ 6 - 3
Apex/src/com/usai/apex/ApexActivity.java

@@ -3,9 +3,11 @@ package com.usai.apex;
 //import com.google.android.gms.maps.SupportMapFragment;
 
 import android.os.Bundle;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
+//import android.app.Fragment;
+//import android.app.FragmentTransaction;
+import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
+import android.support.v4.app.FragmentTransaction;
 import android.view.Menu;
 import android.widget.TabHost;
 
@@ -47,7 +49,8 @@ public class ApexActivity extends FragmentActivity /*implements OnTabChangeListe
 	    Fragment slFragment=  new ServiceLocationFragment();
 	    // Add the fragment to the activity, pushing this transaction
 	    // on to the back stack.
-	    FragmentTransaction ft = getFragmentManager().beginTransaction();
+	    
+	    FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
 	    ft.replace(R.id.tab1, loginFragment);
 	    ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
 	    ft.addToBackStack("Login");

+ 2 - 1
Apex/src/com/usai/apex/DirectTrackingFragment.java

@@ -1,7 +1,8 @@
 package com.usai.apex;
 
 import android.os.Bundle;
-import android.app.Fragment;
+import android.support.v4.app.Fragment;
+//import android.app.Fragment;
 //import android.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;

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

@@ -95,8 +95,13 @@ public class FunctionSelectActivity extends FragmentActivity implements OnClickL
 			
 			break;
 		case R.id.ibtn_exit:
+		{
+			finish();  
+            System.exit(0);  
+            break;
+		}
+			
 			
-			break;
 
 		default:
 			break;

+ 2 - 1
Apex/src/com/usai/apex/LoginFragment.java

@@ -11,13 +11,14 @@ import com.usai.util.Network;
 import android.R.integer;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.app.Fragment;
+//import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Build;
 //import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Gravity;

+ 27 - 2
Apex/src/com/usai/apex/ResultActivity.java

@@ -26,6 +26,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
+import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -196,6 +197,8 @@ public class ResultActivity extends Activity
 				if (ret >= 0)
 				{
 					searchresult.put_totalcount(ret);
+					if(ret==0)
+						return true;
 				}
 				else
 				{
@@ -221,11 +224,15 @@ public class ResultActivity extends Activity
 				if (searchresult.get_fieldscount() == 0)
 				{
 					JSONObject objfields = jsobj.getJSONObject("fields");
-					searchresult.init_fields(objfields.toString());
+					if(objfields!=null)
+						searchresult.init_fields(objfields.toString());
 				}
 				JSONObject objrecords = jsobj.getJSONObject("records");
-				searchresult.add_records(objrecords.toString());
+				if(objrecords!=null)
+					searchresult.add_records(objrecords.toString());
 				errorcode = Network.RESULT_TRUE;
+				
+				
 				return true;
 
 			}
@@ -285,6 +292,24 @@ public class ResultActivity extends Activity
 
 				TextView tv_head = (TextView) findViewById(R.id.tv_head);
 				tv_head.setText(searchresult.get_totalcount()+"");
+//				// fill fake data
+//				for(int i=0;i<10;i++)
+//				{
+//					TableRow recordRow = new TableRow(ResultActivity.this);
+//					for(int j=0;j<showfieldmap.size();j++)
+//					{
+//						TextView field = new TextView(ResultActivity.this);
+//						field.setText("fake data");
+//						field.setGravity(Gravity.CENTER);
+//						field.setTextAppearance(ResultActivity.this,android.R.attr.textAppearanceMedium);
+//						recordRow.addView(field);
+//					}
+//					TableLayout tl=(TableLayout)findViewById(R.id.result_table);
+//					tl.addView(recordRow);
+//						
+//				}
+				
+				
 				// SharedPreferences.Editor editor = RunOnce.edit();
 				// editor.putBoolean("FirstRun"+globalUtil.getVerName(this),
 				// false);

+ 7 - 5
Apex/src/com/usai/apex/ServiceLocationFragment.java

@@ -13,8 +13,8 @@ import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.MarkerOptions;
 
-import android.app.Fragment;
-import android.app.FragmentManager;
+//import android.app.Fragment;
+//import android.app.FragmentManager;
 //import android.app.FragmentManager;
 //import android.app.Fragment;
 //import android.app.FragmentManager;
@@ -22,6 +22,8 @@ import android.app.FragmentManager;
 import android.os.Bundle;
 
 
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 //import android.support.v4.app.FragmentManager;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -30,7 +32,7 @@ import android.view.ViewGroup;
 public class ServiceLocationFragment extends Fragment
 {
 	
-	private MapFragment fragment;
+	private SupportMapFragment fragment;
 	private GoogleMap map;
 //	
 	@Override
@@ -42,9 +44,9 @@ public class ServiceLocationFragment extends Fragment
 	public void onActivityCreated(Bundle savedInstanceState) {
 		super.onActivityCreated(savedInstanceState);
 		FragmentManager fm = getChildFragmentManager();
-		fragment = (MapFragment) fm.findFragmentById(R.id.map);
+		fragment = (SupportMapFragment) fm.findFragmentById(R.id.map);
 		if (fragment == null) {
-			fragment = new MapFragment();//.newInstance();
+			fragment = new SupportMapFragment();//.newInstance();
 			fm.beginTransaction().replace(R.id.map, fragment).commit();
 		}
 	}