flutter sdk 版本升级到3.10.6

README.md

@@ -4,11 +4,11 @@
 ## 环境准备
 首先得有 Flutter 开发环境，安装 Flutter SDK 、Android 或者 iOS 的开发环境。
 
-目前源码是在 Flutter  如下版本环境下进行开发的，如果你的环境不一直，请改成一样的，否则需要自行解决包冲突的各种问题。
+目前源码是在 Flutter  如下版本环境下进行开发的，如果你的环境一致，请改成一样的，否则需要自行解决依赖包冲突的各种问题！
 
 Flutter SDK 版本：
 ```
-Flutter (Channel stable, 3.7.12)
+Flutter (Channel stable, 3.10.6)
 ```
 
 环境安装后请使用 `flutter doctor` 命令，检查开发环境是否正确。

android/build.gradle

@@ -26,6 +26,6 @@ subprojects {
     project.evaluationDependsOn(':app')
 }
 
-task clean(type: Delete) {
+tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }

lib/common/routers/pages.dart

@@ -32,7 +32,6 @@ import '../../pages/apps/yunpan/folder_picker/index.dart';
 import '../../pages/apps/yunpan/index.dart';
 import '../../pages/apps/yunpan/share_list/index.dart';
 import '../../pages/apps/yunpan/upload_history_list/index.dart';
-import '../../pages/common/baidu_map/index.dart';
 import '../../pages/common/create_form/index.dart';
 import '../../pages/common/inner_webview/index.dart';
 import '../../pages/common/input_form/index.dart';

lib/common/utils/javascript_handler.dart

@@ -17,7 +17,6 @@ import '../api/index.dart';
 import '../models/index.dart';
 import '../routers/index.dart';
 import '../widgets/index.dart';
-import 'baidu_location_helper.dart';
 import 'javascript_navigation_interface.dart';
 import 'loading.dart';
 import 'log_util.dart';
