From b6552b4802d68251b886a22be224f6c61d822071 Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 8 May 2025 14:01:03 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=E6=B8=85=E9=99=A4=E8=A7=92=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mine/message/messageList/messageList_logic.dart | 4 ++++ pubspec.yaml | 2 ++ 2 files changed, 6 insertions(+) diff --git a/lib/mine/message/messageList/messageList_logic.dart b/lib/mine/message/messageList/messageList_logic.dart index 6c119cee..38ca4975 100755 --- a/lib/mine/message/messageList/messageList_logic.dart +++ b/lib/mine/message/messageList/messageList_logic.dart @@ -1,5 +1,7 @@ import 'dart:async'; +import 'package:flutter_app_badger/flutter_app_badger.dart'; +import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:star_lock/tools/baseGetXController.dart'; import '../../../network/api_repository.dart'; import '../../../tools/eventBusEventManage.dart'; @@ -46,6 +48,8 @@ class MessageListLogic extends BaseGetXController { if (entity.errorCode!.codeIsSuccessful) { pageNo = 1; messageListDataRequest(); + // 清除角标 + FlutterAppBadger.removeBadge(); } } diff --git a/pubspec.yaml b/pubspec.yaml index 454bd944..7819d6e8 100755 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -275,6 +275,8 @@ dependencies: provider: ^6.1.2 dio: ^4.0.6 # 网络请求库 video_thumbnail: ^0.5.3 + # 角标管理 + flutter_app_badger: ^1.3.0 From 10d4fa78fa5e44728e9b55c391140e23345db478 Mon Sep 17 00:00:00 2001 From: liyi Date: Thu, 8 May 2025 15:11:08 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=E6=90=9C=E7=B4=A2=E8=93=9D=E7=89=99?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8C=BA=E5=88=86,sky=E6=94=B9=E4=B8=BA76?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/blue/blue_manage.dart | 38 ++++++++++++++++++++++++-------------- lib/blue/io_type.dart | 2 +- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/lib/blue/blue_manage.dart b/lib/blue/blue_manage.dart index 359758b9..6f258b2c 100755 --- a/lib/blue/blue_manage.dart +++ b/lib/blue/blue_manage.dart @@ -262,7 +262,7 @@ class BlueManage { for (final ScanResult scanResult in results) { if (scanResult.advertisementData.serviceUuids.isNotEmpty) { // AppLog.log( - // '扫描到的设备:${scanResult.advertisementData.serviceUuids[0].toString()}'); + // '扫描到的设备:${scanResult.advertisementData.serviceUuids[0].toString()}====${scanResult.advertisementData.advName}'); } else { continue; } @@ -315,20 +315,30 @@ class BlueManage { } /// 判断是否包含指定的uuid - bool _isMatch(List serviceUuids, - {DeviceType deviceType = DeviceType.blue}) { - // 获取设备类型数组 - List deviceTypeList = getDeviceType(deviceType); - - // 检查 serviceUuids 是否包含 deviceTypeList 中的任意一个值 - if (serviceUuids != null && serviceUuids.isNotEmpty) { - return serviceUuids.any((uuid) { - return deviceTypeList - .any((type) => uuid.toLowerCase().contains(type.toLowerCase())); - }); + bool _isMatch(List serviceUuids, {DeviceType deviceType = DeviceType.blue}) { + final List prefixes = getDeviceType(deviceType).map((e) => e.toLowerCase()).toList(); + for (String uuid in serviceUuids) { + final String cleanUuid = uuid.replaceAll('-', '').toLowerCase(); + if (cleanUuid.length == 8) { + // 8位,判断前两位 + for (final prefix in prefixes) { + if (cleanUuid.startsWith(prefix)) { + return true; + } + } + } else if (cleanUuid.length == 32) { + // 128位,判断前8位的第3、第4位 + final String first8 = cleanUuid.substring(0, 8); + if (first8.length >= 4) { + final String thirdAndFourth = first8.substring(2, 4); // 索引2和3 + for (final prefix in prefixes) { + if (thirdAndFourth == prefix) { + return true; + } + } + } + } } - - // 如果 serviceUuids 为空,则返回 false return false; } diff --git a/lib/blue/io_type.dart b/lib/blue/io_type.dart index ee785811..a5f523b4 100755 --- a/lib/blue/io_type.dart +++ b/lib/blue/io_type.dart @@ -9,7 +9,7 @@ List getDeviceType(DeviceType deviceType) { List t = ['758824']; switch (deviceType) { case DeviceType.blue: - t = ['758824', '75']; + t = ['758824', '75', '768824', '76']; break; case DeviceType.gateway: t = ['758825']; From 130cc8f1336c189c82c8206b948fa2567eca0b21 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Fri, 23 May 2025 19:02:47 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/Gemfile | 2 +- ios/Gemfile | 1 + pubspec.lock | 80 +++++-------------------------------------------- 3 files changed, 10 insertions(+), 73 deletions(-) diff --git a/android/Gemfile b/android/Gemfile index cdd3a6b3..edb07877 100644 --- a/android/Gemfile +++ b/android/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" gem "fastlane" - +gem 'nkf', '0.2.0' plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/ios/Gemfile b/ios/Gemfile index 21cb5dfc..96415b71 100644 --- a/ios/Gemfile +++ b/ios/Gemfile @@ -3,5 +3,6 @@ source "https://rubygems.org" gem "fastlane" gem 'cocoapods', '1.14.3' gem 'public_suffix', '~> 4.0' +gem 'nkf', '0.2.0' plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/pubspec.lock b/pubspec.lock index b1ead27d..b099b594 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -24,30 +24,6 @@ packages: relative: true source: path version: "0.0.1" - amap_flutter_base: - dependency: transitive - description: - name: amap_flutter_base - sha256: "9ef2439b8de7100cdd1b4357701b8ca8c059c0f2d9d0257b81750bbf0c6f53bb" - url: "https://pub.dev" - source: hosted - version: "3.0.0" - amap_flutter_location: - dependency: "direct main" - description: - name: amap_flutter_location - sha256: f35ff00e196d579608e0bc28ccbc1f6f53787644702f947de941f775769cc701 - url: "https://pub.dev" - source: hosted - version: "3.0.0" - amap_flutter_map: - dependency: "direct main" - description: - name: amap_flutter_map - sha256: "9cebb0b2f5fc7d3ae0427e99c41edc883e8f5459f6a28bc850f0f9e16918cf2f" - url: "https://pub.dev" - source: hosted - version: "3.0.0" app_settings: dependency: "direct main" description: @@ -573,6 +549,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_app_badger: + dependency: "direct main" + description: + name: flutter_app_badger + sha256: "64d4a279bab862ed28850431b9b446b9820aaae0bf363322d51077419f930fa8" + url: "https://pub.dev" + source: hosted + version: "1.5.0" flutter_blue_plus: dependency: "direct main" description: @@ -788,30 +772,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.1" - google_maps: - dependency: transitive - description: - name: google_maps - sha256: "47eef3836b49bb030d5cb3afc60b8451408bf34cf753e571b645d6529eb4251a" - url: "https://pub.dev" - source: hosted - version: "7.1.0" - google_maps_flutter: - dependency: "direct main" - description: - name: google_maps_flutter - sha256: c1972cbad779bc5346c49045f26ae45550a0958b1cbca5b524dd3c8954995d28 - url: "https://pub.dev" - source: hosted - version: "2.6.1" - google_maps_flutter_android: - dependency: transitive - description: - name: google_maps_flutter_android - sha256: "0bcadb80eba39afda77dede89a6caafd3b68f2786b90491eceea4a01c3db181c" - url: "https://pub.dev" - source: hosted - version: "2.8.0" google_maps_flutter_ios: dependency: "direct overridden" description: @@ -828,14 +788,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.9.5" - google_maps_flutter_web: - dependency: transitive - description: - name: google_maps_flutter_web - sha256: f3155c12119d8a5c2732fdf39ceb5cc095bc662059a03b4ea23294ecebe1d199 - url: "https://pub.dev" - source: hosted - version: "0.5.8" html: dependency: transitive description: @@ -973,14 +925,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.7" - js_wrapping: - dependency: transitive - description: - name: js_wrapping - sha256: e385980f7c76a8c1c9a560dfb623b890975841542471eade630b2871d243851c - url: "https://pub.dev" - source: hosted - version: "0.7.4" json_annotation: dependency: transitive description: @@ -1381,14 +1325,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.27.7" - sanitize_html: - dependency: transitive - description: - name: sanitize_html - sha256: "12669c4a913688a26555323fb9cec373d8f9fbe091f2d01c40c723b33caa8989" - url: "https://pub.dev" - source: hosted - version: "2.1.0" scrollable_positioned_list: dependency: transitive description: From ab327e1a4f83191f6c633cbfeb06cc8b5c3d2251 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Fri, 23 May 2025 19:20:41 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/Gemfile.lock | 1 + ios/Gemfile.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/android/Gemfile.lock b/android/Gemfile.lock index 554a5952..ec32c3b5 100644 --- a/android/Gemfile.lock +++ b/android/Gemfile.lock @@ -216,6 +216,7 @@ PLATFORMS DEPENDENCIES fastlane fastlane-plugin-pgyer + nkf (= 0.2.0) BUNDLED WITH 1.17.2 diff --git a/ios/Gemfile.lock b/ios/Gemfile.lock index 8882903d..e8a3ba4d 100644 --- a/ios/Gemfile.lock +++ b/ios/Gemfile.lock @@ -282,6 +282,7 @@ DEPENDENCIES cocoapods (= 1.14.3) fastlane fastlane-plugin-pgyer + nkf (= 0.2.0) public_suffix (~> 4.0) BUNDLED WITH From f770a11e68c9b2a533ffbdb799b4cbe67393eccd Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 26 May 2025 11:23:35 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=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 eeb98d56..c287c9f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,6 +63,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get + - export PATH="/opt/homebrew/bin:$PATH" + - eval "$(rbenv init -)" + - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile android/Gemfile --quiet cache: paths: @@ -74,6 +77,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get + - export PATH="/opt/homebrew/bin:$PATH" + - eval "$(rbenv init -)" + - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile ios/Gemfile --quiet cache: paths: From 9f9c31862ec41944979576947627d57658091626 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 26 May 2025 11:55:16 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c287c9f7..e656594f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,9 +63,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get - - export PATH="/opt/homebrew/bin:$PATH" - - eval "$(rbenv init -)" - - bundle config mirror.https://rubygems.org https://gems.ruby-china.com +# - export PATH="/opt/homebrew/bin:$PATH" +# - eval "$(rbenv init -)" +# - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile android/Gemfile --quiet cache: paths: @@ -77,9 +77,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get - - export PATH="/opt/homebrew/bin:$PATH" - - eval "$(rbenv init -)" - - bundle config mirror.https://rubygems.org https://gems.ruby-china.com +# - export PATH="/opt/homebrew/bin:$PATH" +# - eval "$(rbenv init -)" +# - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile ios/Gemfile --quiet cache: paths: From 09f75dbd4ad5effbaaefc6411a056b6a6d140c01 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 26 May 2025 11:57:28 +0800 Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e656594f..c287c9f7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,9 +63,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get -# - export PATH="/opt/homebrew/bin:$PATH" -# - eval "$(rbenv init -)" -# - bundle config mirror.https://rubygems.org https://gems.ruby-china.com + - export PATH="/opt/homebrew/bin:$PATH" + - eval "$(rbenv init -)" + - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile android/Gemfile --quiet cache: paths: @@ -77,9 +77,9 @@ variables: - ls -li - export NEXT_VERSION="$(cat app_new.version)" # - flutter pub get -# - export PATH="/opt/homebrew/bin:$PATH" -# - eval "$(rbenv init -)" -# - bundle config mirror.https://rubygems.org https://gems.ruby-china.com + - export PATH="/opt/homebrew/bin:$PATH" + - eval "$(rbenv init -)" + - bundle config mirror.https://rubygems.org https://gems.ruby-china.com - bundle install --gemfile ios/Gemfile --quiet cache: paths: From 261a0363e5aa8d047f5015df3b22a19da4067a42 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 26 May 2025 12:05:01 +0800 Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/Gemfile.lock | 69 +++++++++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 30 deletions(-) diff --git a/android/Gemfile.lock b/android/Gemfile.lock index ec32c3b5..66db029a 100644 --- a/android/Gemfile.lock +++ b/android/Gemfile.lock @@ -9,21 +9,23 @@ GEM public_suffix (>= 2.0.2, < 7.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.0) - aws-partitions (1.979.0) - aws-sdk-core (3.209.1) + aws-eventstream (1.3.2) + aws-partitions (1.1107.0) + aws-sdk-core (3.224.0) aws-eventstream (~> 1, >= 1.3.0) - aws-partitions (~> 1, >= 1.651.0) + aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) + base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.94.0) - aws-sdk-core (~> 3, >= 3.207.0) + logger + aws-sdk-kms (1.101.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.166.0) - aws-sdk-core (~> 3, >= 3.207.0) + aws-sdk-s3 (1.186.1) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sigv4 (1.10.0) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) @@ -33,7 +35,7 @@ GEM commander (4.6.0) highline (~> 2.0.0) declarative (0.0.20) - digest-crc (0.6.5) + digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) @@ -59,8 +61,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) + faraday-multipart (1.1.0) + multipart-post (~> 2.0) faraday-net_http (1.0.2) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -68,8 +70,8 @@ GEM faraday-retry (1.0.3) faraday_middleware (1.2.1) faraday (~> 1.0) - fastimage (2.3.1) - fastlane (2.222.0) + fastimage (2.4.0) + fastlane (2.227.2) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -85,6 +87,7 @@ GEM faraday-cookie_jar (~> 0.0.6) faraday_middleware (~> 1.0) fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) gh_inspector (>= 1.1.2, < 2.0.0) google-apis-androidpublisher_v3 (~> 0.3) google-apis-playcustomapp_v1 (~> 0.1) @@ -108,9 +111,11 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) + xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-plugin-pgyer (0.2.9) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) gh_inspector (1.1.3) google-apis-androidpublisher_v3 (0.54.0) google-apis-core (>= 0.11.0, < 2.a) @@ -149,23 +154,26 @@ GEM os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) highline (2.0.3) - http-cookie (1.0.7) + http-cookie (1.0.8) domain_name (~> 0.5) - httpclient (2.8.3) + httpclient (2.9.0) + mutex_m jmespath (1.6.2) - json (2.7.2) - jwt (2.9.1) + json (2.7.6) + jwt (2.10.1) base64 + logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) multi_json (1.15.0) multipart-post (2.4.1) - nanaimo (0.3.0) + mutex_m (0.3.0) + nanaimo (0.4.0) naturally (2.2.1) nkf (0.2.0) - optparse (0.5.0) + optparse (0.6.0) os (1.1.4) - plist (3.7.1) + plist (3.7.2) public_suffix (5.1.1) rake (13.2.1) representable (3.2.0) @@ -173,10 +181,10 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.3.7) - rouge (2.0.7) + rexml (3.4.1) + rouge (3.28.0) ruby2_keywords (0.0.5) - rubyzip (2.3.2) + rubyzip (2.4.1) security (0.1.5) signet (0.18.0) addressable (~> 2.8) @@ -186,6 +194,7 @@ GEM simctl (1.6.10) CFPropertyList naturally + sysrandom (1.0.5) terminal-notifier (2.0.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) @@ -198,15 +207,15 @@ GEM unf (0.2.0) unicode-display_width (2.6.0) word_wrap (1.0.0) - xcodeproj (1.25.0) + xcodeproj (1.27.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) - rexml (>= 3.3.2, < 4.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.1) + rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) From 5d0da71780ed03a2e7ead5346f8bb81278adcd30 Mon Sep 17 00:00:00 2001 From: Liuyf Date: Mon, 26 May 2025 14:15:27 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/fastlane/Fastfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index 3591770d..4f8650e0 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -89,7 +89,8 @@ platform :ios do sh("flutter","pub","get") end Dir.chdir ".." do - sh("bundle", "exec" ,"pod", "install") + #sh("bundle", "exec" ,"pod", "install") + sh("pod", "install") end Dir.chdir "../.." do sh("flutter", "build", "ios", "--no-tree-shake-icons", "--no-codesign", "--release", "--flavor", "#{flavor}", "-t", "lib/main_#{flavor}_#{env}.dart", "--build-number=#{build_number}", "--build-name=#{build_version}")