Merge branch 'master' of http://git.quyaqu.com/xieshengqi/MoneyMoreMoreNote

app/src/main/java/com/kuxuan/moneynote/receiver/AlarmReceiver.java

@@ -22,9 +22,9 @@ public  class AlarmReceiver extends BroadcastReceiver {
 
             Log.e(TAG,"闹钟已响");
             NotificationCompat.Builder builder = new NotificationCompat.Builder(context);
-            builder.setSmallIcon(R.mipmap.ic_launcher);
-            builder.setContentTitle("测试");
-            builder.setContentText("测试");
+            builder.setSmallIcon(R.mipmap.app_icon);
+            builder.setContentTitle("钱多多记账");
+            builder.setContentText("记账时间到了，赶快去记账吧");
             builder.setAutoCancel(true);
             builder.setOnlyAlertOnce(true);
             // 需要VIBRATE权限

app/src/main/java/com/kuxuan/moneynote/ui/activitys/UpdatePassword/UpdateActivity.java

@@ -214,7 +214,8 @@ public class UpdateActivity extends BaseActivity {
             R.id.activity_register_three_againpwd_delete_img,
             R.id.activity_register_three_againpwd_lookimg,
             R.id.activity_register_three_complete_btn,
-            R.id.activity_update_new_password_lookimg})
+            R.id.activity_update_new_password_lookimg,
+            R.id.activity_update_three_new_password_delete_img})
     public void onViewClicked(View view) {
         switch (view.getId()) {
             case R.id.activity_register_three_pwd_lookimg:
@@ -302,7 +303,7 @@ public class UpdateActivity extends BaseActivity {
             ToastUtil.show(this, getResources().getString(R.string.no_pwd));
             return;
         }
-        if (mNewPwd.length() < 6) {
+        if (pwd.length() < 6) {
             ToastUtil.show(this, getResources().getString(R.string.register_three_pwd_error1));
             return;
         }