修改密码提示语

app/src/main/java/com/dayu/bigfish/ui/MainActivity.java

@@ -113,8 +113,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
         mFragmentManger = getSupportFragmentManager();
         mFragmentManger = getSupportFragmentManager();
         FragmentTransaction transaction = mFragmentManger.beginTransaction()
         FragmentTransaction transaction = mFragmentManger.beginTransaction()
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
                 .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN);
-        for (int i = 0; i < mFragments.length; i++) {
-            Fragment fragment = mFragments[i];
+        for (Fragment fragment : mFragments) {
             transaction.add(R.id.fl_container, fragment);
             transaction.add(R.id.fl_container, fragment);
             transaction.hide(fragment);
             transaction.hide(fragment);
         }
         }
@@ -145,8 +144,8 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
      * @param position
      * @param position
      */
      */
     public void resetSelected(int position) {
     public void resetSelected(int position) {
-        for (int i = 0; i < mTabs.length; i++) {
-            mTabs[i].setSelected(false);
+        for (TextView mTab : mTabs) {
+            mTab.setSelected(false);
         }
         }
         mTabs[position].setSelected(true);
         mTabs[position].setSelected(true);
         mPosition = position;
         mPosition = position;

build.gradle

@@ -5,8 +5,8 @@ buildscript {
     ext.build_tools_version = "27.0.2"
     ext.build_tools_version = "27.0.2"
     ext.min_sdk_version = 16
     ext.min_sdk_version = 16
     ext.target_sdk_version = 23
     ext.target_sdk_version = 23
-    ext.version_code = 13
-    ext.verson_name = "1.9.0"
+    ext.version_code = 14
+    ext.verson_name = "1.9.1"
     ext.gradle_version = '3.0.1'
     ext.gradle_version = '3.0.1'
     ext.isReleaseMinify = true
     ext.isReleaseMinify = true
     ext.isDebugMinify = true
     ext.isDebugMinify = true

provider/src/main/java/com/dayu/provider/event/CertificationEvent.java

 package com.dayu.provider.event;
 package com.dayu.provider.event;
 
 
 /**
 /**
- * 刷新待预约列表.
+ * 人脸认证后刷新我的页面的数据.
  * on 2017/10/11.
  * on 2017/10/11.
  */
  */
 public class CertificationEvent {
 public class CertificationEvent {

userCenter/src/main/java/com/dayu/usercenter/presenter/modifypwd/ModifyPwdPresenter.java

@@ -11,8 +11,6 @@ import com.dayu.utils.ToastUtils;
 import com.dayu.utils.UserManager;
 import com.dayu.utils.UserManager;
 import com.dayu.utils.UtilsUserAccountMatcher;
 import com.dayu.utils.UtilsUserAccountMatcher;
 
 
-import io.reactivex.functions.Consumer;
-
 /**
 /**
  * Created by luofan
  * Created by luofan
  * on 2017/11/8.
  * on 2017/11/8.
@@ -47,11 +45,8 @@ public class ModifyPwdPresenter extends ModifyPwdContract.Presenter {
             return;
             return;
         }
         }
         mView.showDialog();
         mView.showDialog();
-        UserApiFactory.modifyPwd(mAccountId, MD5Util.encrypt(oldCode.get()), MD5Util.encrypt(newCode.get()), MD5Util.encrypt(againCode.get())).subscribe(baseObserver(new Consumer<String>() {
-            @Override
-            public void accept(String s) throws Exception {
-                mView.dumpToLogin(mPhone);
-            }
-        }));
+        UserApiFactory.modifyPwd(mAccountId, MD5Util.encrypt(oldCode.get()), MD5Util.encrypt(newCode.get())
+                , MD5Util.encrypt(againCode.get()))
+                .subscribe(baseObserver(s -> mView.dumpToLogin(mPhone)));
     }
     }
 }
 }

userCenter/src/main/res/layout/activity_modify_pwd_layout.xml

@@ -81,7 +81,7 @@
                 android:layout_height="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="55dp"
                 android:layout_marginLeft="55dp"
                 android:background="@null"
                 android:background="@null"
-                android:hint="@string/input_old_pwd"
+                android:hint="@string/pwd_tip"
                 android:inputType="textPassword"
                 android:inputType="textPassword"
                 android:text="@={presenter.oldCode}"
                 android:text="@={presenter.oldCode}"
                 android:textColor="@color/default_text_color"
                 android:textColor="@color/default_text_color"
@@ -110,7 +110,7 @@
                 android:layout_height="match_parent"
                 android:layout_height="match_parent"
                 android:layout_marginLeft="55dp"
                 android:layout_marginLeft="55dp"
                 android:background="@null"
                 android:background="@null"
-                android:hint="@string/input_new_pwd"
+                android:hint="@string/pwd_tip"
                 android:inputType="textPassword"
                 android:inputType="textPassword"
                 android:text="@={presenter.newCode}"
                 android:text="@={presenter.newCode}"
                 android:textColor="@color/default_text_color"
                 android:textColor="@color/default_text_color"
@@ -139,7 +139,7 @@
                 android:layout_marginLeft="40dp"
                 android:layout_marginLeft="40dp"
                 android:background="@null"
                 android:background="@null"
                 android:inputType="textPassword"
                 android:inputType="textPassword"
-                android:hint="@string/input_new_pwd_again"
+                android:hint="@string/pwd_tip"
                 android:text="@={presenter.againCode}"
                 android:text="@={presenter.againCode}"
                 android:textColor="@color/default_text_color"
                 android:textColor="@color/default_text_color"
                 android:textSize="15sp" />
                 android:textSize="15sp" />