From 2c398f8c8c27e5e948f7a74a6863bf2edc38551c Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Thu, 1 Dec 2022 18:01:14 +0800 Subject: [PATCH] =?UTF-8?q?[BugFix]=E4=BF=AE=E5=A4=8D=E9=87=91=E5=B8=81?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89=E5=99=A8?= =?UTF-8?q?=E7=9A=84bug=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E9=87=8D=E7=BD=AE=E5=AF=86=E7=A0=81=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/yizhuan/erban/ui/setting/ResetPasswordActivity.kt | 2 +- app/src/main/res/values/strings.xml | 1 + .../module_hall/hall/view/dialog/TimePickerGoldDialog.java | 7 ++++--- .../com/yizhuan/xchat_android_core/auth/AuthModel.java | 6 ++++-- .../com/yizhuan/xchat_android_core/auth/IAuthModel.java | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/ui/setting/ResetPasswordActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/setting/ResetPasswordActivity.kt index 8fdd1629d..311042af0 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/setting/ResetPasswordActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/setting/ResetPasswordActivity.kt @@ -17,7 +17,6 @@ import com.yizhuan.erban.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.ActivityResetLoginPwdBinding import com.yizhuan.erban.ui.login.AreaCodeActivity import com.yizhuan.erban.ui.login.BindPhoneActivity -import com.yizhuan.erban.ui.login.CodeDownTimer import com.yizhuan.erban.ui.login.helper.LogoutHelper import com.yizhuan.erban.ui.setting.ResetPasswordActivity import com.yizhuan.xchat_android_core.auth.AuthModel @@ -168,6 +167,7 @@ class ResetPasswordActivity : BaseViewBindingActivity選擇區号 輸入驗證碼 授权號不能為空 + 只能查看前3個月的結算統計 \ No newline at end of file diff --git a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerGoldDialog.java b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerGoldDialog.java index b764dba49..8830021f9 100644 --- a/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerGoldDialog.java +++ b/app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerGoldDialog.java @@ -202,9 +202,6 @@ public class TimePickerGoldDialog extends DialogFragment implements View.OnClick tvWeekLastDay.setText(TimeUtils.getDateTimeString(mDayLastTime, TimeUtils.DATE_FORMAT)); } } else { - if (mWeekFirstDayNow - TimeUtils.MILLIS_OF_A_DAY * 84 > calendar.getTimeInMillis() || mWeekLastDayNow < calendar.getTimeInMillis()) { - return; - } //获取周几 1-7 int currweekDay = calendar.get(Calendar.DAY_OF_WEEK); if (currweekDay == 1) {//周日 @@ -284,6 +281,10 @@ public class TimePickerGoldDialog extends DialogFragment implements View.OnClick TimeUtils.getDateTimeString(mDayLastTime, TimeUtils.DATE_FORMAT)); } else { + if (mWeekFirstDayNow - TimeUtils.MILLIS_OF_A_DAY * 84 > mCurrentMillSeconds || mWeekLastDayNow < mCurrentMillSeconds) { + SingleToastUtil.showToast(ResUtil.getString(R.string.only_can_see_three_month_data)); + return; + } mTimePickerListener.getTime(mCurrentMillSeconds, mWeekFirstDay, mWeekLastDay); } } diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java index ec198fe6b..10457cdf6 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java @@ -662,12 +662,13 @@ public class AuthModel extends BaseModel implements IAuthModel { * @return */ @Override - public Single requestResetPsw(String phone, String sms_code, String newPsw) { + public Single requestResetPsw(String phoneAreaCode, String phone, String sms_code, String newPsw) { return Single.create(new SingleOnSubscribe() { @Override public void subscribe(SingleEmitter e) throws Exception { try { ServiceResult serviceResult = api.requestResetPsw( + phoneAreaCode, DESUtils.DESAndBase64(phone), sms_code, DESAndBase64(newPsw) @@ -1208,7 +1209,8 @@ public class AuthModel extends BaseModel implements IAuthModel { @FormUrlEncoded @POST("/acc/pwd/reset") - Single requestResetPsw(@Field("phone") String phone, + Single requestResetPsw(@Field("phoneAreaCode") String phoneAreaCode, + @Field("phone") String phone, @Field("smsCode") String smsCode, @Field("newPwd") String newPwd); diff --git a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java b/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java index bf4e3e08c..4362398cf 100644 --- a/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java +++ b/core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java @@ -76,7 +76,7 @@ public interface IAuthModel extends IModel { * @param newPsw * @return */ - Single requestResetPsw(String phone, String sms_code, String newPsw); + Single requestResetPsw(String phoneAreaCode, String phone, String sms_code, String newPsw); /** * 当前用户是否绑定手机