Merge branch 'master' of https://git.yoqi.me/lyq/flutter_habit

lib/pages/home_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_habit/common/BaseArchitectural.dart';
-import 'package:flutter_habit/common/I18N.dart';
 import 'package:flutter_habit/provider/UserProvider.dart';
 import 'package:flutter_habit/view/context/ExerciseInfoContext.dart';
 import 'package:flutter_habit/view/context/LifeInfoContext.dart';

lib/view/context/LifeInfoContext.dart

@@ -131,7 +131,7 @@ class LifeInfoContextService extends BaseProvider {
 class _LifeInfoContextView extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
-    LifeInfoContextService service =
+    // LifeInfoContextService service =
         Provider.of<LifeInfoContextService>(context, listen: false);
     return ListView(
       children: <Widget>[

lib/view/context/widget/DateTimeMultiLineChart.dart

@@ -23,9 +23,9 @@ class DateTimeMultiLineChart extends StatelessWidget {
         // 圆滑
         isCurved: size > 7,
         // 线条颜色
-        colors: [
+        color: 
           Provider.of<ThemeProvider>(context, listen: false).otherColors[i]
-        ],
+        ,
         // 线条宽度
         barWidth: 3,
         // 起点和终点是否圆滑
@@ -33,15 +33,15 @@ class DateTimeMultiLineChart extends StatelessWidget {
         // 点配置
         dotData: FlDotData(
           show: size < 30,
-          getDotColor: (spot, percent, barData) =>
-              Provider.of<ThemeProvider>(context, listen: false).otherColors[i],
-          dotSize: 3,
+          // getDotColor: (spot, percent, barData) =>
+          //     Provider.of<ThemeProvider>(context, listen: false).otherColors[i],
+          // dotSize: 3,
         ),
         belowBarData: BarAreaData(
           show: false,
-          colors: [
+          color: 
             Theme.of(context).colorScheme.secondary.withOpacity(0.1 / (i + 1))
-          ],
+          ,
         ),
       );
       i = (i + 1) % (themeColors.length - 1);
@@ -129,7 +129,7 @@ class DateTimeMultiLineChart extends StatelessWidget {
                 padding: EdgeInsets.only(top: 20, left: 10, right: 20),
                 child: LineChart(
                   LineChartData(
-                    clipToBorder: true,
+                    // clipToBorder: true,
                     // 边框信息
                     borderData: FlBorderData(
                       show: true,
@@ -179,37 +179,37 @@ class DateTimeMultiLineChart extends StatelessWidget {
                     titlesData: FlTitlesData(
                       show: true,
                       // 下方文字
-                      bottomTitles: SideTitles(
+                      bottomTitles: AxisTitles(
                         // 每隔几个显示一个底部标签
-                        interval: xInterval,
-                        showTitles: true,
+                        // inte、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、、rval: xInterval,
+                        // showTitles: true,
                         // 文字与图表上边界距离
 //          margin: 8,
                         // 文字预留空间
 //          reservedSize: 22,
-                        textStyle: Theme.of(context).textTheme.bodyMedium,
-                        getTitles: (value) {
-                          DateTime dateTime =
-                              ConvertUtils.dateTimeOfLocalDaysSinceEpoch(value);
-                          return "${dateTime.month}-${dateTime.day}";
-                        },
+                        // textStyle: Theme.of(context).textTheme.bodyMedium,
+                        // getTitles: (value) {
+                        //   DateTime dateTime =
+                        //       ConvertUtils.dateTimeOfLocalDaysSinceEpoch(value);
+                        //   return "${dateTime.month}-${dateTime.day}";
+                        // },
                       ),
-                      leftTitles: SideTitles(
+                      leftTitles: AxisTitles(
                         // 每隔几个显示一个左侧标签
-                        interval: yInterval,
-                        showTitles: true,
+                        // interval: yInterval,
+                        // showTitles: true,
                         // 文字与图表左边界距离
 //          margin: 8,
                         // 文字预留空间
-                        reservedSize: 30,
-                        textStyle: Theme.of(context).textTheme.bodyMedium,
-                        getTitles: (value) {
-                          int hour = 24 - value.floor();
-                          if (hour < 10) {
-                            return "0$hour:00";
-                          }
-                          return "$hour:00";
-                        },
+                        // reservedSize: 30,
+                        // textStyle: Theme.of(context).textTheme.bodyMedium,
+                        // getTitles: (value) {
+                        //   int hour = 24 - value.floor();
+                        //   if (hour < 10) {
+                        //     return "0$hour:00";
+                        //   }
+                        //   return "$hour:00";
+                        // },
                       ),
                     ),
                     // 各轴显示的最值 (不设置则缩放)

lib/view/context/widget/DateValueMultiLineChart.dart

@@ -23,9 +23,9 @@ class DateValueMultiLineChart extends StatelessWidget {
         // 圆滑
         isCurved: size > 7,
         // 线条颜色
-        colors: [
+        color: 
           Provider.of<ThemeProvider>(context, listen: false).otherColors[i]
-        ],
+        ,
         // 线条宽度
         barWidth: 3,
         // 起点和终点是否圆滑
@@ -33,15 +33,15 @@ class DateValueMultiLineChart extends StatelessWidget {
         // 点配置
         dotData: FlDotData(
           show: size < 30,
-          getDotColor: (spot, percent, barData) =>
-              Provider.of<ThemeProvider>(context, listen: false).otherColors[i],
-          dotSize: 3,
+          // getDotColor: (spot, percent, barData) =>
+          //     Provider.of<ThemeProvider>(context, listen: false).otherColors[i],
+          // dotSize: 3,
         ),
         belowBarData: BarAreaData(
           show: false,
-          colors: [
+          color: 
             Theme.of(context).colorScheme.secondary.withOpacity(0.1 / (i + 1))
-          ],
+          ,
         ),
       );
       i = (i + 1) % (themeColors.length - 1);
@@ -141,7 +141,7 @@ class DateValueMultiLineChart extends StatelessWidget {
                 padding: EdgeInsets.only(top: 20, left: 10, right: 20),
                 child: LineChart(
                   LineChartData(
-                    clipToBorder: true,
+                    // clipToBorder: true,
                     // 边框信息
                     borderData: FlBorderData(
                       show: true,
@@ -191,33 +191,33 @@ class DateValueMultiLineChart extends StatelessWidget {
                     titlesData: FlTitlesData(
                       show: true,
                       // 下方文字
-                      bottomTitles: SideTitles(
+                      bottomTitles: AxisTitles(
                         // 每隔几个显示一个底部标签
-                        interval: xInterval,
-                        showTitles: true,
+                        // interval: xInterval,
+                        // showTitles: true,
                         // 文字与图表上边界距离
 //          margin: 8,
                         // 文字预留空间
 //          reservedSize: 22,
-                        textStyle: Theme.of(context).textTheme.bodyMedium,
-                        getTitles: (value) {
-                          DateTime dateTime =
-                              ConvertUtils.dateTimeOfLocalDaysSinceEpoch(value);
-                          return "${dateTime.month}-${dateTime.day}";
-                        },
+                        // textStyle: Theme.of(context).textTheme.bodyMedium,
+                        // getTitles: (value) {
+                        //   DateTime dateTime =
+                        //       ConvertUtils.dateTimeOfLocalDaysSinceEpoch(value);
+                        //   return "${dateTime.month}-${dateTime.day}";
+                        // },
                       ),
-                      leftTitles: SideTitles(
+                      leftTitles: AxisTitles(
                         // 每隔几个显示一个左侧标签
-                        interval: yInterval,
-                        showTitles: true,
+                        // interval: yInterval,
+                        // showTitles: true,
                         // 文字与图表左边界距离
 //          margin: 8,
                         // 文字预留空间
-                        reservedSize: ConvertUtils.fixedDouble(maxY, 1).toString().length * 6.5,
-                        textStyle: Theme.of(context).textTheme.bodyMedium,
-                        getTitles: (value) {
-                          return ConvertUtils.fixedDouble(value, 1).toString();
-                        },
+                        // reservedSize: ConvertUtils.fixedDouble(maxY, 1).toString().length * 6.5,
+                        // textStyle: Theme.of(context).textTheme.bodyMedium,
+                        // getTitles: (value) {
+                        //   return ConvertUtils.fixedDouble(value, 1).toString();
+                        // },
                       ),
                     ),
                     // 各轴显示的最值 (不设置则缩放)

lib/view/context/widget/DateValueSingleLineChart.dart

@@ -95,7 +95,7 @@ class DateValueSingleLineChart extends StatelessWidget {
                 padding: EdgeInsets.only(top: 20, left: 10, right: 20),
                 child: LineChart(
                   LineChartData(
-                    clipToBorder: true,
+                    // clipToBorder: true,
                     // 边框信息
                     borderData: FlBorderData(
                       show: true,
@@ -140,37 +140,37 @@ class DateValueSingleLineChart extends StatelessWidget {
                     titlesData: FlTitlesData(
                       show: true,
                       // 下方文字
-                      bottomTitles: SideTitles(
+                      bottomTitles: AxisTitles(
                         // 每隔几个显示一个底部标签
-                        interval: xInterval,
-                        showTitles: true,
+                        // interval: xInterval,
+                        // showTitles: true,
                         // 文字与图表上边界距离
-                        margin: 8,
+                        // margin: 8,
                         // 文字预留空间
 //          reservedSize: 22,
-                        textStyle: Theme.of(context).textTheme.bodyMedium,
-                        getTitles: (value) {
-                          DateTime dateTime =
-                              ConvertUtils.dateTimeOfLocalDaysSinceEpoch(value);
-                          return "${dateTime.month}-${dateTime.day}";
-                        },
+                        // textStyle: Theme.of(context).textTheme.bodyMedium,
+                        // getTitles: (value) {
+                        //   DateTime dateTime =
+                        //       ConvertUtils.dateTimeOfLocalDaysSinceEpoch(value);
+                        //   return "${dateTime.month}-${dateTime.day}";
+                        // },
                       ),
-                      leftTitles: SideTitles(
+                      leftTitles: AxisTitles(
                         // 每隔几个显示一个左侧标签
-                        interval: yInterval,
-                        showTitles: true,
+                        // interval: yInterval,
+                        // showTitles: true,
                         // 文字与图表左边界距离
 //          margin: 8,
                         // 文字预留空间
-                        reservedSize: ConvertUtils.fixedDouble(maxY, 1)
-                                .toString()
-                                .length *
-                            6.5,
+                        // reservedSize: ConvertUtils.fixedDouble(maxY, 1)
+                        //         .toString()
+                        //         .length *
+                        //     6.5,
 //                        rotateAngle: -20,
-                        textStyle: Theme.of(context).textTheme.bodyMedium,
-                        getTitles: (value) {
-                          return ConvertUtils.fixedDouble(value, 1).toString();
-                        },
+                        // textStyle: Theme.of(context).textTheme.bodyMedium,
+                        // getTitles: (value) {
+                        //   return ConvertUtils.fixedDouble(value, 1).toString();
+                        // },
                       ),
                     ),
                     // 各轴显示的最值 (不设置则缩放)
@@ -186,7 +186,7 @@ class DateValueSingleLineChart extends StatelessWidget {
                         // 圆滑
                         isCurved: size > 7,
                         // 线条颜色
-                        colors: [Theme.of(context).colorScheme.secondary],
+                        color: Theme.of(context).colorScheme.secondary,
                         // 线条宽度
                         barWidth: 3,
                         // 起点和终点是否圆滑
@@ -194,19 +194,19 @@ class DateValueSingleLineChart extends StatelessWidget {
                         // 点配置
                         dotData: FlDotData(
                           show: size < 30,
-                          getDotColor: (spot, percent, barData) =>
-                              Theme.of(context).colorScheme.secondary,
-                          dotSize: 3,
+                          // getDotColor: (spot, percent, barData) =>
+                          //     Theme.of(context).colorScheme.secondary,
+                          // dotSize: 3,
                         ),
                         // 线下方填充
                         belowBarData: BarAreaData(
                           show: true,
-                          colors: [
+                          color: 
                             Theme.of(context)
                                 .colorScheme
                                 .secondary
                                 .withOpacity(0.3)
-                          ],
+                          ,
                         ),
                       ),
                     ],

lib/view/drawer/user/setting/UserSettingPage.dart

@@ -36,7 +36,6 @@ class UserSettingPageModel extends BaseModel {
 
   @override
   void init(BuildContext context) {
-    
     super.init(context);
     isRequesting = false;
   }
@@ -128,10 +127,10 @@ class UserSettingPageService extends BaseProvider {
   }
 
   Future<List<int>> takePhoto(BuildContext context) async {
-    File file = await ImagePicker.pickImage(source: ImageSource.camera);
-    if (file != null) {
-      List<int> res = await Navigator.of(context)
-          .push(MaterialPageRoute(builder: (_) => CropImagePage(file)));
+    XFile xfile = await ImagePicker().pickImage(source: ImageSource.camera);
+    if (xfile != null) {
+      List<int> res = await Navigator.of(context).push(
+          MaterialPageRoute(builder: (_) => CropImagePage(File(xfile.path))));
       if (res != null && res.isNotEmpty) {
         return res;
       }
@@ -140,10 +139,10 @@ class UserSettingPageService extends BaseProvider {
   }
 
   Future<List<int>> pickPhoto(BuildContext context) async {
-    File file = await ImagePicker.pickImage(source: ImageSource.gallery);
-    if (file != null) {
-      List<int> res = await Navigator.of(context)
-          .push(MaterialPageRoute(builder: (_) => CropImagePage(file)));
+    XFile xfile = await ImagePicker().pickImage(source: ImageSource.gallery);
+    if (xfile != null) {
+      List<int> res = await Navigator.of(context).push(
+          MaterialPageRoute(builder: (_) => CropImagePage(File(xfile.path))));
       if (res != null && res.isNotEmpty) {
         return res;
       }

pubspec.lock

@@ -6,7 +6,7 @@ packages:
     description:
       name: args
       sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.4.2"
   async:
@@ -14,7 +14,7 @@ packages:
     description:
       name: async
       sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.10.0"
   boolean_selector:
@@ -22,7 +22,7 @@ packages:
     description:
       name: boolean_selector
       sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
   characters:
@@ -30,7 +30,7 @@ packages:
     description:
       name: characters
       sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   clock:
@@ -38,7 +38,7 @@ packages:
     description:
       name: clock
       sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.1.1"
   collection:
@@ -46,7 +46,7 @@ packages:
     description:
       name: collection
       sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.17.0"
   cross_file:
@@ -54,7 +54,7 @@ packages:
     description:
       name: cross_file
       sha256: "0b0036e8cccbfbe0555fd83c1d31a6f30b77a96b598b35a5d36dd41f718695e9"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.3.3+4"
   cupertino_icons:
@@ -62,7 +62,7 @@ packages:
     description:
       name: cupertino_icons
       sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
   dbus:
@@ -70,7 +70,7 @@ packages:
     description:
       name: dbus
       sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.7.8"
   dio:
@@ -78,23 +78,23 @@ packages:
     description:
       name: dio
       sha256: ce75a1b40947fea0a0e16ce73337122a86762e38b982e1ccb909daa3b9bc4197
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "5.3.2"
   equatable:
     dependency: transitive
     description:
       name: equatable
-      sha256: "8007a033720c056066dd1dc20bc2934cac91e271f0408c578aa26c7731618a03"
-      url: "https://pub.flutter-io.cn"
+      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      url: "https://pub.dev"
     source: hosted
-    version: "1.2.6"
+    version: "2.0.5"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
       sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
   ffi:
@@ -102,7 +102,7 @@ packages:
     description:
       name: ffi
       sha256: ed5337a5660c506388a9f012be0288fb38b49020ce2b45fe1f8b8323fe429f99
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.2"
   file:
@@ -110,17 +110,49 @@ packages:
     description:
       name: file
       sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "6.1.4"
+  file_selector_linux:
+    dependency: transitive
+    description:
+      name: file_selector_linux
+      sha256: "770eb1ab057b5ae4326d1c24cc57710758b9a46026349d021d6311bd27580046"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.2"
+  file_selector_macos:
+    dependency: transitive
+    description:
+      name: file_selector_macos
+      sha256: "4ada532862917bf16e3adb3891fe3a5917a58bae03293e497082203a80909412"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.3+1"
+  file_selector_platform_interface:
+    dependency: transitive
+    description:
+      name: file_selector_platform_interface
+      sha256: "412705a646a0ae90f33f37acfae6a0f7cbc02222d6cd34e479421c3e74d3853c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.6.0"
+  file_selector_windows:
+    dependency: transitive
+    description:
+      name: file_selector_windows
+      sha256: "1372760c6b389842b77156203308940558a2817360154084368608413835fc26"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.3"
   fl_chart:
     dependency: "direct main"
     description:
       name: fl_chart
-      sha256: "06546ca1befe340be717b03a5a5497b072d88c6c6609e12b0e36d20bd7e5151a"
-      url: "https://pub.flutter-io.cn"
+      sha256: "48a1b69be9544e2b03d9a8e843affd89e43f3194c9248776222efcb4206bb1ec"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.9.4"
+    version: "0.62.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -131,7 +163,7 @@ packages:
     description:
       name: flutter_image_compress
       sha256: "2725cce5c58fdeaf1db8f4203688228bb67e3523a66305ccaa6f99071beb6dc2"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.0.4"
   flutter_image_compress_common:
@@ -139,7 +171,7 @@ packages:
     description:
       name: flutter_image_compress_common
       sha256: "8e7299afe109dc4b97fda34bf0f4967cc1fc10bc8050c374d449cab262d095b3"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   flutter_image_compress_platform_interface:
@@ -147,7 +179,7 @@ packages:
     description:
       name: flutter_image_compress_platform_interface
       sha256: "3c7e86da7540b1adfa919b461885a41a018d4a26544d0fcbeaa769f6542e603d"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   flutter_image_compress_web:
@@ -155,7 +187,7 @@ packages:
     description:
       name: flutter_image_compress_web
       sha256: e879189dc7f246dcf8f06c07ee849231341508bf51e8ed7d5dcbe778ddde0e81
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.1.3+1"
   flutter_local_notifications:
@@ -163,7 +195,7 @@ packages:
     description:
       name: flutter_local_notifications
       sha256: "3cc40fe8c50ab8383f3e053a499f00f975636622ecdc8e20a77418ece3b1e975"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "15.1.0+1"
   flutter_local_notifications_linux:
@@ -171,7 +203,7 @@ packages:
     description:
       name: flutter_local_notifications_linux
       sha256: "33f741ef47b5f63cc7f78fe75eeeac7e19f171ff3c3df054d84c1e38bedb6a03"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "4.0.0+1"
   flutter_local_notifications_platform_interface:
@@ -179,7 +211,7 @@ packages:
     description:
       name: flutter_local_notifications_platform_interface
       sha256: "7cf643d6d5022f3baed0be777b0662cce5919c0a7b86e700299f22dc4ae660ef"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "7.0.0+1"
   flutter_markdown:
@@ -187,17 +219,17 @@ packages:
     description:
       name: flutter_markdown
       sha256: dc6d5258653f6857135b32896ccda7f7af0c54dcec832495ad6835154c6c77c0
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.6.15"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: f64fc84e913a3c225588724c811f5f6600562d17fc6f6cea7fda264fc93361ae
-      url: "https://pub.flutter-io.cn"
+      sha256: "950e77c2bbe1692bc0874fc7fb491b96a4dc340457f4ea1641443d0a6c1ea360"
+      url: "https://pub.dev"
     source: hosted
-    version: "1.0.11"
+    version: "2.0.15"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -208,12 +240,20 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  http:
+    dependency: transitive
+    description:
+      name: http
+      sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.13.6"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
       sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "4.0.2"
   image_crop:
@@ -221,23 +261,79 @@ packages:
     description:
       name: image_crop
       sha256: a580010f9e90b20581ecf5e8f4e9aa838cb935ea1497f9d1b196baa382b84a6d
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.4.1"
   image_picker:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: be333e667b7aa5606a7f0a22a8c7cc2286b0a8bf6ac977f7b8a48d650282e201
-      url: "https://pub.flutter-io.cn"
+      sha256: "841837258e0b42c80946c43443054fc726f5e8aa84a97f363eb9ef0d45b33c14"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.2"
+  image_picker_android:
+    dependency: transitive
+    description:
+      name: image_picker_android
+      sha256: "8179b54039b50eee561676232304f487602e2950ffb3e8995ed9034d6505ca34"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.7+4"
+  image_picker_for_web:
+    dependency: transitive
+    description:
+      name: image_picker_for_web
+      sha256: "8b6c160cdbe572199103a091c783685b236110e4a0fd7a4947f32ff5b7da8765"
+      url: "https://pub.dev"
     source: hosted
-    version: "0.6.5+3"
+    version: "3.0.0"
+  image_picker_ios:
+    dependency: transitive
+    description:
+      name: image_picker_ios
+      sha256: b3e2f21feb28b24dd73a35d7ad6e83f568337c70afab5eabac876e23803f264b
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.8.8"
+  image_picker_linux:
+    dependency: transitive
+    description:
+      name: image_picker_linux
+      sha256: "02cbc21fe1706b97942b575966e5fbbeaac535e76deef70d3a242e4afb857831"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
+  image_picker_macos:
+    dependency: transitive
+    description:
+      name: image_picker_macos
+      sha256: cee2aa86c56780c13af2c77b5f2f72973464db204569e1ba2dd744459a065af4
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
+  image_picker_platform_interface:
+    dependency: transitive
+    description:
+      name: image_picker_platform_interface
+      sha256: c1134543ae2187e85299996d21c526b2f403854994026d575ae4cf30d7bb2a32
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.9.0"
+  image_picker_windows:
+    dependency: transitive
+    description:
+      name: image_picker_windows
+      sha256: c3066601ea42113922232c7b7b3330a2d86f029f685bba99d82c30e799914952
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.2.1"
   js:
     dependency: transitive
     description:
       name: js
       sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.6.5"
   markdown:
@@ -245,7 +341,7 @@ packages:
     description:
       name: markdown
       sha256: acf35edccc0463a9d7384e437c015a3535772e09714cf60e07eeef3a15870dcd
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "7.1.1"
   matcher:
@@ -253,7 +349,7 @@ packages:
     description:
       name: matcher
       sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.12.13"
   material_color_utilities:
@@ -261,7 +357,7 @@ packages:
     description:
       name: material_color_utilities
       sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.2.0"
   meta:
@@ -269,15 +365,23 @@ packages:
     description:
       name: meta
       sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.8.0"
+  mime:
+    dependency: transitive
+    description:
+      name: mime
+      sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.4"
   nested:
     dependency: transitive
     description:
       name: nested
       sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.0"
   path:
@@ -285,31 +389,15 @@ packages:
     description:
       name: path
       sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.8.2"
-  path_drawing:
-    dependency: transitive
-    description:
-      name: path_drawing
-      sha256: b3dd74e2210b2b71be3d3098b956dbab853ee43a86918b4bc20c9b9bd49f03f3
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.4.1+1"
-  path_parsing:
-    dependency: transitive
-    description:
-      name: path_parsing
-      sha256: "4e613c811d25f1533c0d05eb2755e21410247b8a13ac7f6cd23c0cecb2ff683d"
-      url: "https://pub.flutter-io.cn"
-    source: hosted
-    version: "0.1.4"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
       sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
   path_provider_platform_interface:
@@ -317,7 +405,7 @@ packages:
     description:
       name: path_provider_platform_interface
       sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
   path_provider_windows:
@@ -325,7 +413,7 @@ packages:
     description:
       name: path_provider_windows
       sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
   petitparser:
@@ -333,7 +421,7 @@ packages:
     description:
       name: petitparser
       sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "5.1.0"
   platform:
@@ -341,7 +429,7 @@ packages:
     description:
       name: platform
       sha256: "57c07bf82207aee366dfaa3867b3164e4f03a238a461a11b0e8a3a510d51203d"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.1"
   plugin_platform_interface:
@@ -349,23 +437,23 @@ packages:
     description:
       name: plugin_platform_interface
       sha256: "43798d895c929056255600343db8f049921cbec94d31ec87f1dc5c16c01935dd"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.5"
   provider:
     dependency: "direct main"
     description:
       name: provider
-      sha256: af58e866ea76fa7d156ea5e6ffa1c28b52dabff5c87fbdf265f7c6adaa7a741d
-      url: "https://pub.flutter-io.cn"
+      sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f
+      url: "https://pub.dev"
     source: hosted
-    version: "4.3.3"
+    version: "6.0.5"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
       sha256: "0344316c947ffeb3a529eac929e1978fcd37c26be4e8468628bac399365a3ca1"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
   shared_preferences_android:
@@ -373,7 +461,7 @@ packages:
     description:
       name: shared_preferences_android
       sha256: fe8401ec5b6dcd739a0fe9588802069e608c3fdbfd3c3c93e546cf2f90438076
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
   shared_preferences_foundation:
@@ -381,7 +469,7 @@ packages:
     description:
       name: shared_preferences_foundation
       sha256: d29753996d8eb8f7619a1f13df6ce65e34bc107bef6330739ed76f18b22310ef
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.3.3"
   shared_preferences_linux:
@@ -389,7 +477,7 @@ packages:
     description:
       name: shared_preferences_linux
       sha256: "71d6806d1449b0a9d4e85e0c7a917771e672a3d5dc61149cc9fac871115018e1"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
   shared_preferences_platform_interface:
@@ -397,7 +485,7 @@ packages:
     description:
       name: shared_preferences_platform_interface
       sha256: "23b052f17a25b90ff2b61aad4cc962154da76fb62848a9ce088efe30d7c50ab1"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
   shared_preferences_web:
@@ -405,7 +493,7 @@ packages:
     description:
       name: shared_preferences_web
       sha256: "7347b194fb0bbeb4058e6a4e87ee70350b6b2b90f8ac5f8bd5b3a01548f6d33a"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.0"
   shared_preferences_windows:
@@ -413,7 +501,7 @@ packages:
     description:
       name: shared_preferences_windows
       sha256: f95e6a43162bce43c9c3405f3eb6f39e5b5d11f65fab19196cf8225e2777624d
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.3.0"
   sky_engine:
@@ -426,7 +514,7 @@ packages:
     description:
       name: source_span
       sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.9.1"
   sqflite:
@@ -434,7 +522,7 @@ packages:
     description:
       name: sqflite
       sha256: b4d6710e1200e96845747e37338ea8a819a12b51689a3bcf31eff0003b37a0b9
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.2.8+4"
   sqflite_common:
@@ -442,7 +530,7 @@ packages:
     description:
       name: sqflite_common
       sha256: "8f7603f3f8f126740bc55c4ca2d1027aab4b74a1267a3e31ce51fe40e3b65b8f"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.4.5+1"
   stack_trace:
@@ -450,7 +538,7 @@ packages:
     description:
       name: stack_trace
       sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.11.0"
   stream_channel:
@@ -458,7 +546,7 @@ packages:
     description:
       name: stream_channel
       sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
   string_scanner:
@@ -466,7 +554,7 @@ packages:
     description:
       name: string_scanner
       sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.0"
   synchronized:
@@ -474,7 +562,7 @@ packages:
     description:
       name: synchronized
       sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "3.1.0"
   term_glyph:
@@ -482,7 +570,7 @@ packages:
     description:
       name: term_glyph
       sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.2.1"
   test_api:
@@ -490,7 +578,7 @@ packages:
     description:
       name: test_api
       sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.4.16"
   timezone:
@@ -498,7 +586,7 @@ packages:
     description:
       name: timezone
       sha256: "1cfd8ddc2d1cfd836bc93e67b9be88c3adaeca6f40a00ca999104c30693cdca0"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "0.9.2"
   typed_data:
@@ -506,7 +594,7 @@ packages:
     description:
       name: typed_data
       sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.3.2"
   vector_math:
@@ -514,7 +602,7 @@ packages:
     description:
       name: vector_math
       sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
   win32:
@@ -522,7 +610,7 @@ packages:
     description:
       name: win32
       sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "4.1.4"
   xdg_directories:
@@ -530,7 +618,7 @@ packages:
     description:
       name: xdg_directories
       sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "1.0.2"
   xml:
@@ -538,7 +626,7 @@ packages:
     description:
       name: xml
       sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5"
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dev"
     source: hosted
     version: "6.2.2"
 sdks:

pubspec.yaml

@@ -13,11 +13,11 @@ dependencies:
   flutter_local_notifications: ^15.1.0+1 # 本地消息推送
   shared_preferences: ^2.2.0 # 键值对存储
   dio: ^5.3.0 # 请求
-  fl_chart: ^0.9.4 # 图表
-  image_picker: ^0.6.3+4 # 相机、相册
+  fl_chart: ^0.62.0 # 图表
+  image_picker: ^1.0.2 # 相机、相册
   image_crop: ^0.4.1 # 图片裁剪
   flutter_image_compress: ^2.0.4 # 图片压缩
-  provider: ^4.0.4 # 状态管理
+  provider: ^6.0.5 # 状态管理
   flutter_markdown: ^0.6.15 # markdown
 
   cupertino_icons: ^1.0.5

windows/flutter/generated_plugin_registrant.cc

@@ -6,6 +6,9 @@
 
 #include "generated_plugin_registrant.h"
 
+#include <file_selector_windows/file_selector_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
+  FileSelectorWindowsRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FileSelectorWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -3,6 +3,7 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
+  file_selector_windows
 )
 
 list(APPEND FLUTTER_FFI_PLUGIN_LIST