From 6e988a087ad17026646b4222e27cd4945da8124f Mon Sep 17 00:00:00 2001 From: niuhuan Date: Fri, 3 Nov 2023 13:12:15 +0800 Subject: [PATCH] :zap: 131 --- ci/version.code.txt | 2 +- ci/version.info.txt | 7 +++ ios/Podfile.lock | 55 +++++++++++++++++- ios/Runner.xcodeproj/project.pbxproj | 2 +- .../xcshareddata/xcschemes/Runner.xcscheme | 2 +- lib/configs/host.dart | 7 ++- lib/screens/comic_info_screen.dart | 54 +++++++++++++++-- lib/screens/pro_screen.dart | 3 + pubspec.lock | 58 +++++++++---------- pubspec.yaml | 2 +- 10 files changed, 149 insertions(+), 43 deletions(-) diff --git a/ci/version.code.txt b/ci/version.code.txt index 06043b8..23c38c2 100644 --- a/ci/version.code.txt +++ b/ci/version.code.txt @@ -1 +1 @@ -v1.2.2 \ No newline at end of file +v1.3.1 \ No newline at end of file diff --git a/ci/version.info.txt b/ci/version.info.txt index 8973c8f..78d8cb2 100644 --- a/ci/version.info.txt +++ b/ci/version.info.txt @@ -1,3 +1,10 @@ +v1.3.1 +- [x] ✨长按标题复制 +- [x] ♻️显示分类和页数 +- [x] ♻️修复一点点不能显示的图片 +- [x] 🚀增加一些分流 +- [x] 🐛修复搜索错误 + v1.2.2 - [x] 🚀导出 diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 8ac807a..7349209 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,16 +1,64 @@ PODS: + - DKImagePickerController/Core (4.3.4): + - DKImagePickerController/ImageDataManager + - DKImagePickerController/Resource + - DKImagePickerController/ImageDataManager (4.3.4) + - DKImagePickerController/PhotoGallery (4.3.4): + - DKImagePickerController/Core + - DKPhotoGallery + - DKImagePickerController/Resource (4.3.4) + - DKPhotoGallery (0.0.17): + - DKPhotoGallery/Core (= 0.0.17) + - DKPhotoGallery/Model (= 0.0.17) + - DKPhotoGallery/Preview (= 0.0.17) + - DKPhotoGallery/Resource (= 0.0.17) + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Core (0.0.17): + - DKPhotoGallery/Model + - DKPhotoGallery/Preview + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Model (0.0.17): + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Preview (0.0.17): + - DKPhotoGallery/Model + - DKPhotoGallery/Resource + - SDWebImage + - SwiftyGif + - DKPhotoGallery/Resource (0.0.17): + - SDWebImage + - SwiftyGif + - file_picker (0.0.1): + - DKImagePickerController/PhotoGallery + - Flutter - Flutter (1.0.0) - permission_handler_apple (9.1.0): - Flutter + - SDWebImage (5.18.3): + - SDWebImage/Core (= 5.18.3) + - SDWebImage/Core (5.18.3) + - SwiftyGif (5.4.4) - url_launcher_ios (0.0.1): - Flutter DEPENDENCIES: + - file_picker (from `.symlinks/plugins/file_picker/ios`) - Flutter (from `Flutter`) - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) +SPEC REPOS: + trunk: + - DKImagePickerController + - DKPhotoGallery + - SDWebImage + - SwiftyGif + EXTERNAL SOURCES: + file_picker: + :path: ".symlinks/plugins/file_picker/ios" Flutter: :path: Flutter permission_handler_apple: @@ -19,10 +67,15 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/url_launcher_ios/ios" SPEC CHECKSUMS: + DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac + DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179 + file_picker: ce3938a0df3cc1ef404671531facef740d03f920 Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854 permission_handler_apple: 8f116445eff3c0e7c65ad60f5fef5490aa94b4e4 + SDWebImage: 96e0c18ef14010b7485210e92fac888587ebb958 + SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 2856ba1..0d4bad1 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -159,7 +159,7 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1300; + LastUpgradeCheck = 1430; ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index c87d15a..a6b826d 100644 --- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ { Container(height: 20), Container( margin: const EdgeInsets.only(left: 20, right: 20), - child: Text( - widget.comicSimple.title, - textAlign: TextAlign.center, - style: const TextStyle( - fontSize: 18, - fontWeight: FontWeight.bold, + child: GestureDetector( + onLongPress: () { + confirmCopy(context, widget.comicSimple.title); + }, + child: Text( + widget.comicSimple.title, + textAlign: TextAlign.center, + style: const TextStyle( + fontSize: 18, + fontWeight: FontWeight.bold, + ), ), ), ), @@ -192,6 +197,13 @@ class _ComicInfoScreenState extends State { )), ), Container(height: 10), + Container( + margin: const EdgeInsets.only(left: 20, right: 20), + child: Wrap( + children: (item.comicInfo.labels.map(_buildLabel)).toList(), + ), + ), + Container(height: 10), Container( margin: const EdgeInsets.only(left: 20, right: 20), child: Wrap( @@ -283,6 +295,36 @@ class _ComicInfoScreenState extends State { ); } + Widget _buildLabel(String tag) { + return GestureDetector( + onTap: () { + // Navigator.of(context) + // .push(MaterialPageRoute(builder: (BuildContext context) { + // return BrowserScreen(tag: tag); + // })); + }, + child: Card( + elevation: 0, + child: Text.rich(TextSpan( + style: const TextStyle(fontSize: 10), + children: [ + WidgetSpan( + child: ClipRRect( + borderRadius: const BorderRadius.all(Radius.circular(4.0)), + child: Container( + color: Colors.grey.withAlpha(20), + padding: const EdgeInsets.only( + top: 4, bottom: 4, left: 4, right: 4), + child: Text(tag), + ), + ), + ), + ], + )), + ), + ); + } + Widget _buildTag(String tag) { return GestureDetector( onTap: () { diff --git a/lib/screens/pro_screen.dart b/lib/screens/pro_screen.dart index 0b6600d..653429d 100644 --- a/lib/screens/pro_screen.dart +++ b/lib/screens/pro_screen.dart @@ -202,6 +202,7 @@ class _ProServerNameWidgetState extends State { context, title: "选择发电方式", values: { + "核能发电": "JP", "风力发电": "HK", "水力发电": "US", }, @@ -218,6 +219,8 @@ class _ProServerNameWidgetState extends State { String _loadServerName() { switch (_serverName) { + case "JP": + return "核能发电"; case "HK": return "风力发电"; case "US": diff --git a/pubspec.lock b/pubspec.lock index 56b597c..23846e2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: async - sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" url: "https://pub.dev" source: hosted - version: "2.10.0" + version: "2.11.0" boolean_selector: dependency: transitive description: @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: characters - sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clipboard: dependency: "direct main" description: @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: collection - sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 url: "https://pub.dev" source: hosted - version: "1.17.0" + version: "1.17.2" convert: dependency: "direct main" description: @@ -193,18 +193,10 @@ packages: dependency: transitive description: name: intl - sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" - url: "https://pub.dev" - source: hosted - version: "0.17.0" - js: - dependency: transitive - description: - name: js - sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" url: "https://pub.dev" source: hosted - version: "0.6.5" + version: "0.18.1" lints: dependency: transitive description: @@ -217,26 +209,26 @@ packages: dependency: transitive description: name: matcher - sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" url: "https://pub.dev" source: hosted - version: "0.12.13" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "0.5.0" meta: dependency: transitive description: name: meta - sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" modal_bottom_sheet: dependency: "direct main" description: @@ -249,10 +241,10 @@ packages: dependency: transitive description: name: path - sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" path_drawing: dependency: transitive description: @@ -358,10 +350,10 @@ packages: dependency: transitive description: name: source_span - sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" stack_trace: dependency: transitive description: @@ -398,10 +390,10 @@ packages: dependency: transitive description: name: test_api - sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" url: "https://pub.dev" source: hosted - version: "0.4.16" + version: "0.6.0" typed_data: dependency: transitive description: @@ -482,6 +474,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" win32: dependency: transitive description: @@ -499,5 +499,5 @@ packages: source: hosted version: "6.2.2" sdks: - dart: ">=2.19.0 <3.0.0" + dart: ">=3.1.0-185.0.dev <4.0.0" flutter: ">=3.7.0" diff --git a/pubspec.yaml b/pubspec.yaml index f73a1f7..995c675 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. # Read more about iOS versioning at # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -version: 1.2.2+7 +version: 1.3.1+8 environment: sdk: ">=2.16.1 <3.0.0"