bug fixed

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

@@ -34,20 +34,23 @@ public class ReLoginNameAct extends BaseActivity {
 
     @Override
     public void initView() {
-        TitleBarUtils.getInstance().setShowOrHide(this, true);
+        TitleBarUtils.getInstance()
+                .setShowOrHide(this, true)
+                .setTitleFinish(this)
+                .setTitle(this, "修改用户名");
         String name = getIntent().getStringExtra("name");
-        if(!TextUtils.isEmpty(name)){
+        if (!TextUtils.isEmpty(name)) {
             loginNameBox.setText(name);
         }
     }
 
     @OnClick(R.id.submit_btn)
-    public void doSubmit(View v){
-        if(TextUtils.isEmpty(loginNameBox.getText().toString().trim())){
+    public void doSubmit(View v) {
+        if (TextUtils.isEmpty(loginNameBox.getText().toString().trim())) {
             G.shortToast("请填写新的登录名");
             return;
         }
-        if(!StringUtils.isUserName(loginNameBox.getText().toString().trim())){
+        if (!StringUtils.isUserName(loginNameBox.getText().toString().trim())) {
             G.shortToast("用户名格式有误");
             return;
         }
@@ -57,7 +60,7 @@ public class ReLoginNameAct extends BaseActivity {
         SheepApp.getInstance().getNetComponent().getApiService().changeBaseInfo(json)
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()){
+                .subscribe(new SheepSubscriber<BaseMessage>(SheepApp.getInstance()) {
 
                     @Override
                     public void onNext(BaseMessage baseMessage) {

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

@@ -123,7 +123,6 @@ public class SignInFgt extends AbsLoginFgt {
 
     @OnClick(R.id.login_btn)
     public void doLogin(View v) {
-        showProgress();
         if (loginTypeToggle.isSelected()) {
             phoneLogin();
         } else {
@@ -143,11 +142,11 @@ public class SignInFgt extends AbsLoginFgt {
             return false;
         }
         if (!StringUtils.isUserName(username)) {
-            G.shortToast("用户名只能包含英文、数字、._-@符号");
+            G.shortToast("用户名只能包含英文、数字、._-@符号，长度4-20");
             return false;
         }
         if (!StringUtils.isPassword(password)) {
-            G.shortToast("密码只能包含英文、数字、_.-@$!*%符号");
+            G.shortToast("密码只能包含英文、数字、_.-@$!*%符号，长度6-16");
             return false;
         }
         return true;
@@ -155,6 +154,7 @@ public class SignInFgt extends AbsLoginFgt {
 
     private void accountLogin() {
         if (!validateAccountPwd()) return;
+        showProgress();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("user_name", userNameBox.getText().toString().trim());
         jsonObject.put("password", passwordBox.getText().toString().trim());
@@ -206,6 +206,7 @@ public class SignInFgt extends AbsLoginFgt {
 
     private void phoneLogin() {
         if (!validatePhoneCaptcha()) return;
+        showProgress();
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("account", phoneNumberBox.getText().toString().trim());
         jsonObject.put("sec_code", captchaBox.getText().toString().trim());

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

@@ -26,6 +26,7 @@
             android:id="@+id/user_name_box"
             style="@style/login_edit_style"
             android:hint="请输入用户名/手机号"
+            android:maxLength="20"
             android:paddingLeft="@dimen/content_padding_5" />
 
         <View

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

@@ -14,6 +14,7 @@
         <EditText
             android:id="@+id/user_name_box"
             style="@style/login_edit_style"
+            android:maxLength="20"
             android:hint="输入用户名(如邮箱地址、常用英文等唯一标识)" />
 
         <View style="@style/login_separetor_line_style" />