|
@@ -52,8 +52,6 @@ import com.xzjmyk.pm.activity.util.ProgressDialogUtil;
|
|
|
import com.xzjmyk.pm.activity.util.StringUtils;
|
|
import com.xzjmyk.pm.activity.util.StringUtils;
|
|
|
import com.xzjmyk.pm.activity.util.TimeUtils;
|
|
import com.xzjmyk.pm.activity.util.TimeUtils;
|
|
|
import com.xzjmyk.pm.activity.util.ToastUtil;
|
|
import com.xzjmyk.pm.activity.util.ToastUtil;
|
|
|
-import com.xzjmyk.pm.activity.view.crouton.Crouton;
|
|
|
|
|
-import com.xzjmyk.pm.activity.view.crouton.LifecycleCallback;
|
|
|
|
|
import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
|
|
import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
|
|
|
import com.xzjmyk.pm.activity.volley.ObjectResult;
|
|
import com.xzjmyk.pm.activity.volley.ObjectResult;
|
|
|
import com.xzjmyk.pm.activity.volley.Result;
|
|
import com.xzjmyk.pm.activity.volley.Result;
|
|
@@ -297,11 +295,14 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
|
|
|
public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
|
|
public void onDateTimePicked(String year, String month, String day, String hour, String minute) {
|
|
|
Log.i(TAG, "onDateTimePicked:" + year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00");
|
|
Log.i(TAG, "onDateTimePicked:" + year + "-" + month + "-" + day + " " + hour + ":" + minute + ":00");
|
|
|
GregorianCalendar calendar = new GregorianCalendar(Integer.parseInt(year), Integer.parseInt(month) - 1, Integer.parseInt(day));
|
|
GregorianCalendar calendar = new GregorianCalendar(Integer.parseInt(year), Integer.parseInt(month) - 1, Integer.parseInt(day));
|
|
|
- mTempData.setBirthday(TimeUtils.getSpecialBeginTime(tv_birthday, calendar.getTime().getTime() / 1000));
|
|
|
|
|
|
|
+
|
|
|
long currentTime = System.currentTimeMillis() / 1000;
|
|
long currentTime = System.currentTimeMillis() / 1000;
|
|
|
long birthdayTime = calendar.getTime().getTime() / 1000;
|
|
long birthdayTime = calendar.getTime().getTime() / 1000;
|
|
|
if (birthdayTime > currentTime) {
|
|
if (birthdayTime > currentTime) {
|
|
|
ToastUtil.showToast(mContext, "亲!您的出生日期已经超过现在了哦!");
|
|
ToastUtil.showToast(mContext, "亲!您的出生日期已经超过现在了哦!");
|
|
|
|
|
+ }else{
|
|
|
|
|
+ mTempData.setBirthday(TimeUtils.getSpecialBeginTime(tv_birthday, calendar.getTime().getTime() / 1000));
|
|
|
|
|
+ updateData();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
@@ -379,12 +380,15 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
|
|
|
mTempData.setProvinceId(provinceId);
|
|
mTempData.setProvinceId(provinceId);
|
|
|
mTempData.setCityId(cityId);
|
|
mTempData.setCityId(cityId);
|
|
|
mTempData.setAreaId(countyId);
|
|
mTempData.setAreaId(countyId);
|
|
|
|
|
+
|
|
|
|
|
+ updateData();//更新数据
|
|
|
}
|
|
}
|
|
|
} else if (requestCode == UPDATE_NICKNAME && data != null) {
|
|
} else if (requestCode == UPDATE_NICKNAME && data != null) {
|
|
|
mNickname = data.getStringExtra("newnickname");
|
|
mNickname = data.getStringExtra("newnickname");
|
|
|
if (mNickname != null) {
|
|
if (mNickname != null) {
|
|
|
tv_nickname.setText(mNickname);
|
|
tv_nickname.setText(mNickname);
|
|
|
-// mTempData.setNickName(mNickname);
|
|
|
|
|
|
|
+ mTempData.setNickName(mNickname);
|
|
|
|
|
+ updateData();
|
|
|
}
|
|
}
|
|
|
} else if (requestCode == UPDATE_SEX && data != null) {
|
|
} else if (requestCode == UPDATE_SEX && data != null) {
|
|
|
mSex = data.getStringExtra("newsex");
|
|
mSex = data.getStringExtra("newsex");
|
|
@@ -395,6 +399,7 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
|
|
|
} else if (mSex.equals("女")) {
|
|
} else if (mSex.equals("女")) {
|
|
|
mTempData.setSex(0);
|
|
mTempData.setSex(0);
|
|
|
}
|
|
}
|
|
|
|
|
+ updateData();
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -493,19 +498,19 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
|
|
|
uploadAvatar(mCurrentFile);
|
|
uploadAvatar(mCurrentFile);
|
|
|
} else {
|
|
} else {
|
|
|
ProgressDialogUtil.dismiss(mProgressDialog);
|
|
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();
|
|
|
|
|
|
|
+// Crouton crouton = Crouton.makeText(this, "保存成功", 0xff99cc00, 1000);
|
|
|
|
|
+// crouton.setLifecycleCallback(new LifecycleCallback() {
|
|
|
|
|
+// @Override
|
|
|
|
|
+// public void onDisplayed() {
|
|
|
|
|
+//
|
|
|
|
|
+// }
|
|
|
|
|
+//
|
|
|
|
|
+// @Override
|
|
|
|
|
+// public void onRemoved() {
|
|
|
|
|
+//
|
|
|
|
|
+// }
|
|
|
|
|
+// });
|
|
|
|
|
+// crouton.show();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
@@ -635,11 +640,11 @@ public class BaseInfoActivity extends BaseActivity implements View.OnClickListen
|
|
|
|
|
|
|
|
if (mUser != null && !mUser.equals(mTempData)) {// 数据改变了,提交数据
|
|
if (mUser != null && !mUser.equals(mTempData)) {// 数据改变了,提交数据
|
|
|
Log.d("wang", "数据改变了,提交数据");
|
|
Log.d("wang", "数据改变了,提交数据");
|
|
|
- updateData();
|
|
|
|
|
|
|
+ // updateData();
|
|
|
}
|
|
}
|
|
|
if (mCurrentFile != null && mCurrentFile.exists()) {
|
|
if (mCurrentFile != null && mCurrentFile.exists()) {
|
|
|
Log.d("wang", "uploadAvatar");
|
|
Log.d("wang", "uploadAvatar");
|
|
|
- uploadAvatar(mCurrentFile);
|
|
|
|
|
|
|
+ // uploadAvatar(mCurrentFile);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|