Merge remote-tracking branch 'origin/developer' into developer

WeiChat/build.gradle

@@ -8,7 +8,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('E:/CompanyProject/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

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

@@ -290,7 +290,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
         DateTimePicker picker = new DateTimePicker(this, DateTimePicker.YEAR_MONTH_DAY);
         picker.setRange(1900, 2030);
         picker.setSelectedItem(date.getYear() + 1900,
-                date.getMonth()+1,
+                date.getMonth() + 1,
                 date.getDate());
         picker.setOnDateTimePickListener(new DateTimePicker.OnYearMonthDayTimePickListener() {
             @Override
@@ -357,6 +357,10 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             if (resultCode == Activity.RESULT_OK) {
                 if (mNewPhotoUri != null) {
                     mCurrentFile = new File(mNewPhotoUri.getPath());
+                    if (mCurrentFile != null && mCurrentFile.exists()) {
+                        Log.d("wang", "uploadAvatar");
+                        uploadAvatar(mCurrentFile);
+                    }
                     ImageLoader.getInstance().displayImage(mNewPhotoUri.toString(), iv_headImage);
                 } else {
                     ToastUtil.showToast(this, R.string.c_crop_failed);
@@ -489,24 +493,24 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             MyApplication.getInstance().mLoginUser.setAreaId(mTempData.getAreaId());
             UserDao.getInstance().updateAreaId(mTempData.getUserId(), mTempData.getAreaId());
         }
-        if (mCurrentFile != null && mCurrentFile.exists()) {
-            uploadAvatar(mCurrentFile);
-        } else {
-            ProgressDialogUtil.dismiss(mProgressDialog);
-            Crouton crouton = Crouton.makeText(this, "保存成功", 0xff99cc00, 1000);
-            crouton.setLifecycleCallback(new LifecycleCallback() {
-                @Override
-                public void onDisplayed() {
+//        if (mCurrentFile != null && mCurrentFile.exists()) {
+//            uploadAvatar(mCurrentFile);
+//        } else {
+        ProgressDialogUtil.dismiss(mProgressDialog);
+        Crouton crouton = Crouton.makeText(this, "保存成功", 0xff99cc00, 1000);
+        crouton.setLifecycleCallback(new LifecycleCallback() {
+            @Override
+            public void onDisplayed() {
 
-                }
+            }
 
-                @Override
-                public void onRemoved() {
-                    finish();
-                }
-            });
-            crouton.show();
-        }
+            @Override
+            public void onRemoved() {
+                finish();
+            }
+        });
+        crouton.show();
+//        }
 
     }
 
@@ -556,7 +560,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
                     ToastUtil.showToast(BaseInfoActivity.this, R.string.upload_avatar_failed);
                 }
 
-                finish();
+//                finish();
             }
 
             @Override
@@ -633,14 +637,14 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
             return;
         }
 
-        if (mUser != null && !mUser.equals(mTempData)) {// 数据改变了，提交数据
+        if ((mUser != null && !mUser.equals(mTempData)) || (mCurrentFile != null && mCurrentFile.exists())) {// 数据改变了，提交数据
             Log.d("wang", "数据改变了，提交数据");
             updateData();
         }
-        if (mCurrentFile != null && mCurrentFile.exists()) {
+        /*if (mCurrentFile != null && mCurrentFile.exists()) {
             Log.d("wang", "uploadAvatar");
             uploadAvatar(mCurrentFile);
-        }
+        }*/
     }
 
 }