From 789ff17f58fe3fa7c848504613ca3402eb548a58 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 30 May 2025 16:28:24 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E5=8E=9F=E6=9C=89?= =?UTF-8?q?=E6=A0=87=E5=87=86ci=E7=9A=84tag=E7=94=9F=E6=88=90=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E8=BF=87=E6=BB=A4=E6=8E=89=E6=90=BA=E5=B8=A6?= =?UTF-8?q?=5Fsky=E5=90=8E=E7=BC=80=E7=9A=84tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tag_generator.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/tag_generator.sh b/tag_generator.sh index 27e39182..f148c1e1 100755 --- a/tag_generator.sh +++ b/tag_generator.sh @@ -10,17 +10,21 @@ echo "PRIVATE-TOKEN: $TOKEN $URL/projects/$PROJECT_ID/repository/tags" tags_json=$(curl -H "Content-Type: application/json" -H "PRIVATE-TOKEN: $TOKEN" "$URL/projects/$PROJECT_ID/repository/tags") #echo "tags_json:$tags_json\n" tags=$(echo "$tags_json" | jq -r '.[].name') + +# 只保留不带 _sky 后缀的 tag 作为最新 tag +plain_tags=$(echo "$tags" | grep -v '_sky$') +latest_tag=$(echo "$plain_tags" | head -n 1) + tags_length=$(echo "$tags_json" | jq -r 'length') if [ "$tags_length" -lt 1 ]; then next_tag="v1.0.0" else - newest_tag=$(echo "$tags" | head -n 1) - IFS='.' read -r major minor patch <<< "$newest_tag" + IFS='.' read -r major minor patch <<< "$latest_tag" major="${major#v}" compare_json="" if [[ "$1" == "generate_tag" ]];then - echo "generate_tag:$newest_tag-to-master\n" - compare_json=$(curl -s --header "PRIVATE-TOKEN: $TOKEN" "$URL/projects/$PROJECT_ID/repository/compare?from=$newest_tag&to=master") + echo "generate_tag:$latest_tag-to-master\n" + compare_json=$(curl -s --header "PRIVATE-TOKEN: $TOKEN" "$URL/projects/$PROJECT_ID/repository/compare?from=$latest_tag&to=master") elif [[ "$1" == "generate_version" ]]; then echo "generate_version:master-to-$CI_COMMIT_BRANCH\n" compare_json=$(curl -s --header "PRIVATE-TOKEN: $TOKEN" "$URL/projects/$PROJECT_ID/repository/compare?from=master&to=$CI_COMMIT_BRANCH") @@ -45,9 +49,9 @@ else done < <(echo "$compare_json" | jq -c '.commits[] | {id: .id, message: .message}') next_tag="v$major.$new_minor.$new_patch" fi -echo "New Tag:$newest_tag;New version: $next_tag;command: $1" +echo "New Tag:$latest_tag;New version: $next_tag;command: $1" if [[ "$1" == "generate_tag" ]];then - if [ "$next_tag" == "$newest_tag" ]; then + if [ "$next_tag" == "$latest_tag" ]; then echo "no change from master,skip to generate tag" exit 0 fi From b97f7a345d70f1bd600e0964b4da2ea027514034 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 6 Jun 2025 10:52:36 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4ci=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c287c9f7..22659003 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,13 +60,19 @@ 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 + # - flutter pub get - export PATH="/opt/homebrew/bin:$PATH" - eval "$(rbenv init -)" + - rbenv global 2.6.10 # 你实际用的 Ruby 版本 + - ruby -v + - which ruby + - gem env - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - - bundle install --gemfile android/Gemfile --quiet + - bundle install --gemfile android/Gemfile --path vendor/bundle_android --quiet cache: paths: - app_new.version @@ -74,13 +80,18 @@ 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 - export PATH="/opt/homebrew/bin:$PATH" - eval "$(rbenv init -)" + - rbenv global 2.6.10 # 你实际用的 Ruby 版本 + - ruby -v + - which ruby + - gem env - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - - bundle install --gemfile ios/Gemfile --quiet + - bundle install --gemfile ios/Gemfile --path vendor/bundle_ios --quiet cache: paths: - app_new.version From a239d28fb83c2625b4270a1fd01ce82c6d95abf3 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 6 Jun 2025 11:12:23 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4ci=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22659003..36569c24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,6 +84,7 @@ variables: - export FLUTTER_STORAGE_BASE_URL=https://storage.flutter-io.cn - ls -li - export NEXT_VERSION="$(cat app_new.version)" + - flutter pub get - export PATH="/opt/homebrew/bin:$PATH" - eval "$(rbenv init -)" - rbenv global 2.6.10 # 你实际用的 Ruby 版本 From 788a3cc09334606e3b3be869d6e9d743d0407e0a Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 6 Jun 2025 11:29:52 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=E5=88=87=E6=8D=A2rubygems=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E4=B8=BA=E9=98=BF=E9=87=8C=E4=BA=91=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36569c24..a7c254ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,7 +71,7 @@ variables: - ruby -v - which ruby - gem env - - bundle config mirror.https://rubygems.org https://gems.ruby-china.com + - bundle config mirror.https://rubygems.org https://mirrors.aliyun.com/rubygems/ - bundle install --gemfile android/Gemfile --path vendor/bundle_android --quiet cache: paths: @@ -91,7 +91,7 @@ variables: - ruby -v - which ruby - gem env - - bundle config mirror.https://rubygems.org https://gems.ruby-china.com + - bundle config mirror.https://rubygems.org https://mirrors.aliyun.com/rubygems/ - bundle install --gemfile ios/Gemfile --path vendor/bundle_ios --quiet cache: paths: From 57bb6f233d3964cb9e60d7403a3ce93dfeae8ee0 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 6 Jun 2025 12:24:33 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=E6=9E=84=E5=BB=BA=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=90=8E=E6=B8=85=E7=90=86=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7c254ca..7e7e582f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -230,4 +230,10 @@ clean_up: extends: .build_rule script: - git reset --hard + - rm -rf ~/Library/Developer/Xcode/DerivedData/* + - rm -rf ~/Library/Developer/Xcode/Archives/* + - rm -rf ios/build/ + - rm -rf build/ + - rm -rf .dart_tool/ + - rm -rf ios/Pods/ when: always \ No newline at end of file From 0e1c03645a6ebb3b73936588210a4c7cf4505293 Mon Sep 17 00:00:00 2001 From: liyi Date: Fri, 6 Jun 2025 13:36:54 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=E5=8F=96=E6=B6=88=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=90=8E=E6=B8=85=E7=90=86=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e7e582f..a7c254ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -230,10 +230,4 @@ clean_up: extends: .build_rule script: - git reset --hard - - rm -rf ~/Library/Developer/Xcode/DerivedData/* - - rm -rf ~/Library/Developer/Xcode/Archives/* - - rm -rf ios/build/ - - rm -rf build/ - - rm -rf .dart_tool/ - - rm -rf ios/Pods/ when: always \ No newline at end of file From 4c3da6d194bfc96a88b4ed721bfa99fb358357ff Mon Sep 17 00:00:00 2001 From: wuyaxi <18682150237@163.com> Date: Fri, 13 Jun 2025 10:49:18 +0800 Subject: [PATCH 7/7] =?UTF-8?q?feat:=20=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=BE=80=E5=A4=96=E6=8F=90=E5=8D=87=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=B1=82=E7=BA=A7,=E6=94=BE=E5=88=B0=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E4=BF=A1=E6=81=AF=E6=A0=8F=E7=9B=AE=E4=B8=8B=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicInformation_page.dart | 28 ++++++------- .../lockSet/lockSet/lockSet_page.dart | 42 ++++++++++++++++++- 2 files changed, 54 insertions(+), 16 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..69beabba 100755 --- a/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart +++ b/lib/main/lockDetail/lockSet/basicInformation/basicInformation/basicInformation_page.dart @@ -133,20 +133,20 @@ class _BasicInformationPageState extends State { } }); })), - Obx(() => Visibility( - visible: state.lockBasicInfo.value.isLockOwner == 1, - child: CommonItem( - leftTitel: '管理员开锁密码'.tr, - rightTitle: state.lockBasicInfo.value.adminPwd, - isHaveLine: true, - isHaveDirection: true, - action: () { - Get.toNamed(Routers.adminOpenLockPasswordPage, - arguments: { - 'lockSetInfoData': state.lockSetInfoData.value - }); - }), - )), + // Obx(() => Visibility( + // visible: state.lockBasicInfo.value.isLockOwner == 1, + // child: CommonItem( + // leftTitel: '管理员开锁密码'.tr, + // rightTitle: state.lockBasicInfo.value.adminPwd, + // isHaveLine: true, + // isHaveDirection: true, + // action: () { + // Get.toNamed(Routers.adminOpenLockPasswordPage, + // arguments: { + // 'lockSetInfoData': state.lockSetInfoData.value + // }); + // }), + // )), Obx(() => Visibility( visible: (state.lockBasicInfo.value.lockName ?? '') .contains('T9A'), diff --git a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart index f11e9624..78f5a18a 100755 --- a/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart +++ b/lib/main/lockDetail/lockSet/lockSet/lockSet_page.dart @@ -99,7 +99,7 @@ class _LockSetPageState extends State CommonItem( leftTitel: '基本信息'.tr, rightTitle: '', - isHaveLine: false, + isHaveLine: state.lockBasicInfo.value.isLockOwner == 1, isHaveDirection: true, action: () { if (!state.lockSetInfoData.value.isValid()) { @@ -111,6 +111,25 @@ class _LockSetPageState extends State 'lockSetInfoData': state.lockSetInfoData.value }); }), + //管理员密码 需求变更：由基本信息子页面移至此处 + Obx(() => Visibility( + visible: state.lockBasicInfo.value.isLockOwner == 1, + child: CommonItem( + leftTitel: '管理员开锁密码'.tr, + rightTitle: state.lockBasicInfo.value.adminPwd, + isHaveLine: false, + isHaveDirection: true, + action: () { + if (!state.lockSetInfoData.value.isValid()) { + EasyLoading.showToast('网络访问失败,请检查网络是否正常'.tr); + return; + } + Get.toNamed(Routers.adminOpenLockPasswordPage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); + }), + )), SizedBox(height: 10.h), // 自动闭锁 Obx(() => Visibility( @@ -201,7 +220,7 @@ class _LockSetPageState extends State CommonItem( leftTitel: '基本信息'.tr, rightTitle: '', - isHaveLine: false, + isHaveLine: state.lockBasicInfo.value.isLockOwner == 1, isHaveDirection: true, action: () { Get.toNamed(Routers.basicInformationPage, @@ -209,6 +228,25 @@ class _LockSetPageState extends State 'lockSetInfoData': state.lockSetInfoData.value }); }), + //管理员密码 需求变更：由基本信息子页面移至此处 + Obx(() => Visibility( + visible: state.lockBasicInfo.value.isLockOwner == 1, + child: CommonItem( + leftTitel: '管理员开锁密码'.tr, + rightTitle: state.lockBasicInfo.value.adminPwd, + isHaveLine: true, + isHaveDirection: true, + action: () { + if (!state.lockSetInfoData.value.isValid()) { + EasyLoading.showToast('网络访问失败,请检查网络是否正常'.tr); + return; + } + Get.toNamed(Routers.adminOpenLockPasswordPage, + arguments: { + 'lockSetInfoData': state.lockSetInfoData.value + }); + }), + )), SizedBox(height: 10.h), //by DaisyWu 田总：移至锁详情配件区 // 门磁