From 42a6ef0dcc942d753c4740802782eb700bf8356c Mon Sep 17 00:00:00 2001
From: Liuyf <lyf571321556@163.com>
Date: Wed, 13 Nov 2024 17:16:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E6=B2=A1=E6=9C=89=E5=93=8D=E5=BA=94=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../starLock_forgetPassword_page.dart         | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/login/forgetPassword/starLock_forgetPassword_page.dart b/lib/login/forgetPassword/starLock_forgetPassword_page.dart
index 0aa89470..59065cd0 100755
--- a/lib/login/forgetPassword/starLock_forgetPassword_page.dart
+++ b/lib/login/forgetPassword/starLock_forgetPassword_page.dart
@@ -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);

From 0bdbf7be224ca92db0c800768cba31320129da46 Mon Sep 17 00:00:00 2001
From: Liuyf <lyf571321556@163.com>
Date: Wed, 13 Nov 2024 18:19:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20ci=E4=B8=8A=E4=BC=A0pgy=E5=81=B6?=
 =?UTF-8?q?=E5=8F=91=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ios/fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile
index 404c6f3b..e43dcdf3 100644
--- a/ios/fastlane/Fastfile
+++ b/ios/fastlane/Fastfile
@@ -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