From 7bf5d9147dc14bf8f2f64e16c87c356c345a2c95 Mon Sep 17 00:00:00 2001 From: liyi Date: Wed, 4 Jun 2025 15:59:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=B6=E5=92=8C=E7=82=B9=E5=87=BB=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=97=B6=E6=94=B6=E8=B5=B7=E9=94=AE=E7=9B=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/tools/keySearchWidget.dart | 2 ++ lib/tools/titleAppBar.dart | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/tools/keySearchWidget.dart b/lib/tools/keySearchWidget.dart index 783b5ce7..25c3e2ee 100755 --- a/lib/tools/keySearchWidget.dart +++ b/lib/tools/keySearchWidget.dart @@ -53,6 +53,7 @@ class KeySearchWidget extends StatelessWidget { controller: editingController, autofocus: false, textAlign: TextAlign.start, + textInputAction: TextInputAction.search, onChanged: (String value) { AppLog.log('onChanged:$value'); }, @@ -60,6 +61,7 @@ class KeySearchWidget extends StatelessWidget { AppLog.log('onEditingComplete:'); }, onSubmitted: (String value) { + FocusScope.of(context).unfocus(); // 收起键盘 onSubmittedAction!(); }, decoration: InputDecoration( diff --git a/lib/tools/titleAppBar.dart b/lib/tools/titleAppBar.dart index 06897eb2..1355e6de 100755 --- a/lib/tools/titleAppBar.dart +++ b/lib/tools/titleAppBar.dart @@ -64,6 +64,7 @@ class _TitleAppBarState extends State { EasyLoading.dismiss(); } Navigator.pop(context); + FocusScope.of(context).unfocus(); // 收起键盘 } }) : Container()), From 621838a0cb81da85d83a7d162a3df2cbaf4fab26 Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 5 Jun 2025 10:52:51 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=AF=86=E7=A0=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=82=B9=E5=87=BB=E5=88=A0=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E5=BC=B9=E7=AA=97=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart index b9a39d6c..03c36a5c 100755 --- a/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart +++ b/lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart @@ -180,8 +180,7 @@ class _PasswordKeyDetailPageState extends State left: 30.w, right: 30.w, top: 30.w, bottom: 30.w), padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: () async { - final bool isNetWork = - await LockMainLogic.to()?.judgeTheNetwork() ?? false; + final bool isNetWork = await logic.isConnected(); if (!isNetWork) { return; } From 951571f95e8e5e90ee600d57ee136f8ff71c5d40 Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 5 Jun 2025 11:26:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0ci=E6=97=B6=E7=9A=84f?= =?UTF-8?q?lutter=E4=BE=9D=E8=B5=96=E9=95=9C=E5=83=8F=E6=BA=90=E4=B8=BA?= =?UTF-8?q?=E5=9B=BD=E5=86=85=E9=95=9C=E5=83=8F=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14adf703..c5fcc10b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,6 +60,8 @@ variables: .setup_fastlane_android: extends: .build_rule before_script: + - export PUB_HOSTED_URL=https://pub.flutter-io.cn + - export FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get @@ -74,6 +76,8 @@ variables: .setup_fastlane_ios: extends: .build_rule before_script: + - export PUB_HOSTED_URL=https://pub.flutter-io.cn + - export FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get From f950392c222dfbd2ad70d6b547f5a226f7d3cb2b Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 5 Jun 2025 14:31:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4FCM=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 33672031..043bedcc 100755 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -358,8 +358,14 @@ dependencies { implementation 'com.umeng.umsdk:asms:1.8.5' // // - implementation 'cn.jiguang.sdk.plugin:fcm:5.2.3' - implementation 'com.google.firebase:firebase-messaging:23.0.5' +// implementation 'cn.jiguang.sdk.plugin:fcm:5.2.3' +// implementation 'com.google.firebase:firebase-messaging:23.0.5' // + //FCM云消息与极光FCM插件 + implementation 'com.google.firebase:firebase-messaging:23.2.1' + implementation 'cn.jiguang.sdk.plugin:fcm:5.2.2' + + + }