moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[BugFix]修复金币明细时间筛选器的bug，增加提示，重置密码接口增加区号

Browse Source
This commit is contained in:
wushaocheng
2022-12-01 18:01:14 +08:00
parent 22f10fea8c
commit 2c398f8c8c
5 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/yizhuan/erban/ui/setting/ResetPasswordActivity.kt
View File

@@ -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<ActivityResetLoginPwdBindi
ResUtil.getString(R.string.ui_setting_resetpasswordactivity_07)
)
AuthModel.get().requestResetPsw(
binding.tvAreaCode.text.toString().substring(1),
binding.tvAreaCode.text.toString().substring(1) + binding.etAccount.text.toString()
.trim { it <= ' ' },
binding.etCode.text.toString().trim { it <= ' ' },

1
app/src/main/res/values/strings.xml
View File

@@ -5003,5 +5003,6 @@
<string name="select_area_code">選擇區号</string>
<string name="login_input_code">輸入驗證碼</string>
<string name="bound_auth_code_is_empty">授权號不能為空</string>
<string name="only_can_see_three_month_data">只能查看前3個月的結算統計</string>
</resources>

7
app/src/module_labour_union/java/com/yizhuan/erban/module_hall/hall/view/dialog/TimePickerGoldDialog.java
View File

@@ -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);
}
}

6
core/src/main/java/com/yizhuan/xchat_android_core/auth/AuthModel.java
View File

@@ -662,12 +662,13 @@ public class AuthModel extends BaseModel implements IAuthModel {
* @return
*/
@Override
public Single<String> requestResetPsw(String phone, String sms_code, String newPsw) {
public Single<String> requestResetPsw(String phoneAreaCode, String phone, String sms_code, String newPsw) {
return Single.create(new SingleOnSubscribe<String>() {
@Override
public void subscribe(SingleEmitter<String> 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<ServiceResult> requestResetPsw(@Field("phone") String phone,
Single<ServiceResult> requestResetPsw(@Field("phoneAreaCode") String phoneAreaCode,
@Field("phone") String phone,
@Field("smsCode") String smsCode,
@Field("newPwd") String newPwd);

2
core/src/main/java/com/yizhuan/xchat_android_core/auth/IAuthModel.java
View File

@@ -76,7 +76,7 @@ public interface IAuthModel extends IModel {
* @param newPsw
* @return
*/
Single<String> requestResetPsw(String phone, String sms_code, String newPsw);
Single<String> requestResetPsw(String phoneAreaCode, String phone, String sms_code, String newPsw);
/**
* 当前用户是否绑定手机