Ray Zhang преди 12 години
родител
ревизия
78cee01ebe

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

@@ -52,11 +52,13 @@
             android:id="@+id/tableRow1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" >
+
             <ImageButton
                 android:id="@+id/ibtn_location"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/ic_test" />
+
             <ImageButton
                 android:id="@+id/ibtn_exit"
                 android:src="@drawable/ic_exit" />

+ 2 - 5
Apex/res/layout/activity_inner_map.xml

@@ -2,14 +2,11 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
+
     tools:context=".InnerMapActivity" >
 
             <FrameLayout
-                android:id="@+id/map"
+                android:id="@+id/inner_map"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent" >
             </FrameLayout>

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

@@ -37,6 +37,8 @@ public class FunctionSelectActivity extends FragmentActivity implements OnClickL
 		ibtn_password.setOnClickListener(this);
 		ImageButton ibtn_exit = (ImageButton)findViewById(R.id.ibtn_exit);
 		ibtn_exit.setOnClickListener(this);
+		ImageButton ibtn_loc = (ImageButton)findViewById(R.id.ibtn_location);
+		ibtn_loc.setOnClickListener(this);
 	}
 
 	@Override

+ 1 - 1
Apex/src/com/usai/apex/InnerMapActivity.java

@@ -16,7 +16,7 @@ public class InnerMapActivity extends FragmentActivity
 //		setUpMapIfNeeded();
 	    Fragment slFragment=  new ServiceLocationFragment();
 	    FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
-	    ft.replace(R.id.map, slFragment);
+	    ft.replace(R.id.inner_map, slFragment);
 	    ft.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
 	    ft.addToBackStack("Location");
 	    ft.commit();