Merge branch 'release_sky' into 'master_sky'

Release sky

See merge request StarlockTeam/app-starlock!148

.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

android/app/build.gradle

@@ -358,8 +358,14 @@ dependencies {
     implementation 'com.umeng.umsdk:asms:1.8.5'
     //</cn>
     //<com>
-    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'
     //</com>
 
+    //FCM云消息与极光FCM插件
+    implementation 'com.google.firebase:firebase-messaging:23.2.1'
+    implementation 'cn.jiguang.sdk.plugin:fcm:5.2.2'
+
+
+
 }

lib/main/lockDetail/passwordKey/passwordKeyDetail/passwordKeyDetail_page.dart

@@ -180,8 +180,7 @@ class _PasswordKeyDetailPageState extends State<PasswordKeyDetailPage>
                       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;
                     }

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(

lib/tools/titleAppBar.dart

@@ -64,6 +64,7 @@ class _TitleAppBarState extends State<TitleAppBar> {
                           EasyLoading.dismiss();
                         }
                         Navigator.pop(context);
+                        FocusScope.of(context).unfocus(); // 收起键盘
                       }
                     })
                 : Container()),