From 9c4cea522466b5b57ba3193d80e86479285c71d9 Mon Sep 17 00:00:00 2001 From: liyi Date: Sat, 17 May 2025 15:12:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E7=A7=BB=E9=99=A4=E9=AB=98=E5=BE=B7?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E7=A7=BB=E9=99=A4=E9=94=81=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=AD=E7=9A=84=E4=BD=8D=E7=BD=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicInformation_page.dart | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart b/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart index 58c5a9bb..20c36487 100755 --- a/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart +++ b/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart @@ -158,23 +158,23 @@ class _BasicInformationPageState extends State { allHeight: 70.h, isHaveLine: true), )), - Obx(() => CommonItem( - leftTitel: '位置信息'.tr, - // rightTitle: state.lockBasicInfo.value.address ?? "-", - allHeight: 80.h, - isHaveLine: false, - isHaveRightWidget: true, - rightWidget: SizedBox( - width: 300.w, - child: Text(state.lockBasicInfo.value.address ?? '无'.tr, - maxLines: 2, - overflow: TextOverflow.ellipsis, - textAlign: TextAlign.end, - style: TextStyle( - fontSize: 22.sp, - color: AppColors.darkGrayTextColor)), - ), - )), + // Obx(() => CommonItem( + // leftTitel: '位置信息'.tr, + // // rightTitle: state.lockBasicInfo.value.address ?? "-", + // allHeight: 80.h, + // isHaveLine: false, + // isHaveRightWidget: true, + // rightWidget: SizedBox( + // width: 300.w, + // child: Text(state.lockBasicInfo.value.address ?? '无'.tr, + // maxLines: 2, + // overflow: TextOverflow.ellipsis, + // textAlign: TextAlign.end, + // style: TextStyle( + // fontSize: 22.sp, + // color: AppColors.darkGrayTextColor)), + // ), + // )), /* 2024-01-12 会议确定去掉“微信二维码” by DaisyWu CommonItem( leftTitel: From de3722292e4efa841baa08b21e939850c345b3ff Mon Sep 17 00:00:00 2001 From: liyi Date: Sat, 17 May 2025 15:12:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E5=8F=96=E6=B6=88=E6=88=AA=E5=9B=BE?= =?UTF-8?q?=E6=97=B6=E5=BF=85=E9=A1=BB=E6=8E=A5=E5=90=AC=E7=9A=84=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imageTransmission/image_transmission_page.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/talk/starChart/views/imageTransmission/image_transmission_page.dart b/lib/talk/starChart/views/imageTransmission/image_transmission_page.dart index 3340151c..60b023bd 100644 --- a/lib/talk/starChart/views/imageTransmission/image_transmission_page.dart +++ b/lib/talk/starChart/views/imageTransmission/image_transmission_page.dart @@ -61,7 +61,7 @@ class _ImageTransmissionPageState extends State barTitle: '图传'.tr, haveBack: true, backgroundColor: AppColors.mainColor, - backAction: (){ + backAction: () { logic.udpHangUpAction(); }, ), @@ -183,10 +183,7 @@ class _ImageTransmissionPageState extends State icon: Icons.camera_alt, color: Colors.blue, onTap: () async { - if (state.talkStatus.value == - TalkStatus.answeredSuccessfully) { - await logic.captureAndSavePng(); - } + await logic.captureAndSavePng(); }, ), ], @@ -200,7 +197,10 @@ class _ImageTransmissionPageState extends State 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(); From 47877596940a5ce75fc20c3faa402f2d20d79261 Mon Sep 17 00:00:00 2001 From: liyi Date: Sat, 17 May 2025 15:40:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4ci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2bffcb6..2b0df87a 100644 --- a/.gitlab-ci.yml +++ b/.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