@@ -612,7 +611,7 @@ class O2JavascriptHandler {
 
   ///  定位
   _location(JsMessage jsMessage) async {
-    final callback = jsMessage.callback ?? '';
+    // final callback = jsMessage.callback ?? '';
     // final helper = BaiduLocationHelper(
     //     callback: (result) {
     //       OLogger.d('定位返回结果 ${result.latitude} ${result.longitude}');

lib/main.dart

-import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_easyloading/flutter_easyloading.dart';

lib/pages/apps/mindMap/mind_map_view.dart

@@ -935,7 +935,7 @@ class MindMapViewState extends State<MindMapView>
     if (node.data.id == selectId) {
       _setData(node.data, data);
     } else {
-      if (node.children != null && node.children.length > 0) {
+      if (node.children.isNotEmpty) {
         for (var child in node.children) {
           _searchForUpdateSelectData(child, data, selectId);
         }
@@ -967,7 +967,7 @@ class MindMapViewState extends State<MindMapView>
 
   //给Node添加子节点
   void _addChild(Node n) {
-    int childNum = n.children == null ? 0 : n.children.length;
+    int childNum = n.children.length;
     childNum++;
     final time = DateTime.now().millisecond;
     final id = 'mind_$time';

lib/pages/home/im/im_chat/controller.dart

@@ -473,8 +473,8 @@ class ImChatController extends my_get.GetxController {
 
   void clickChooseLocationBtn() async {
     OLogger.d("选择位置");
-    LocationData locationData =
-        LocationData(LocationData.locationDataModePicker);
+    // LocationData locationData =
+    //     LocationData(LocationData.locationDataModePicker);
     // var location = await BaiduMapPage.open(locationData);
     // if (location != null && location is LocationData) {
     //   OLogger.d(

lib/pages/home/search/widgets/search_history.dart

@@ -3,9 +3,9 @@ import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
 import '../../../../common/widgets/index.dart';
-import '../controller.dart';
+import '../controller.dart' as search;
 
-class SearchHistory extends GetView<SearchController> {
+class SearchHistory extends GetView<search.SearchController> {
   const SearchHistory({Key? key}) : super(key: key);
 
   @override

lib/pages/home/search/widgets/search_list.dart

@@ -5,10 +5,10 @@ import 'package:pull_to_refresh/pull_to_refresh.dart';
 import 'package:o2oa_all_platform/common/extension/index.dart';
 
 import '../../../../common/models/index.dart';
-import '../index.dart';
+import '../controller.dart' as search;
 
 /// List
-class SearchListView extends GetView<SearchController> {
+class SearchListView extends GetView<search.SearchController> {
   const SearchListView({Key? key}) : super(key: key);
 
   @override

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -9,7 +9,7 @@ import audioplayers_darwin
 import device_info_plus_macos
 import local_notifier
 import mobile_scanner
-import package_info_plus_macos
+import package_info_plus
 import path_provider_foundation
 import shared_preferences_foundation
 import url_launcher_macos

pubspec.lock

@@ -37,10 +37,10 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
+      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.10.0"
+    version: "2.11.0"
   audioplayers:
     dependency: "direct main"
     description:
@@ -125,10 +125,10 @@ packages:
     dependency: transitive
     description:
       name: characters
-      sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
+      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.1"
+    version: "1.3.0"
   clock:
     dependency: transitive
     description:
@@ -141,10 +141,10 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
+      sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.17.0"
+    version: "1.17.1"
   context_menus:
     dependency: "direct main"
     description:
@@ -335,10 +335,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_screenutil
-      sha256: "0a122936b450324cbdfd51be0819cc6fcebb093eb65585e9cd92263f7a1a8a39"
+      sha256: "8cf100b8e4973dc570b6415a2090b0bfaa8756ad333db46939efc3e774ee100d"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "5.7.0"
+    version: "5.9.0"
   flutter_slidable:
     dependency: "direct main"
     description:
@@ -449,11 +449,12 @@ packages:
   image_crop:
     dependency: "direct main"
     description:
-      name: image_crop
-      sha256: a580010f9e90b20581ecf5e8f4e9aa838cb935ea1497f9d1b196baa382b84a6d
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.4.1"
+      path: "."
+      ref: HEAD
+      resolved-ref: e9cb3cb80f03c25107057396b73a3da97122cd3d
+      url: "git@gitee.com:17161934/image_crop.git"
+    source: git
+    version: "0.4.2"
   image_picker:
     dependency: "direct main"
     description:
@@ -498,10 +499,10 @@ packages:
     dependency: transitive
     description:
       name: intl
-      sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
+      sha256: a3715e3bc90294e971cb7dc063fbf3cd9ee0ebf8604ffeafabd9e6f16abbdbe6
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.17.0"
+    version: "0.18.0"
   jpush_flutter:
     dependency: "direct main"
     description:
@@ -514,10 +515,10 @@ packages:
     dependency: transitive
     description:
       name: js
-      sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
+      sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.5"
+    version: "0.6.7"
   lints:
     dependency: transitive
     description:
@@ -546,10 +547,10 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
+      sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.13"
+    version: "0.12.15"
   material_color_utilities:
     dependency: transitive
     description:
@@ -562,10 +563,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
+      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.0"
+    version: "1.9.1"
   mobile_scanner:
     dependency: "direct main"
     description:
@@ -594,58 +595,26 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: f62d7253edc197fe3c88d7c2ddab82d68f555e778d55390ccc3537eca8e8d637
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.4.3+1"
-  package_info_plus_linux:
-    dependency: transitive
-    description:
-      name: package_info_plus_linux
-      sha256: "04b575f44233d30edbb80a94e57cad9107aada334fc02aabb42b6becd13c43fc"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.0.5"
-  package_info_plus_macos:
-    dependency: transitive
-    description:
-      name: package_info_plus_macos
-      sha256: a2ad8b4acf4cd479d4a0afa5a74ea3f5b1c7563b77e52cc32b3ee6956d5482a6
+      sha256: "10259b111176fba5c505b102e3a5b022b51dd97e30522e906d6922c745584745"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "3.1.2"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
       name: package_info_plus_platform_interface
-      sha256: f7a0c8f1e7e981bc65f8b64137a53fd3c195b18d429fba960babc59a5a1c7ae8
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "1.0.2"
-  package_info_plus_web:
-    dependency: transitive
-    description:
-      name: package_info_plus_web
-      sha256: f0829327eb534789e0a16ccac8936a80beed4e2401c4d3a74f3f39094a822d3b
+      sha256: "9bc8ba46813a4cc42c66ab781470711781940780fd8beddd0c3da62506d3a6c6"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.6"
-  package_info_plus_windows:
-    dependency: transitive
-    description:
-      name: package_info_plus_windows
-      sha256: "79524f11c42dd9078b96d797b3cf79c0a2883a50c4920dc43da8562c115089bc"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "2.1.0"
+    version: "2.0.1"
   path:
     dependency: "direct main"
     description:
       name: path
-      sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
+      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.3"
   path_provider:
     dependency: "direct main"
     description:
@@ -919,10 +888,10 @@ packages:
     dependency: "direct main"
     description:
       name: table_calendar
-      sha256: "7f1270313c0cdb245b583ed8518982c01d4a7e95869b3c30abcbae3b642c45d0"
+      sha256: "1e3521a3e6d3fc7f645a58b135ab663d458ab12504f1ea7f9b4b81d47086c478"
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.8"
+    version: "3.0.9"
   term_glyph:
     dependency: transitive
     description:
@@ -935,10 +904,10 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
+      sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
       url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.4.16"
+    version: "0.5.1"
   typed_data:
     dependency: transitive
     description:
@@ -1100,5 +1069,5 @@ packages:
     source: hosted
     version: "6.1.0"
 sdks:
-  dart: ">=2.19.6 <3.0.0"
-  flutter: ">=3.3.0"
+  dart: ">=3.0.0-0 <4.0.0"
+  flutter: ">=3.10.0"

pubspec.yaml

@@ -15,10 +15,10 @@ 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: 8.2.1+321
+version: 8.2.2+322
 
 environment:
-  sdk: ">=2.17.0 <=3.0.1"
+  sdk: ">=2.17.0 <4.0.0"
 
 # Dependencies specify other packages that your package needs in order to work.
 # To automatically upgrade your package dependencies to the latest versions
@@ -50,7 +50,7 @@ dependencies:
   # 极光推送
   jpush_flutter: 2.3.3
   # 屏幕适配
-  flutter_screenutil: ^5.5.3+2
+  flutter_screenutil: ^5.9.0
   # 下拉刷新
   pull_to_refresh: ^2.0.0
   # easyloading
@@ -91,11 +91,14 @@ dependencies:
   # qq、微信群头像
   nine_grid_view: ^2.0.0
   # 头像裁剪
-  image_crop: ^0.4.1
+  # image_crop: ^0.4.1
+  image_crop:
+    git:
+      url: git@gitee.com:17161934/image_crop.git
   # 跳转到系统设置
   app_settings: 4.1.8
   # 版本信息
-  package_info_plus: ^1.4.3+1
+  package_info_plus: ^3.1.2
   # group listview
   grouped_list: ^5.1.2
   # 横拉操作菜单 脑图用