Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/BaseInfoActivity.java

@@ -1,10 +1,8 @@
 package com.xzjmyk.pm.activity.ui.erp.activity;
 
 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -289,20 +287,6 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
     @SuppressWarnings("deprecation")
     private void showSelectBirthdayDialog() {
         Date date = new Date(mTempData.getBirthday() * 1000);
-        /*DatePickerDialog dialog = new DatePickerDialog(this, new DatePickerDialog.OnDateSetListener() {
-            @Override
-            public void onDateSet(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
-                GregorianCalendar calendar = new GregorianCalendar(year, monthOfYear, dayOfMonth);
-                mTempData.setBirthday(TimeUtils.getSpecialBeginTime(tv_birthday, calendar.getTime().getTime() / 1000));
-                long currentTime = System.currentTimeMillis() / 1000;
-                long birthdayTime = calendar.getTime().getTime() / 1000;
-                if (birthdayTime > currentTime) {
-                    ToastUtil.showToast(mContext, "亲!您的出生日期已经超过现在了哦!");
-                }
-            }
-        }, date.getYear() + 1900, date.getMonth(), date.getDate());
-        dialog.show();
-*/
         DateTimePicker picker = new DateTimePicker(this, DateTimePicker.YEAR_MONTH_DAY);
         picker.setRange(1900, 2030);
         picker.setSelectedItem(date.getYear() + 1900,
@@ -618,7 +602,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
 
 
     private void showBackDialog() {
-        AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title).setMessage("个人资料发生改变，是否保存当前内容？")
+        /*AlertDialog.Builder builder = new AlertDialog.Builder(this).setTitle(R.string.prompt_title).setMessage("个人资料发生改变，是否保存当前内容？")
                 .setNegativeButton(getString(R.string.no), new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
@@ -628,33 +612,35 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
 
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        if (!MyApplication.getInstance().isNetworkActive()) {
-                            ToastUtil.showToast(BaseInfoActivity.this, "网络异常，更新失败");
-                            return;
-                        }
-                        loadPageData();
-                        if (TextUtils.isEmpty(mTempData.getNickName())) {
-                            tv_nickname.requestFocus();
-                            tv_nickname.setError(StringUtils.editTextHtmlErrorTip(BaseInfoActivity.this, R.string.name_empty_error));
-                            return;
-                        }
-
-                        if (mTempData.getCityId() <= 0) {
-                            ToastUtil.showToast(mContext, R.string.live_address_empty_error);
-                            return;
-                        }
-
-                        if (mUser != null && !mUser.equals(mTempData)) {// 数据改变了，提交数据
-                            Log.d("wang", "数据改变了，提交数据");
-                            updateData();
-                        }
-                        if (mCurrentFile != null && mCurrentFile.exists()) {
-                            Log.d("wang", "uploadAvatar");
-                            uploadAvatar(mCurrentFile);
-                        }
+
                     }
                 });
-        builder.create().show();
+        builder.create().show();*/
+
+        if (!MyApplication.getInstance().isNetworkActive()) {
+            ToastUtil.showToast(BaseInfoActivity.this, "网络异常，更新失败");
+            return;
+        }
+        loadPageData();
+        if (TextUtils.isEmpty(mTempData.getNickName())) {
+            tv_nickname.requestFocus();
+            tv_nickname.setError(StringUtils.editTextHtmlErrorTip(BaseInfoActivity.this, R.string.name_empty_error));
+            return;
+        }
+
+        if (mTempData.getCityId() <= 0) {
+            ToastUtil.showToast(mContext, R.string.live_address_empty_error);
+            return;
+        }
+
+        if (mUser != null && !mUser.equals(mTempData)) {// 数据改变了，提交数据
+            Log.d("wang", "数据改变了，提交数据");
+            updateData();
+        }
+        if (mCurrentFile != null && mCurrentFile.exists()) {
+            Log.d("wang", "uploadAvatar");
+            uploadAvatar(mCurrentFile);
+        }
     }
 
 }