sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of code.star-lock.cn:StarlockTeam/app-starlock into develop

Browse Source
This commit is contained in:
魏少阳 2024-11-26 13:47:42 +08:00
commit a77ad75171
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ios/fastlane/Fastfile
View File

@ -183,7 +183,7 @@ platform :ios do
Dir.glob("#{directory}/*#{file_extension}").each do |file| Dir.glob("#{directory}/*#{file_extension}").each do |file|
# 打印文件名称 # 打印文件名称
puts "start upload file: #{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) File.delete(file)
end end
end end

23
lib/login/forgetPassword/starLock_forgetPassword_page.dart
View File

@ -105,7 +105,7 @@ class _StarLockForgetPasswordPageState
height: 36.w, height: 36.w,
), ),
), ),
hintText:'请输入手机号或者邮箱'.tr, hintText: '请输入手机号或者邮箱'.tr,
keyboardType: TextInputType.number, keyboardType: TextInputType.number,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(30), LengthLimitingTextInputFormatter(30),
@ -127,8 +127,7 @@ class _StarLockForgetPasswordPageState
height: 36.w, height: 36.w,
), ),
), ),
hintText: hintText: '请输入密码'.tr,
'请输入密码'.tr,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
@ -155,8 +154,7 @@ class _StarLockForgetPasswordPageState
height: 36.w, height: 36.w,
), ),
), ),
hintText: hintText: '确认密码'.tr,
'确认密码'.tr,
inputFormatters: <TextInputFormatter>[ inputFormatters: <TextInputFormatter>[
LengthLimitingTextInputFormatter(20), LengthLimitingTextInputFormatter(20),
]), ]),
@ -204,7 +202,8 @@ class _StarLockForgetPasswordPageState
// height: 60.h, // height: 60.h,
padding: EdgeInsets.all(10.h), padding: EdgeInsets.all(10.h),
decoration: BoxDecoration( decoration: BoxDecoration(
color: (state.canSendCode.value && state.canResend.value) color: (state.canSendCode.value &&
state.canResend.value)
? AppColors.mainColor ? AppColors.mainColor
: AppColors.btnDisableColor, : AppColors.btnDisableColor,
borderRadius: BorderRadius.circular(5)), borderRadius: BorderRadius.circular(5)),
@ -233,12 +232,12 @@ class _StarLockForgetPasswordPageState
isDisabled: state.canSub.value, isDisabled: state.canSub.value,
onClick: state.canSub.value onClick: state.canSub.value
? () async { ? () async {
final bool isNetWork = // final bool isNetWork =
await LockMainLogic.to()?.judgeTheNetwork() ?? // await LockMainLogic.to()?.judgeTheNetwork() ??
false; // false;
if (!isNetWork) { // if (!isNetWork) {
return; // return;
} // }
logic.resetPassword(); logic.resetPassword();
} }
: null); : null);