Merge branch 'develop_sky' into 'master_sky'

Develop sky

See merge request StarlockTeam/app-starlock!87

.gitlab-ci.yml

@@ -90,6 +90,8 @@ variables:
     - echo $PATH
     - env
     - bash android/build.sh
+    - echo "=== [产物检查] build/app/outputs/flutter-apk/ 目录内容如下 ==="
+    - if [ -d build/app/outputs/flutter-apk/ ]; then ls -lh build/app/outputs/flutter-apk/; else echo "❌ 产物目录 build/app/outputs/flutter-apk/ 未生成！"; fi
   cache:
     paths:
       - app_new.version
@@ -123,6 +125,8 @@ variables:
     - echo $PATH
     - env
     - bash ios/build.sh
+    - echo "=== [产物检查] build/app/outputs/flutter-ipa/ 目录内容如下 ==="
+    - if [ -d build/app/outputs/flutter-ipa/ ]; then ls -lh build/app/outputs/flutter-ipa/; else echo "❌ 产物目录 build/app/outputs/flutter-ipa/ 未生成！"; fi
   cache:
     paths:
       - app_new.version
@@ -170,6 +174,8 @@ build_android:
     - echo $PATH
     - env
     - bash android/build.sh
+    - echo "=== [产物检查] build/app/outputs/flutter-apk/ 目录内容如下 ==="
+    - if [ -d build/app/outputs/flutter-apk/ ]; then ls -lh build/app/outputs/flutter-apk/; else echo "❌ 产物目录 build/app/outputs/flutter-apk/ 未生成！"; fi
   artifacts:
     paths:
       - build/app/outputs/flutter-apk/
@@ -190,6 +196,8 @@ build_ios:
     - echo $PATH
     - env
     - bash ios/build.sh
+    - echo "=== [产物检查] build/app/outputs/flutter-ipa/ 目录内容如下 ==="
+    - if [ -d build/app/outputs/flutter-ipa/ ]; then ls -lh build/app/outputs/flutter-ipa/; else echo "❌ 产物目录 build/app/outputs/flutter-ipa/ 未生成！"; fi
   artifacts:
     paths:
       - build/app/outputs/flutter-ipa
@@ -212,6 +220,10 @@ create-release:
     - bash release_description_generator.sh
     - export RELEASE_DESCRIPTION="$(cat changelog.md)"
     - echo "${RELEASE_DESCRIPTION}"
+    - echo "=== [产物检查] build/app/outputs/flutter-apk/ 目录内容如下 ==="
+    - if [ -d build/app/outputs/flutter-apk/ ]; then ls -lh build/app/outputs/flutter-apk/; else echo "❌ 产物目录 build/app/outputs/flutter-apk/ 未生成！"; fi
+    - echo "=== [产物检查] build/app/outputs/flutter-ipa/ 目录内容如下 ==="
+    - if [ -d build/app/outputs/flutter-ipa/ ]; then ls -lh build/app/outputs/flutter-ipa/; else echo "❌ 产物目录 build/app/outputs/flutter-ipa/ 未生成！"; fi
   script:
     - export StarLock_VERSION=${CI_COMMIT_TAG#*-}
     - echo "Uploading StarLock-${StarLock_VERSION} packages to

lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart

@@ -158,23 +158,23 @@ class _BasicInformationPageState extends State<BasicInformationPage> {
                       allHeight: 70.h,
                       isHaveLine: true),
                 )),
-            Obx(() => CommonItem(
+            // Obx(() => CommonItem(
-                  leftTitel: '位置信息'.tr,
+            //       leftTitel: '位置信息'.tr,
-                  // rightTitle: state.lockBasicInfo.value.address ?? "-",
+            //       // rightTitle: state.lockBasicInfo.value.address ?? "-",
-                  allHeight: 80.h,
+            //       allHeight: 80.h,
-                  isHaveLine: false,
+            //       isHaveLine: false,
-                  isHaveRightWidget: true,
+            //       isHaveRightWidget: true,
-                  rightWidget: SizedBox(
+            //       rightWidget: SizedBox(
-                    width: 300.w,
+            //         width: 300.w,
-                    child: Text(state.lockBasicInfo.value.address ?? '无'.tr,
+            //         child: Text(state.lockBasicInfo.value.address ?? '无'.tr,
-                        maxLines: 2,
+            //             maxLines: 2,
-                        overflow: TextOverflow.ellipsis,
+            //             overflow: TextOverflow.ellipsis,
-                        textAlign: TextAlign.end,
+            //             textAlign: TextAlign.end,
-                        style: TextStyle(
+            //             style: TextStyle(
-                            fontSize: 22.sp,
+            //                 fontSize: 22.sp,
-                            color: AppColors.darkGrayTextColor)),
+            //                 color: AppColors.darkGrayTextColor)),
-                  ),
+            //       ),
-                )),
+            //     )),
             /* 2024-01-12 会议确定去掉“微信二维码” by DaisyWu
             CommonItem(
                 leftTitel:

lib/talk/starChart/views/imageTransmission/image_transmission_page.dart

@@ -61,7 +61,7 @@ class _ImageTransmissionPageState extends State<ImageTransmissionPage>
         barTitle: '图传'.tr,
         haveBack: true,
         backgroundColor: AppColors.mainColor,
-        backAction: (){
+        backAction: () {
           logic.udpHangUpAction();
         },
       ),
@@ -183,10 +183,7 @@ class _ImageTransmissionPageState extends State<ImageTransmissionPage>
                 icon: Icons.camera_alt,
                 color: Colors.blue,
                 onTap: () async {
-                  if (state.talkStatus.value ==
+                  await logic.captureAndSavePng();
-                      TalkStatus.answeredSuccessfully) {
-                    await logic.captureAndSavePng();
-                  }
                 },
               ),
             ],
@@ -200,7 +197,10 @@ class _ImageTransmissionPageState extends State<ImageTransmissionPage>
             outerColor: Colors.amber.withOpacity(0.15),
             sliderButtonIcon: Icon(Icons.lock, color: Colors.white, size: 40.w),
             text: '滑动解锁',
-            textStyle: TextStyle(fontSize: 26.sp, color: Colors.black54, fontWeight: FontWeight.bold),
+            textStyle: TextStyle(
+                fontSize: 26.sp,
+                color: Colors.black54,
+                fontWeight: FontWeight.bold),
             onSubmit: () {
               // TODO: 实现滑动解锁逻辑
               logic.remoteOpenLock();