From d71d3505abefe76c12ec737e833b8d45cbe90da5 Mon Sep 17 00:00:00 2001 From: niuhuan Date: Wed, 18 May 2022 11:57:38 +0800 Subject: [PATCH] Fix words misstake Update ci upgrade --- .github/workflows/Release.yml | 10 ++-- .gitignore | 1 + ci/version.code.txt | 2 +- ci/version.info.txt | 6 +-- lib/screens/DownloadExportToFileScreen.dart | 2 +- pubspec.lock | 59 +++++++++------------ pubspec.yaml | 10 ++-- 7 files changed, 43 insertions(+), 47 deletions(-) diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 4c8b948..ad09f19 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -54,13 +54,16 @@ jobs: config: - target: linux host: ubuntu-latest - flutter_version: '3.0.0' + flutter_version: '2.10.3' + - target: linux + host: ubuntu-latest + flutter_version: '2.10.3' - target: windows host: windows-latest - flutter_version: '3.0.0' + flutter_version: '2.10.3' - target: macos host: macos-latest - flutter_version: '3.0.0' + flutter_version: '2.10.3' - target: ios host: macos-latest flutter_version: '3.0.0' @@ -145,6 +148,7 @@ jobs: flutter-version: ${{ env.flutter_version }} - name: Check core + if: steps.check_asset.outputs.skip_build != 'true' uses: actions/checkout@v3 with: repository: 'niuhuan/pikapika-go-core' diff --git a/.gitignore b/.gitignore index 68f0aa2..e912de3 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ ios/build/ # APP /lib/assets/version.txt + diff --git a/ci/version.code.txt b/ci/version.code.txt index c9b3c01..74a63a2 100644 --- a/ci/version.code.txt +++ b/ci/version.code.txt @@ -1 +1 @@ -v1.5.1 \ No newline at end of file +v1.5.2 \ No newline at end of file diff --git a/ci/version.info.txt b/ci/version.info.txt index ad31b5c..54fe530 100644 --- a/ci/version.info.txt +++ b/ci/version.info.txt @@ -1,4 +1,2 @@ -- [x] 修复一些BUG -- [x] 优化阅读器 (之前丢了一部分代码, 导致被回滚了, 全屏按钮重新写了一遍) -- [x] 优化导入导出 / 保存图片等文件系统交互操作 -- [x] 优化推荐栏目 +- [x] iOS/Android 借助生物识别程序的软件锁 +- [x] iOS高刷新率 diff --git a/lib/screens/DownloadExportToFileScreen.dart b/lib/screens/DownloadExportToFileScreen.dart index 7461cf5..9341bd2 100644 --- a/lib/screens/DownloadExportToFileScreen.dart +++ b/lib/screens/DownloadExportToFileScreen.dart @@ -277,7 +277,7 @@ class _DownloadExportToFileScreenState }); } }, - child: _buildButtonInner('将所有图片到处到手机相机'), + child: _buildButtonInner('将所有图片导出到手机相册'), )); widgets.add(Container(height: 10)); } diff --git a/pubspec.lock b/pubspec.lock index 2a57789..314cd46 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: another_xlider url: "https://pub.dartlang.org" source: hosted - version: "1.0.1+2" + version: "1.1.0" archive: dependency: transitive description: @@ -77,7 +77,7 @@ packages: name: cross_file url: "https://pub.dartlang.org" source: hosted - version: "0.3.2" + version: "0.3.3" crypto: dependency: transitive description: @@ -112,7 +112,7 @@ packages: name: ffi url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.2.1" file_picker: dependency: "direct main" description: @@ -150,7 +150,7 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.6" flutter_search_bar: dependency: "direct main" description: @@ -164,14 +164,14 @@ packages: name: flutter_styled_toast url: "https://pub.dartlang.org" source: hosted - version: "2.0.0" + version: "2.1.3" flutter_svg: dependency: "direct main" description: name: flutter_svg url: "https://pub.dartlang.org" source: hosted - version: "0.22.0" + version: "1.0.3" flutter_test: dependency: "direct dev" description: flutter @@ -195,7 +195,7 @@ packages: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" image: dependency: "direct main" description: @@ -216,35 +216,35 @@ packages: name: image_picker url: "https://pub.dartlang.org" source: hosted - version: "0.8.5" + version: "0.8.5+3" image_picker_android: dependency: transitive description: name: image_picker_android url: "https://pub.dartlang.org" source: hosted - version: "0.8.4+11" + version: "0.8.4+13" image_picker_for_web: dependency: transitive description: name: image_picker_for_web url: "https://pub.dartlang.org" source: hosted - version: "2.1.6" + version: "2.1.8" image_picker_ios: dependency: transitive description: name: image_picker_ios url: "https://pub.dartlang.org" source: hosted - version: "0.8.5" + version: "0.8.5+5" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.4.4" + version: "2.5.0" intl: dependency: transitive description: @@ -321,21 +321,14 @@ packages: name: path_drawing url: "https://pub.dartlang.org" source: hosted - version: "0.5.1+1" + version: "1.0.0" path_parsing: dependency: transitive description: name: path_parsing url: "https://pub.dartlang.org" source: hosted - version: "0.2.1" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.11.1" + version: "1.0.0" permission_handler: dependency: "direct main" description: @@ -356,7 +349,7 @@ packages: name: petitparser url: "https://pub.dartlang.org" source: hosted - version: "4.4.0" + version: "5.0.0" photo_view: dependency: "direct main" description: @@ -431,42 +424,42 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" url_launcher: dependency: "direct main" description: name: url_launcher url: "https://pub.dartlang.org" source: hosted - version: "6.1.0" + version: "6.1.2" url_launcher_android: dependency: transitive description: name: url_launcher_android url: "https://pub.dartlang.org" source: hosted - version: "6.0.16" + version: "6.0.17" url_launcher_ios: dependency: transitive description: name: url_launcher_ios url: "https://pub.dartlang.org" source: hosted - version: "6.0.15" + version: "6.0.17" url_launcher_linux: dependency: transitive description: name: url_launcher_linux url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" url_launcher_platform_interface: dependency: transitive description: @@ -480,14 +473,14 @@ packages: name: url_launcher_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.9" + version: "2.0.11" url_launcher_windows: dependency: transitive description: name: url_launcher_windows url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "3.0.1" vector_math: dependency: transitive description: @@ -501,14 +494,14 @@ packages: name: win32 url: "https://pub.dartlang.org" source: hosted - version: "2.5.2" + version: "2.6.1" xml: dependency: transitive description: name: xml url: "https://pub.dartlang.org" source: hosted - version: "5.3.1" + version: "5.4.1" sdks: - dart: ">=2.17.0-0 <3.0.0" + dart: ">=2.17.0 <3.0.0" flutter: ">=2.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index b2ebe8a..5e7a15f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -31,11 +31,11 @@ dependencies: isolate: ^2.1.1 event: ^2.0.5 flutter_search_bar: ^3.0.0-dev.1 - flutter_svg: ^0.22.0 - flutter_styled_toast: ^2.0.0 - another_xlider: ^1.0.0 + flutter_svg: ^1.0.3 + flutter_styled_toast: ^2.1.3 + another_xlider: ^1.1.0 scrollable_positioned_list: ^0.2.0-nullsafety.0 - permission_handler: ^8.1.4+1 + permission_handler: ^8.3.0 url_launcher: ^6.0.9 clipboard: ^0.1.3 photo_view: ^0.13.0 @@ -43,7 +43,7 @@ dependencies: flutter_datetime_picker: ^1.5.1 modal_bottom_sheet: ^2.0.0 image_cropper: ^1.5.0 - image_picker: ^0.8.4+9 + image_picker: ^0.8.5 file_picker: ^4.5.1 crop_image: ^1.0.2 image: ^3.1.3