bug fixed

app/src/main/java/com/sheep/gamegroup/module/login/ChangePasswordAct.java

@@ -57,6 +57,7 @@ public class ChangePasswordAct extends BaseActivity implements ChangePasswordCon
     @Override
     public void whenComplete(String newPwd) {
         this.newPwd = newPwd;
+        
         showProgress();
         JSONObject json = new JSONObject();
         json.put("old_password", oldPwd);

app/src/main/java/com/sheep/gamegroup/module/login/fragments/NewPasswordFgt.java

@@ -64,6 +64,7 @@ public class NewPasswordFgt extends BaseFragment {
             //否则隐藏密码
             newpwdBox.setTransformationMethod(PasswordTransformationMethod.getInstance());
         }
+        newpwdBox.setSelection(newpwdBox.getText().toString().length());
     }
 
     @OnClick(R.id.done_btn)
@@ -74,7 +75,7 @@ public class NewPasswordFgt extends BaseFragment {
             return;
         }
         if (!StringUtils.isPassword(password)) {
-            G.shortToast("用户名只能包含英文、数字、_.-@$!*%符号");
+            G.shortToast("密码只能包含英文、数字、_.-@$!*%符号，长度6-16");
             return;
         }
         mController.whenComplete(password);

app/src/main/java/com/sheep/gamegroup/module/login/fragments/OldPasswordFgt.java

@@ -65,6 +65,7 @@ public class OldPasswordFgt extends BaseFragment {
             //否则隐藏密码
             oldpwdBox.setTransformationMethod(PasswordTransformationMethod.getInstance());
         }
+        oldpwdBox.setSelection(oldpwdBox.getText().toString().length());
     }
 
     @OnClick(R.id.next_btn)
@@ -75,7 +76,7 @@ public class OldPasswordFgt extends BaseFragment {
             return;
         }
         if (!StringUtils.isPassword(password)) {
-            G.shortToast("用户名只能包含英文、数字、_.-@$!*%符号");
+            G.shortToast("密码只能包含英文、数字、_.-@$!*%符号，长度6-16");
             return;
         }
         mController.whenNext(password);

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -147,7 +147,7 @@ public class SignInFgt extends AbsLoginFgt {
             return false;
         }
         if (!StringUtils.isPassword(password)) {
-            G.shortToast("用户名只能包含英文、数字、_.-@$!*%符号");
+            G.shortToast("密码只能包含英文、数字、_.-@$!*%符号");
             return false;
         }
         return true;
@@ -376,6 +376,7 @@ public class SignInFgt extends AbsLoginFgt {
             //否则隐藏密码
             passwordBox.setTransformationMethod(PasswordTransformationMethod.getInstance());
         }
+        passwordBox.setSelection(passwordBox.getText().toString().length());
     }
 
 }

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignUpFgt.java

@@ -74,6 +74,7 @@ public class SignUpFgt extends BaseFragment {
             //否则隐藏密码
             passwordBox.setTransformationMethod(PasswordTransformationMethod.getInstance());
         }
+        passwordBox.setSelection(passwordBox.getText().toString().length());
     }
 
     @OnClick(R.id.register_btn)
@@ -122,15 +123,15 @@ public class SignUpFgt extends BaseFragment {
             return false;
         }
         if (TextUtils.isEmpty(password)) {
-            G.shortToast("密码不能为空");
+            G.shortToast("请输入密码");
             return false;
         }
         if (!StringUtils.isUserName(username)) {
-            G.shortToast("用户名只能包含英文、数字、._-@符号");
+            G.shortToast("用户名只能包含英文、数字、._-@符号，长度4-20");
             return false;
         }
         if (!StringUtils.isPassword(password)) {
-            G.shortToast("用户名只能包含英文、数字、_.-@$!*%符号，长度6-16");
+            G.shortToast("密码只能包含英文、数字、_.-@$!*%符号，长度6-16");
             return false;
         }
         return true;

app/src/main/java/com/sheep/gamegroup/util/StringUtils.java

@@ -274,7 +274,7 @@ public class StringUtils {
     }
 
     public static boolean isUserName(String name){
-        Pattern p = Pattern.compile("^[a-zA-Z0-9_.-@]{6,50}$");
+        Pattern p = Pattern.compile("^[a-zA-Z0-9_.-@]{4,20}$");
         Matcher m = p.matcher(name);
         return m.matches();
     }

app/src/main/res/layout/fragment_sign_in.xml

@@ -25,7 +25,7 @@
         <EditText
             android:id="@+id/user_name_box"
             style="@style/login_edit_style"
-            android:hint="输入用户名/手机号/绵羊号"
+            android:hint="请输入用户名/手机号"
             android:paddingLeft="@dimen/content_padding_5" />
 
         <View
@@ -36,7 +36,7 @@
             android:id="@+id/password_box"
             style="@style/login_edit_style"
             android:layout_below="@+id/user_name_box"
-            android:hint="输入密码(6-16位)"
+            android:hint="请输入密码(6-16位)"
             android:inputType="textPassword"
             android:maxLength="16"
             android:paddingLeft="@dimen/content_padding_5" />
@@ -66,7 +66,7 @@
         <EditText
             android:id="@+id/phone_number_box"
             style="@style/login_edit_style"
-            android:hint="输入手机号"
+            android:hint="请输入手机号"
             android:inputType="phone"
             android:maxLength="11" />