Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop
This commit is contained in:
commit
a77ad75171
@ -183,7 +183,7 @@ platform :ios do
|
||||
Dir.glob("#{directory}/*#{file_extension}").each do |file|
|
||||
# 打印文件名称
|
||||
puts "start upload file: #{file}"
|
||||
pgyer(api_key: ENV['PGY_API_KEY'],apk:file,update_description: logs)
|
||||
pgyer(api_key: ENV['PGY_API_KEY'],ipa:file,update_description: logs)
|
||||
File.delete(file)
|
||||
end
|
||||
end
|
||||
|
||||
@ -105,7 +105,7 @@ class _StarLockForgetPasswordPageState
|
||||
height: 36.w,
|
||||
),
|
||||
),
|
||||
hintText:'请输入手机号或者邮箱'.tr,
|
||||
hintText: '请输入手机号或者邮箱'.tr,
|
||||
keyboardType: TextInputType.number,
|
||||
inputFormatters: <TextInputFormatter>[
|
||||
LengthLimitingTextInputFormatter(30),
|
||||
@ -127,8 +127,7 @@ class _StarLockForgetPasswordPageState
|
||||
height: 36.w,
|
||||
),
|
||||
),
|
||||
hintText:
|
||||
'请输入密码'.tr,
|
||||
hintText: '请输入密码'.tr,
|
||||
inputFormatters: <TextInputFormatter>[
|
||||
LengthLimitingTextInputFormatter(20),
|
||||
]),
|
||||
@ -155,8 +154,7 @@ class _StarLockForgetPasswordPageState
|
||||
height: 36.w,
|
||||
),
|
||||
),
|
||||
hintText:
|
||||
'确认密码'.tr,
|
||||
hintText: '确认密码'.tr,
|
||||
inputFormatters: <TextInputFormatter>[
|
||||
LengthLimitingTextInputFormatter(20),
|
||||
]),
|
||||
@ -204,7 +202,8 @@ class _StarLockForgetPasswordPageState
|
||||
// height: 60.h,
|
||||
padding: EdgeInsets.all(10.h),
|
||||
decoration: BoxDecoration(
|
||||
color: (state.canSendCode.value && state.canResend.value)
|
||||
color: (state.canSendCode.value &&
|
||||
state.canResend.value)
|
||||
? AppColors.mainColor
|
||||
: AppColors.btnDisableColor,
|
||||
borderRadius: BorderRadius.circular(5)),
|
||||
@ -233,12 +232,12 @@ class _StarLockForgetPasswordPageState
|
||||
isDisabled: state.canSub.value,
|
||||
onClick: state.canSub.value
|
||||
? () async {
|
||||
final bool isNetWork =
|
||||
await LockMainLogic.to()?.judgeTheNetwork() ??
|
||||
false;
|
||||
if (!isNetWork) {
|
||||
return;
|
||||
}
|
||||
// final bool isNetWork =
|
||||
// await LockMainLogic.to()?.judgeTheNetwork() ??
|
||||
// false;
|
||||
// if (!isNetWork) {
|
||||
// return;
|
||||
// }
|
||||
logic.resetPassword();
|
||||
}
|
||||
: null);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user