fix errror

lib/detector_painters.dart

@@ -1,6 +1,5 @@
 import 'dart:ui' as ui;
 import 'package:firebase_ml_vision/firebase_ml_vision.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 enum Detector { barcode, face, label, cloudLabel, text }

lib/main.dart

@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:douyin_demo/pages/recommend_page.dart';
 import 'package:flutter/material.dart';
-import 'package:marquee_flutter/marquee_flutter.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 Future main() async {

lib/model/posts_model.g.dart

@@ -1,6 +1,6 @@
 // GENERATED CODE - DO NOT MODIFY BY HAND
 
-part of 'PostsModel.dart';
+part of 'posts_model.dart';
 
 // **************************************************************************
 // JsonSerializableGenerator

lib/pages/CameraMain.dart

@@ -2,14 +2,11 @@ import 'dart:io';
 import 'dart:math';
 
 import 'package:camera/camera.dart';
-import 'package:camera/new/src/support_android/camera.dart';
 import 'package:douyin_demo/providers/CameraProvider.dart';
 import 'package:firebase_ml_vision/firebase_ml_vision.dart';
 import 'package:flutter/material.dart';
 import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:provider/provider.dart';
-import 'package:path/path.dart' as p;
-import 'package:image_picker_saver/image_picker_saver.dart';
 
 class CameraPage extends StatelessWidget {
   const CameraPage({Key key}) : super(key: key);
@@ -128,7 +125,6 @@ class _CameraMainState extends State<CameraMain> {
 
   @override
   void dispose() {
-    // TODO: implement dispose
     _controller.dispose();
     super.dispose();
   }
@@ -473,7 +469,6 @@ class _AnimVideoButtonState extends State<AnimVideoButton>
 
   @override
   void dispose() {
-    // TODO: implement dispose
     controller.dispose();
     super.dispose();
   }
@@ -725,7 +720,8 @@ class CircleTakePhoto extends StatelessWidget {
             //       fileData: File(provider.fileName).readAsBytesSync());
             // });
             provider.changeFileName('mp4');
-            provider.cameraController.startVideoRecording(provider.fileName);
+            // provider.cameraController.startVideoRecording(provider.fileName);
+            provider.cameraController.startVideoRecording();
             provider.changePhotoWidget();
           },
           child: Container(

lib/pages/FaceDetection.dart

@@ -1,4 +1,3 @@
-import 'dart:io';
 import 'package:firebase_ml_vision/firebase_ml_vision.dart';
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
@@ -11,7 +10,7 @@ class FaceDetectionView extends StatefulWidget {
 }
 
 class _FaceDetectionViewState extends State<FaceDetectionView> {
-  File filePath;
+  XFile filePath;
 
   @override
   void initState() {
@@ -19,7 +18,7 @@ class _FaceDetectionViewState extends State<FaceDetectionView> {
   }
 
   chooseImage() async {
-    filePath = await ImagePicker.pickImage(
+    filePath = await ImagePicker().pickImage(
         source: ImageSource.gallery,
         imageQuality: 100,
         maxWidth: MediaQuery.of(context).size.width);
@@ -36,7 +35,7 @@ class _FaceDetectionViewState extends State<FaceDetectionView> {
     //         .toList(),
     //     rotation: ImageRotation.rotation90);
     final FirebaseVisionImage visionImage =
-        FirebaseVisionImage.fromFile(filePath);
+        FirebaseVisionImage.fromFilePath(filePath.path);
     final FaceDetector detector = FirebaseVision.instance.faceDetector();
     final List<Face> faces = await detector.processImage(visionImage);
 
@@ -59,8 +58,8 @@ class _FaceDetectionViewState extends State<FaceDetectionView> {
       filePath == null
           ? Container()
           : Container(
-              child: Image.file(
-                filePath,
+              child: Image.asset(
+                filePath.path,
                 fit: BoxFit.fitWidth,
               ),
             )

lib/pages/RecommendPage/BottomSheet.dart

@@ -258,7 +258,11 @@ showAtFriendPage(BuildContext context) {
   Navigator.of(context).push(MaterialPageRoute(
       builder: (BuildContext context) {
         return MultiProvider(providers: [
-          ChangeNotifierProvider(builder: (context) => AtUserProvider())
+          ChangeNotifierProvider(
+            create: (BuildContext context) {
+              return AtUserProvider();
+            },
+          )
         ], child: AtFriendPage());
       },
       fullscreenDialog: true));

lib/pages/SameCityPage.dart

@@ -1,5 +1,6 @@
 import 'package:douyin_demo/model/posts_model.dart';
 import 'package:douyin_demo/providers/PostsGalleryProvider.dart';
+import 'package:douyin_demo/widgets/bottom_bar.dart';
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
 

lib/pages/home_page.dart

@@ -205,7 +205,7 @@ class SliverTopBar extends StatelessWidget {
           mainAxisSize: MainAxisSize.min,
           children: <Widget>[
             Image.asset(
-              "lib/images/temple.jpg",
+              "assets/images/temple.jpg",
               width: 750 * rpx,
               height: 300 * rpx + extraPicHeight,
               fit: fitType,
@@ -452,7 +452,7 @@ class NumWithDesc extends StatelessWidget {
 //             expandedHeight: 250,
 //             flexibleSpace: FlexibleSpaceBar(
 //               title: Text("This is Sliver App Bar"),
-//               background: Image.asset("lib/images/temple.jpg",height: 250,fit: BoxFit.fitWidth,),
+//               background: Image.asset("assets/images/temple.jpg",height: 250,fit: BoxFit.fitWidth,),
 //             ),
 //           ),
 //           SliverList(delegate: SliverChildBuilderDelegate((context,index){

lib/pages/loadData.dart

@@ -22,7 +22,7 @@ class RefreshPage extends StatefulWidget {
 }
 
 class _RefreshPageState extends State<RefreshPage> {
-  List<String> data = List<String>();
+  List<String> data = <String>[];
   ScrollController controller;
   bool ifLoading = false;
 
@@ -39,7 +39,7 @@ class _RefreshPageState extends State<RefreshPage> {
       RefreshIndicator(
         onRefresh: () {
           return Future.delayed(Duration(seconds: 1), () {
-            data = List<String>();
+            data = <String>[];
             List.generate(30, (i) => data.add("item ${i + 1}"));
             setState(() {
               data = data;

lib/pages/recommend_page.dart

@@ -16,7 +16,9 @@ class RecommendPage extends StatelessWidget {
     return MultiProvider(
         providers: [
           ChangeNotifierProvider(
-            builder: (context) => RecommendProvider(),
+                create: (BuildContext context) {
+              return RecommendProvider();
+            },
           )
         ],
         child: Scaffold(

lib/providers/CameraProvider.dart

@@ -100,7 +100,6 @@ class CameraProvider extends State<StatefulWidget>
 
   @override
   Widget build(BuildContext context) {
-    // TODO: implement build
     return null;
   }
 }

lib/providers/PostsGalleryProvider.dart

@@ -41,7 +41,7 @@ class PostsGalleryProvider with ChangeNotifier {
   }
 
   setGalleryModel(String items) {
-    var result = List<PostsModel>();
+    var result = <PostsModel>[];
 
     var posts = json.decode(items)["result"];
     // result.add(posts);

lib/providers/RecommendProvider.dart

@@ -23,13 +23,13 @@ class RecommendProvider extends State<StatefulWidget>
         replyCount: 212,
         shareCount: 317,
         userName: "马有发",
-        videoPath: "lib/images/pingguo.jpeg",
+        videoPath: "assets/images/pingguo.jpeg",
         desc: "马友发做的一个有意思的模拟抖音的小App，用的Flutter哦~",
         ifFaved: false);
 
     reply = Reply(
         ifFaved: true,
-        afterReplies: List<Reply>(),
+        afterReplies: <Reply>[],
         replyContent: "真可爱，真好看，真厉害~真可爱，真好看，真厉害~",
         replyMakerAvatar:
             "https://pic2.zhimg.com/v2-a88cd7618933272ca681f86398e6240d_xll.jpg",
@@ -44,7 +44,7 @@ class RecommendProvider extends State<StatefulWidget>
         replyCount: 329,
         shareCount: 1222,
         userName: "范德彪",
-        videoPath: "lib/images/sky.jpg",
+        videoPath: "assets/images/sky.jpg",
         desc: "这个天空的图有点好看",
         ifFaved: true));
     infos.add(MainInfo(
@@ -55,7 +55,7 @@ class RecommendProvider extends State<StatefulWidget>
         replyCount: 189,
         shareCount: 262,
         userName: "马大帅",
-        videoPath: "lib/images/temple.jpg",
+        videoPath: "assets/images/temple.jpg",
         desc: "我喜欢拜佛",
         ifFaved: true));
 
@@ -67,7 +67,7 @@ class RecommendProvider extends State<StatefulWidget>
         replyCount: 222,
         shareCount: 1983,
         userName: "ABC",
-        videoPath: "lib/images/woman.jpg",
+        videoPath: "assets/images/woman.jpg",
         desc: "黑色女人有黑色的美",
         ifFaved: true));
 
@@ -79,7 +79,7 @@ class RecommendProvider extends State<StatefulWidget>
         replyCount: 329,
         shareCount: 1222,
         userName: "范德彪",
-        videoPath: "lib/images/whitehouse.jpg",
+        videoPath: "assets/images/whitehouse.jpg",
         desc: "这个天空的图有点好看",
         ifFaved: true));
     followed.add(MainInfo(
@@ -90,7 +90,7 @@ class RecommendProvider extends State<StatefulWidget>
         replyCount: 189,
         shareCount: 262,
         userName: "马大帅",
-        videoPath: "lib/images/waterdrop.jpg",
+        videoPath: "assets/images/waterdrop.jpg",
         desc: "我喜欢拜佛",
         ifFaved: true));
 
@@ -102,7 +102,7 @@ class RecommendProvider extends State<StatefulWidget>
         replyCount: 222,
         shareCount: 1983,
         userName: "ABC",
-        videoPath: "lib/images/woman2.jpg",
+        videoPath: "assets/images/woman2.jpg",
         desc: "黑色女人有黑色的美",
         ifFaved: true));
   }
@@ -134,7 +134,6 @@ class RecommendProvider extends State<StatefulWidget>
 
   @override
   Widget build(BuildContext context) {
-    // TODO: implement build
     return null;
   }
 }

lib/views/button_list.dart

@@ -34,7 +34,7 @@ class _ButtonListState extends State<ButtonList> {
         end: 1.0,
         duration: Duration(milliseconds: 100)));
 
-    List<IconAnimationStage> stages2 = List<IconAnimationStage>();
+    List<IconAnimationStage> stages2 = <IconAnimationStage>[];
     stages2.add(IconAnimationStage(
         color: Colors.grey[100],
         start: 1.0,
@@ -46,7 +46,7 @@ class _ButtonListState extends State<ButtonList> {
         end: 1.0,
         duration: Duration(milliseconds: 200)));
 
-    List<IconAnimationStage> stages3 = List<IconAnimationStage>();
+    List<IconAnimationStage> stages3 = <IconAnimationStage>[];
     stages3.add(IconAnimationStage(
         color: Colors.redAccent,
         start: 1.0,

lib/views/main_tab_view.dart

@@ -1,6 +1,7 @@
 import 'package:douyin_demo/providers/RecommendProvider.dart';
 import 'package:douyin_demo/views/swiper_main.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_swiper/flutter_swiper.dart';
 import 'package:provider/provider.dart';
 
 import 'center_image.dart';

lib/views/rotate_album.dart

@@ -35,7 +35,6 @@ class _RotateAlbumState extends State<RotateAlbum>
 
   @override
   void dispose() {
-    // TODO: implement dispose
     _controller.dispose();
     super.dispose();
   }

lib/views/video_back.dart

@@ -16,7 +16,6 @@ class _VideoBackState extends State<VideoBack> {
 
   @override
   void initState() {
-    // TODO: implement initState
     super.initState();
     _controller = VideoPlayerController.network(this.url)
     // 播放状态

lib/widgets/FavAnimation.dart

@@ -308,13 +308,13 @@ class AnimatedIconWidget extends StatefulWidget {
 
 class _AnimatedIconWidgetState extends State<AnimatedIconWidget>
     with TickerProviderStateMixin {
-  List<IconAnimationStage> anis = List<IconAnimationStage>();
-  List<AnimationController> controllers = List<AnimationController>();
-  List<Animation<double>> animations = List<Animation<double>>();
+  List<IconAnimationStage> anis = <IconAnimationStage>[];
+  List<AnimationController> controllers = <AnimationController>[];
+  List<Animation<double>> animations = <Animation<double>>[];
   Animation<double> curAnim;
   Color curColor;
   int curIndex = 0;
-  List<bool> ifAdded = List<bool>();
+  List<bool> ifAdded = <bool>[];
   double curSize;
   bool ifInit = true;
 

lib/widgets/bottom_bar.dart

@@ -80,8 +80,9 @@ class _BtmBarState extends State<BtmBar> {
                 builder: (context) => MultiProvider(
                         providers: [
                           ChangeNotifierProvider(
-                            builder: (context) => PostsGalleryProvider(),
-                          )
+                              create: (BuildContext context) {
+                            return PostsGalleryProvider();
+                          })
                         ],
                         child: SameCityMain(
                           selIndex: index,
@@ -99,9 +100,9 @@ class _BtmBarState extends State<BtmBar> {
             builder: (BuildContext context) {
               return MultiProvider(
                   providers: [
-                    ChangeNotifierProvider(
-                      builder: (_) => CameraProvider(),
-                    )
+                    ChangeNotifierProvider(create: (BuildContext context) {
+                      return CameraProvider();
+                    })
                   ],
                   child: CameraPage(
                       // rpx: MediaQuery.of(context).size.width / 750,

pubspec.lock

@@ -1,90 +1,139 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  after_layout:
+    dependency: "direct main"
+    description:
+      name: after_layout
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.8.1"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
+  camera:
+    dependency: "direct main"
+    description:
+      name: camera
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.9.4+18"
+  camera_platform_interface:
+    dependency: transitive
+    description:
+      name: camera_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.5"
+  camera_web:
+    dependency: transitive
+    description:
+      name: camera_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.1+3"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.15.0"
+    version: "1.16.0"
   cross_file:
     dependency: transitive
     description:
       name: cross_file
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.3.2"
+  crypto:
+    dependency: transitive
+    description:
+      name: crypto
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
   csslib:
     dependency: transitive
     description:
       name: csslib
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.17.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
+  fading_edge_scrollview:
+    dependency: transitive
+    description:
+      name: fading_edge_scrollview
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.1"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.2"
+  firebase_ml_vision:
+    dependency: "direct main"
+    description:
+      name: firebase_ml_vision
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.12.0+3"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -94,21 +143,21 @@ packages:
     dependency: transitive
     description:
       name: flutter_page_indicator
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.0.3"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
   flutter_swiper:
     dependency: "direct main"
     description:
       name: flutter_swiper
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.6"
   flutter_test:
@@ -125,231 +174,266 @@ packages:
     dependency: transitive
     description:
       name: html
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.15.0"
   http:
     dependency: transitive
     description:
       name: http
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.13.4"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
   image_gallery_saver:
     dependency: "direct main"
     description:
       name: image_gallery_saver
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.7.1"
   image_picker:
     dependency: "direct main"
     description:
       name: image_picker
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.8.4+10"
+    version: "0.8.4+11"
   image_picker_for_web:
     dependency: transitive
     description:
       name: image_picker_for_web
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.6"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.4.4"
+  image_picker_saver:
+    dependency: "direct main"
+    description:
+      name: image_picker_saver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.3.0"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.4.0"
   lpinyin:
     dependency: "direct main"
     description:
       name: lpinyin
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.3"
+  marquee:
+    dependency: "direct main"
+    description:
+      name: marquee
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.1"
+  marquee_flutter:
+    dependency: "direct main"
+    description:
+      name: marquee_flutter
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.10"
+    version: "0.12.11"
+  material_color_utilities:
+    dependency: transitive
+    description:
+      name: material_color_utilities
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.7.0"
   nested:
     dependency: transitive
     description:
       name: nested
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   path:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: path
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.9"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.11"
+    version: "2.0.12"
   path_provider_ios:
     dependency: transitive
     description:
       name: path_provider_ios
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.8"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.5"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.3"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.2"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.2.4"
   provider:
     dependency: "direct main"
     description:
       name: provider
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.0.2"
+  quiver:
+    dependency: transitive
+    description:
+      name: quiver
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1+1"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.13"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.10"
+    version: "2.0.11"
   shared_preferences_ios:
     dependency: transitive
     description:
       name: shared_preferences_ios
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.9"
+    version: "2.1.0"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.3"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.3"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   sky_engine:
@@ -361,100 +445,142 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.1"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.10.0"
+  sticky_headers:
+    dependency: "direct main"
+    description:
+      name: sticky_headers
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.2.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
+  stream_transform:
+    dependency: transitive
+    description:
+      name: stream_transform
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
+  stretchy_header:
+    dependency: "direct main"
+    description:
+      name: stretchy_header
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.2"
+    version: "0.4.9"
   transformer_page_view:
     dependency: transitive
     description:
       name: transformer_page_view
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.6"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
+  uuid:
+    dependency: "direct main"
+    description:
+      name: uuid
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   video_player:
     dependency: "direct main"
     description:
       name: video_player
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.3.0"
+  video_player_android:
+    dependency: transitive
+    description:
+      name: video_player_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.3.2"
+  video_player_avfoundation:
+    dependency: transitive
+    description:
+      name: video_player_avfoundation
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.2.17"
+    version: "2.3.1"
   video_player_platform_interface:
     dependency: transitive
     description:
       name: video_player_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.1.0"
+    version: "5.1.1"
   video_player_web:
     dependency: transitive
     description:
       name: video_player_web
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.7"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.6"
+    version: "2.5.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0+1"
 sdks:
-  dart: ">=2.14.0 <3.0.0"
-  flutter: ">=2.5.0"
+  dart: ">=2.16.0-100.0.dev <3.0.0"
+  flutter: ">=2.8.0"

pubspec.yaml

@@ -10,24 +10,24 @@ dependencies:
     sdk: flutter
 
   cupertino_icons: ^1.0.3
-#  marquee:
+  marquee:
   video_player: ^2.2.17
-#  marquee_flutter:
+  marquee_flutter:
   provider: ^6.0.1
   lpinyin: ^2.0.3
-#  sticky_headers:
+  sticky_headers:
   shared_preferences: ^2.0.7
   json_annotation: ^4.4.0
   flutter_swiper: ^1.1.6
-#  stretchy_header:
-#  after_layout:
-#  camera:
+  stretchy_header:
+  after_layout:
+  camera:
   path_provider: ^2.0.9
-#  path:
-#  uuid:
-#  image_picker_saver:
+  path:
+  uuid:
+  image_picker_saver:
   image_gallery_saver: ^1.7.1
-#  firebase_ml_vision:
+  firebase_ml_vision:
   image_picker: ^0.8.4+4
 
 dev_dependencies: