Ray Zhang há 12 anos atrás
pai
commit
54d6f7c506

+ 1 - 1
Apex/AndroidManifest.xml

@@ -94,7 +94,7 @@
         <activity
             android:name="com.usai.apex.ResultActivity"
             android:label="@string/title_activity_result"
-            android:screenOrientation="portrait" >
+            >
         </activity>
         <activity
             android:name="com.usai.apex.LocationDetailActivity"

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

@@ -106,7 +106,7 @@
         android:visibility="invisible">
 
         <TextView
-            android:id="@+id/textView1"
+            android:id="@+id/tv_ver"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"

+ 1 - 1
Apex/res/layout/detail_fragment.xml

@@ -38,7 +38,7 @@
                 android:visibility="gone" >
 
                 <TextView
-                    android:id="@+id/textView1"
+                    android:id="@+id/tv_ver"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"

+ 8 - 0
Apex/res/layout/fragment_login.xml

@@ -89,4 +89,12 @@
         </RelativeLayout>
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/tv_ver"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:text="TextView" />
+
 </RelativeLayout>

+ 15 - 1
Apex/src/com/usai/apex/ChangePasswordActivity.java

@@ -89,9 +89,23 @@ public class ChangePasswordActivity extends Activity {
 				new View.OnClickListener() {
 					@Override
 					public void onClick(View view) {
+						InputMethodManager inputMethodManager = (InputMethodManager)getApplicationContext().getSystemService(
+								Context.INPUT_METHOD_SERVICE);
+
+				// EditText editText =
+				// (EditText)findViewById(R.id.xxxx);
+				inputMethodManager.hideSoftInputFromWindow(
+						mNew1passView.getWindowToken(), 0); // ����
 						changepassword();
 					}
 				});
+		findViewById(R.id.btn_close).setOnClickListener(
+				new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						finish();
+					}
+				});
 	}
 
 	// @Override
@@ -285,7 +299,7 @@ public class ChangePasswordActivity extends Activity {
 
 				case Network.RESULT_FALSE: {
 					AlertDialog.Builder builder = new Builder(ChangePasswordActivity.this);
-					builder.setMessage("Invalid user name or password.");
+					builder.setMessage("Invalid password.");
 
 					builder.setTitle("Change failed");
 

+ 9 - 0
Apex/src/com/usai/apex/LoginFragment.java

@@ -11,6 +11,7 @@ import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.AsyncTask;
 import android.os.Build;
 //import android.content.SharedPreferences;
@@ -54,6 +55,14 @@ public class LoginFragment extends Fragment/* implements OnClickListener */
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			Bundle savedInstanceState) {
 		View view = inflater.inflate(R.layout.fragment_login, null);
+		TextView tv_ver = (TextView) view.findViewById(R.id.tv_ver);
+		try {
+			tv_ver.setText("ver:"+ApexTrackingApplication.get_instance().getPackageManager().getPackageInfo(
+						"com.usai.apex", 0).versionName);
+		} catch (NameNotFoundException e1) {
+			// TODO Auto-generated catch block
+			e1.printStackTrace();
+		}
 		// Button btn = (Button) view.findViewById(R.id.sign_in_button);
 		// btn.setOnClickListener(this);
 

+ 7 - 0
Apex/src/com/usai/apex/RetrievePasswordActivity.java

@@ -92,6 +92,13 @@ public class RetrievePasswordActivity extends Activity {
 				new View.OnClickListener() {
 					@Override
 					public void onClick(View view) {
+						InputMethodManager inputMethodManager = (InputMethodManager)getApplicationContext().getSystemService(
+								Context.INPUT_METHOD_SERVICE);
+
+				// EditText editText =
+				// (EditText)findViewById(R.id.xxxx);
+				inputMethodManager.hideSoftInputFromWindow(
+						mEmailView.getWindowToken(), 0); // ����
 						retrivev();
 					}
 				});

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
Apex/src/com/usai/apex/ServiceLocationFragment.java


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff