Merge branch 'hotfix/white-guanaco' of lyq/flutter_douyin_demo into master

.devcontainer/Dockerfile

@@ -0,0 +1 @@
+FROM jianboy/flutter-dev-container:3.0.5

.devcontainer/devcontainer.json

@@ -0,0 +1,45 @@
+// java8 + android env
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.233.0/containers/java-8
+{
+    "name": "Java 11",
+    "build": {
+        "dockerfile": "Dockerfile",
+        "args": {
+            // Use the VARIANT arg to pick a Debian OS version: buster, bullseye
+            // Use bullseye when running on local arm64/Apple Silicon.
+            "VARIANT": "buster",
+            // Options
+            "INSTALL_MAVEN": "true",
+            "INSTALL_GRADLE": "true",
+            "NODE_VERSION": "lts/*"
+        }
+    },
+    // Set *default* container specific settings.json values on container create.
+    "settings": {
+        "java.home": "/docker-java-home",
+        "java.import.gradle.java.home": "/usr/local/sdkman/candidates/java/current",
+        "java.configuration.runtimes": [
+            {
+                "default": true,
+                "name": "JavaSE-11",
+                "path": "/usr/local/sdkman/candidates/java/current"
+            }
+        ]
+    },
+    // Add the IDs of extensions you want installed when the container is created.
+    "extensions": [
+        "vscjava.vscode-java-pack",
+        "dart-code.dart-code",
+        "dart-code.flutter"
+    ],
+    // Use 'forwardPorts' to make a list of ports inside the container available locally.
+    // "forwardPorts": [],
+    // Use 'postCreateCommand' to run commands after the container is created.
+    // "postCreateCommand": "java -version",
+    // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+    "remoteUser": "vscode",
+    "features": {
+        "docker-in-docker": "latest"
+    }
+}

.gitpod.Dockerfile

@@ -0,0 +1,66 @@
+FROM gitpod/workspace-full-vnc
+SHELL ["/bin/bash", "-c"]
+
+ENV ANDROID_HOME=/home/gitpod/androidsdk \
+    FLUTTER_VERSION=2.10.5-stable
+
+# Install dart
+USER root
+RUN curl -fsSL https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
+    && curl -fsSL https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list \
+    && install-packages build-essential dart libkrb5-dev gcc make gradle android-tools-adb android-tools-fastboot
+
+# Install flutter
+USER gitpod
+RUN cd /home/gitpod \
+    && wget https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_${FLUTTER_VERSION}.tar.xz \
+    && tar -xvf flutter*.tar.xz \
+    && rm -f flutter*.tar.xz
+
+RUN flutter/bin/flutter precache
+RUN echo 'export PATH="$PATH:/home/gitpod/flutter/bin"' >> /home/gitpod/.bashrc
+
+# Install Open JDK
+USER gitpod
+RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh && \
+    sdk install java 11.0.16-amzn && \
+    sdk default java 11.0.16-amzn"
+
+# Install SDK Manager
+USER gitpod
+RUN  wget https://dl.google.com/android/repository/commandlinetools-linux-7583922_latest.zip \
+    && mkdir -p $ANDROID_HOME/cmdline-tools/latest \
+    && unzip commandlinetools-linux-*.zip -d $ANDROID_HOME \
+    && rm -f commandlinetools-linux-*.zip \
+    && mv $ANDROID_HOME/cmdline-tools/bin $ANDROID_HOME/cmdline-tools/latest \
+    && mv $ANDROID_HOME/cmdline-tools/lib $ANDROID_HOME/cmdline-tools/latest
+
+RUN echo "export ANDROID_HOME=$ANDROID_HOME" >> /home/gitpod/.bashrc \
+    && echo 'export PATH=$ANDROID_HOME/emulator:$ANDROID_HOME/tools:$ANDROID_HOME/cmdline-tools/bin:$ANDROID_HOME/platform-tools:$PATH' >> /home/gitpod/.bashrc
+
+# Install Android Image version 30
+USER gitpod
+RUN yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools" "platforms;android-30" "emulator"
+RUN yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "system-images;android-30;google_apis;x86_64"
+RUN echo no | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd -n avd28 -k "system-images;android-30;google_apis;x86_64"
+
+
+# Install Google Chrome
+USER root
+RUN apt-get update \
+  && apt-get install -y apt-transport-https \
+  && curl -sSL https://dl.google.com/linux/linux_signing_key.pub | apt-key add - \
+  && echo "deb [arch=amd64] https://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list \
+  && apt-get update \
+  && sudo apt-get install -y google-chrome-stable
+
+# misc deps
+RUN apt-get install -y \
+  libasound2-dev \
+  libgtk-3-dev \
+  libnss3-dev \
+  fonts-noto \
+  fonts-noto-cjk
+
+# For Qt WebEngine on docker
+ENV QTWEBENGINE_DISABLE_SANDBOX 1

.gitpod.yml

@@ -0,0 +1,75 @@
+image:
+  file: .gitpod.Dockerfile
+tasks:
+  - before: sudo mount -t tmpfs shm -osize=4096m /dev/shm
+  - init: |
+      flutter channel beta
+      flutter upgrade
+
+      # flutter config --enable-web
+      flutter config --android-sdk /home/gitpod/androidsdk
+      yes | flutter doctor --android-licenses
+
+      # flutter doctor
+
+      # flutter pub get
+
+      # flutter build -v bundle
+      # flutter build -v web
+      # flutter build -v appbundle
+      # flutter build -v apk
+      
+  # - command: |
+  #     # Gitpod is not able to run emulators within a worspace at this stage as
+  #     # Google Kubernetes Engine does not support Nested Virtualization.
+  #     #
+  #     # If running Gitpod on your own infrastructure or via the Dockerfile locally
+  #     # on infrastructure that exposes vmx or svm then this command will launch
+  #     # the emulator.
+  #     #
+  #     # $ emulator -avd avd28 -no-audio -no-window 
+  #     #
+  #     # Until this restriction is mitigated you can run native mobile apps in your
+  #     # browser via https://appetize.io/
+
+  #     if [[ -z "$APPETIZE_API_TOKEN" ]]; then
+  #         echo "Appetize API token not set. Run:"
+  #         echo ""
+  #         echo "    gp env APPETIZE_API_TOKEN=your_token"
+  #         echo ""
+  #         echo "and restart this workspace in order to get an app preview."
+  #         echo ""
+  #         echo "Request your token here: https://appetize.io/docs#request-api-token"
+  #     else
+  #         curl -sS --http1.1 "https://$APPETIZE_API_TOKEN@api.appetize.io/v1/apps/$APPETIZE_PUBLICKEY" \
+  #             -F "file=@/workspace/template-flutter/build/app/outputs/flutter-apk/app.apk" \
+  #             -F platform=android \
+  #             -F "buttonText=Start App" \
+  #             -F "postSessionButtonText=Start App" \
+  #             > .appetize.json
+
+  #         APPETIZE_PUBLICKEY=$(jq -r .publicKey .appetize.json)
+  #         gp env "APPETIZE_PUBLICKEY=$APPETIZE_PUBLICKEY"
+  #         export APPETIZE_PUBLICKEY
+
+  #         python -m webbrowser "https://appetize.io/embed/$APPETIZE_PUBLICKEY?device=pixel4&autoplay=true"
+  #     fi
+
+  #     flutter devices
+    
+  #     flutter run --web-port 8080
+
+
+ports:
+  - port: 5900
+    onOpen: ignore
+    # vnc
+  - port: 6080
+    onOpen: open-preview
+    # flutter
+  - port: 8080
+    onOpen: open-preview
+
+vscode:
+  extensions:
+    - dart-code.flutter

android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     signingConfigs {
         release {
             storeFile file("sign/flutter_douyin.jks")
@@ -47,7 +47,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.douyin_demo"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

android/build.gradle

@@ -2,11 +2,11 @@ buildscript {
     // ext.kotlin_version = '1.2.71'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:7.2.2'
         // classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.2.0'
     }
@@ -15,7 +15,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

lib/dao/api.dart

@@ -1,3 +1,4 @@
 class Api {
-  
+  static const String _host = "https://xx.com";
+  static const String login = _host + "/login";
 }

lib/main.dart

@@ -1,10 +1,11 @@
 import 'dart:io';
 
 import 'package:douyin_demo/pages/recommend_page.dart';
+import 'package:douyin_demo/routes.dart';
 import 'package:flutter/material.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
-Future main() async {
+void main() async {
   WidgetsFlutterBinding.ensureInitialized();
   final prefs = await SharedPreferences.getInstance();
   prefs.setBool("ifIOS", Platform.isIOS);
@@ -27,7 +28,7 @@ Future main() async {
   prefs.setString("scheme_p", "http");
   prefs.setInt("ports_p", 80);
 
-  prefs.setString("picServer", "http://www.guojio.com");
+  // prefs.setString("picServer", "http://www.guojio.com");
 
   runApp(MyApp());
 }
@@ -39,10 +40,13 @@ class MyApp extends StatelessWidget {
   Widget build(BuildContext context) {
     return MaterialApp(
       title: "抖音",
+      debugShowCheckedModeBanner: false,
       theme: ThemeData(primaryColor: Color(0xff121319)),
       home: RecommendPage(
         selIndex: 0,
       ),
+      routes: Routes.define(),
+      // initialRoute: Routes.splash,
     );
   }
-}
+}

lib/pages/FaceDetection.dart

@@ -10,7 +10,7 @@ class FaceDetectionView extends StatefulWidget {
 }
 
 class _FaceDetectionViewState extends State<FaceDetectionView> {
-  XFile filePath;
+  PickedFile filePath;
 
   @override
   void initState() {
@@ -18,7 +18,7 @@ class _FaceDetectionViewState extends State<FaceDetectionView> {
   }
 
   chooseImage() async {
-    filePath = await ImagePicker().pickImage(
+    filePath = await ImagePicker().getImage(
         source: ImageSource.gallery,
         imageQuality: 100,
         maxWidth: MediaQuery.of(context).size.width);
@@ -49,7 +49,7 @@ class _FaceDetectionViewState extends State<FaceDetectionView> {
   @override
   Widget build(BuildContext context) {
     return Stack(children: [
-      RaisedButton(
+      ElevatedButton(
         child: Text("选择图片"),
         onPressed: () {
           chooseImage();

lib/pages/RecommendPage/BottomSheet.dart

@@ -72,9 +72,9 @@ class ReplyList extends StatelessWidget {
     return Container(
       child: Column(
         mainAxisSize: MainAxisSize.min,
-        children: <Widget>[
+        children: [
           Row(
-            children: <Widget>[
+            children: [
               Container(
                 width: 100 * rpx,
                 height: 100 * rpx,
@@ -123,9 +123,9 @@ class AfterReply extends StatelessWidget {
     return Container(
       child: Column(
         mainAxisSize: MainAxisSize.min,
-        children: <Widget>[
+        children: [
           Row(
-            children: <Widget>[
+            children: [
               Container(
                 width: 100 * rpx,
               ),
@@ -133,7 +133,7 @@ class AfterReply extends StatelessWidget {
                 width: 550 * rpx,
                 child: Row(
                   crossAxisAlignment: CrossAxisAlignment.start,
-                  children: <Widget>[
+                  children: [
                     Container(
                       width: 70 * rpx,
                       height: 70 * rpx,
@@ -220,7 +220,7 @@ class BottomReplyBar extends StatelessWidget {
       decoration: BoxDecoration(
           border: Border(top: BorderSide(color: Colors.grey[200], width: 1))),
       child: Row(
-        children: <Widget>[
+        children: [
           Expanded(
               child: Container(
             padding: EdgeInsets.only(left: 30 * rpx),

lib/pages/RecommendPage/FriendList.dart

@@ -113,7 +113,7 @@ genContentList(
           decoration: BoxDecoration(color: Color(0xff121319)),
           height: 130 * rpx,
           child: Row(
-            children: <Widget>[
+            children: [
               Container(
                 padding: EdgeInsets.all(15 * rpx),
                 width: 100 * rpx,
@@ -128,7 +128,7 @@ genContentList(
                     ? Column(
                         crossAxisAlignment: CrossAxisAlignment.start,
                         mainAxisAlignment: MainAxisAlignment.center,
-                        children: <Widget>[
+                        children: [
                           Container(
                             child: Text(
                               friends[index]["userName"],

lib/pages/camera_main.dart

@@ -147,7 +147,7 @@ class _CameraMainState extends State<CameraMain> {
     }
     final size = MediaQuery.of(context).size;
     return _controller.value.isInitialized
-        ? Stack(children: <Widget>[
+        ? Stack(children: [
             // Camera.open(cameraId),
             findFace
                 ? Positioned(
@@ -190,10 +190,10 @@ class _CameraMainState extends State<CameraMain> {
               left: 250 * rpx,
               child: Container(
                 width: 250 * rpx,
-                child: FlatButton(
+                child: TextButton(
                   onPressed: () {},
                   child: Row(
-                    children: <Widget>[
+                    children: [
                       Icon(
                         Icons.music_note,
                         color: Colors.white,
@@ -484,7 +484,7 @@ class _ScrollBottomBarState extends State<ScrollBottomBar> {
               child: Container(
                 child: Row(
                   mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
+                  children: [
                     SizedBox(
                       width: eachSide,
                     ),
@@ -492,7 +492,7 @@ class _ScrollBottomBarState extends State<ScrollBottomBar> {
                         children: List.generate(items.length, (index) {
                       return Container(
                         width: eachWidth,
-                        child: FlatButton(
+                        child: TextButton(
                           child: Text(
                             items[index],
                             style: TextStyle(
@@ -500,7 +500,9 @@ class _ScrollBottomBarState extends State<ScrollBottomBar> {
                                     ? Colors.white
                                     : Colors.white.withOpacity(0.5)),
                           ),
-                          padding: EdgeInsets.all(0),
+                          style: ButtonStyle(
+                              padding:
+                                  MaterialStateProperty.all(EdgeInsets.zero)),
                           onPressed: () {
                             moveToItem(index);
                           },
@@ -551,8 +553,9 @@ class CircleTakePhoto extends StatelessWidget {
         border: Border.all(
             width: 10 * rpx, color: Color.fromARGB(128, 219, 48, 85)),
       ),
-      child: FlatButton(
-          padding: EdgeInsets.all(0),
+      child: TextButton(
+          style:
+              ButtonStyle(padding: MaterialStateProperty.all(EdgeInsets.zero)),
           onPressed: () async {
             // provider.changeFileName('png');
             // print(provider.fileName);
@@ -591,7 +594,7 @@ class IconWithText extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Column(
-      children: <Widget>[
+      children: [
         icon,
         Text(
           text,

lib/pages/home_page.dart

@@ -1,8 +1,8 @@
 import 'package:after_layout/after_layout.dart';
 import 'package:flutter/material.dart';
 
-class SelfHomePage extends StatelessWidget {
-  const SelfHomePage({Key key}) : super(key: key);
+class HomePage extends StatelessWidget {
+  const HomePage({Key key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
@@ -27,7 +27,7 @@ class HomeMain extends StatefulWidget {
 class _HomeMainState extends State<HomeMain> with TickerProviderStateMixin {
   double extraPicHeight = 0;
   BoxFit fitType;
-  double prev_dy;
+  double prevDy;
   double rpx;
   AnimationController animationController;
   Animation<double> anim;
@@ -38,7 +38,7 @@ class _HomeMainState extends State<HomeMain> with TickerProviderStateMixin {
   void initState() {
     super.initState();
     tabController = TabController(vsync: this, length: 3);
-    prev_dy = 0;
+    prevDy = 0;
     fitType = BoxFit.fitWidth;
     animationController =
         AnimationController(vsync: this, duration: Duration(milliseconds: 300));
@@ -46,17 +46,17 @@ class _HomeMainState extends State<HomeMain> with TickerProviderStateMixin {
   }
 
   updatePicHeight(changed) {
-    if (prev_dy == 0) {
-      prev_dy = changed;
+    if (prevDy == 0) {
+      prevDy = changed;
     }
-    extraPicHeight += changed - prev_dy;
+    extraPicHeight += changed - prevDy;
     if (extraPicHeight >= 200 * widget.rpx) {
       fitType = BoxFit.fitHeight;
     } else {
       fitType = BoxFit.fitWidth;
     }
     setState(() {
-      prev_dy = changed;
+      prevDy = changed;
       extraPicHeight = extraPicHeight;
       fitType = fitType;
     });
@@ -82,7 +82,7 @@ class _HomeMainState extends State<HomeMain> with TickerProviderStateMixin {
             fitType = fitType;
           });
         });
-      prev_dy = 0;
+      prevDy = 0;
     });
   }
 
@@ -200,10 +200,10 @@ class SliverTopBar extends StatelessWidget {
   Widget build(BuildContext context) {
     double rpx = MediaQuery.of(context).size.width / 750;
     return Stack(
-      children: <Widget>[
+      children: [
         Column(
           mainAxisSize: MainAxisSize.min,
-          children: <Widget>[
+          children: [
             Image.asset(
               "assets/images/temple.jpg",
               width: 750 * rpx,
@@ -215,12 +215,14 @@ class SliverTopBar extends StatelessWidget {
               height: 120 * rpx,
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.end,
-                children: <Widget>[
+                children: [
                   Container(
                       height: 80 * rpx,
                       width: 330 * rpx,
-                      child: RaisedButton(
-                        color: Color(0xffdc3254),
+                      child: ElevatedButton(
+                        style: ButtonStyle(
+                          foregroundColor: MaterialStateProperty.all(Color(0xffdc3254))
+                        ),
                         child: Text(
                           "+关注",
                           style: TextStyle(
@@ -263,7 +265,7 @@ class SliverTopBar extends StatelessWidget {
                 padding: EdgeInsets.symmetric(horizontal: 30 * rpx),
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.start,
-                  children: <Widget>[
+                  children: [
                     Text(
                       "马友发",
                       style: TextStyle(
@@ -291,9 +293,9 @@ class SliverTopBar extends StatelessWidget {
                 padding: EdgeInsets.symmetric(horizontal: 20 * rpx),
                 child: Row(
                   mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: <Widget>[
+                  children: [
                     Row(
-                      children: <Widget>[
+                      children: [
                         Icon(
                           Icons.shop,
                           color: Color(0xffeacd3f),
@@ -326,7 +328,7 @@ class SliverTopBar extends StatelessWidget {
               padding: EdgeInsets.symmetric(
                   horizontal: 20 * rpx, vertical: 10 * rpx),
               child: Row(
-                children: <Widget>[
+                children: [
                   Tag(
                     text: "深圳",
                   ),
@@ -343,7 +345,7 @@ class SliverTopBar extends StatelessWidget {
               padding: EdgeInsets.symmetric(
                   horizontal: 20 * rpx, vertical: 30 * rpx),
               child: Row(
-                children: <Widget>[
+                children: [
                   NumWithDesc(
                     numm: "100.2w",
                     desc: "获赞",
@@ -412,7 +414,7 @@ class NumWithDesc extends StatelessWidget {
     return Padding(
         padding: EdgeInsets.only(right: 20 * rpx),
         child: Row(
-          children: <Widget>[
+          children: [
             Text(
               numm,
               style: TextStyle(

lib/pages/same_city_page.dart

@@ -30,15 +30,15 @@ class SameCityMain extends StatelessWidget {
                 child: SafeArea(child: BtmBar(selectIndex: selIndex))),
             body: Column(
               mainAxisSize: MainAxisSize.min,
-              children: <Widget>[
+              children: [
                 Container(
                     height: 120 * rpx,
                     padding: EdgeInsets.all(20 * rpx),
                     child: Row(
                       mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                      children: <Widget>[
+                      children: [
                         Row(
-                          children: <Widget>[
+                          children: [
                             Icon(
                               Icons.near_me,
                               color: Colors.grey[400],
@@ -50,7 +50,7 @@ class SameCityMain extends StatelessWidget {
                           ],
                         ),
                         Row(
-                          children: <Widget>[
+                          children: [
                             Text("切换",
                                 style: TextStyle(color: Colors.grey[400])),
                             Icon(Icons.arrow_right, color: Colors.grey[400])
@@ -65,7 +65,7 @@ class SameCityMain extends StatelessWidget {
                             padding: EdgeInsets.symmetric(horizontal: 10 * rpx),
                             child: Row(
                               crossAxisAlignment: CrossAxisAlignment.start,
-                              children: <Widget>[
+                              children: [
                                 Flexible(
                                     flex: 1,
                                     child: WaterFallList(
@@ -107,9 +107,9 @@ class WaterFallList extends StatelessWidget {
             margin: EdgeInsets.only(bottom: 10 * rpx),
             child: Column(
               mainAxisSize: MainAxisSize.min,
-              children: <Widget>[
+              children: [
                 Stack(
-                  children: <Widget>[
+                  children: [
                     Container(
                         width: 345 * rpx,
                         padding: EdgeInsets.symmetric(horizontal: eachSide),
@@ -126,9 +126,9 @@ class WaterFallList extends StatelessWidget {
                           padding: EdgeInsets.all(eachSide + 10 * rpx),
                           child: Row(
                             mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                            children: <Widget>[
+                            children: [
                               Row(
-                                children: <Widget>[
+                                children: [
                                   Icon(
                                     Icons.near_me,
                                     color: Colors.grey[400],

lib/pages/splash_page.dart

@@ -1,3 +1,4 @@
+import 'package:douyin_demo/routes.dart';
 import 'package:flutter/material.dart';
 
 class SplashPage extends StatefulWidget {
@@ -14,4 +15,16 @@ class _SplashPageState extends State<SplashPage> {
       body: Text("闪屏页"),
     );
   }
+  
+  @override
+  void didChangeDependencies() {
+    super.didChangeDependencies();
+    goMain();
+  }
+
+  void goMain() {
+    Future.delayed(Duration(seconds: 1), () {
+      Routes.popAndPushNamed(context, Routes.home);
+    });
+  }
 }

lib/route/routes.dart

@@ -1,3 +0,0 @@
-class Routes{
-
-}

lib/routes.dart

@@ -0,0 +1,41 @@
+import 'package:douyin_demo/pages/home_page.dart';
+import 'package:douyin_demo/pages/recommend_page.dart';
+import 'package:douyin_demo/pages/splash_page.dart';
+import 'package:flutter/material.dart';
+
+class Routes {
+  static const home = 'app://';
+  static const splash = 'app://splash';
+  static const recommend = "app://recommend";
+
+  static define() => {
+        home: (context) => const HomePage(),
+        splash: (context) => const SplashPage(),
+        recommend: (context) => const RecommendPage(),
+      };
+
+  Routes.pushNamed(BuildContext context, String url, dynamic params) {
+    _getPage(context, url, params: params);
+  }
+
+  Routes.pushNamedNoParams(BuildContext context, String url) {
+    _getPage(context, url);
+  }
+
+  /// 比如splashPage跳转
+  Routes.popAndPushNamed(BuildContext context, String url) {
+    Navigator.of(context).popAndPushNamed(url);
+  }
+
+  _getPage(BuildContext context, String url, {dynamic params}) {
+    if (url.startsWith('https://') || url.startsWith('http://')) {
+      // return WebViewPage(url, params: params);
+    } else {
+      if (params == null) {
+        Navigator.pushNamed(context, url);
+      } else {
+        Navigator.pushNamed(context, url, arguments: params);
+      }
+    }
+  }
+}

lib/views/btn_content.dart

@@ -11,7 +11,7 @@ class BtnContent extends StatelessWidget {
     return Container(
       child: Column(
         mainAxisSize: MainAxisSize.min,
-        children: <Widget>[
+        children: [
           ListTile(
             title: Text(
               "@${provider.mainInfo.userName}",
@@ -25,7 +25,7 @@ class BtnContent extends StatelessWidget {
             ),
           ),
           Row(
-            children: <Widget>[
+            children: [
               SizedBox(
                 width: 10,
               ),

lib/views/button_list.dart

@@ -62,12 +62,12 @@ class _ButtonListState extends State<ButtonList> {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
         crossAxisAlignment: CrossAxisAlignment.center,
-        children: <Widget>[
+        children: [
           Container(
               width: 90 * rpx,
               height: 105 * rpx,
               child: Stack(
-                children: <Widget>[
+                children: [
                   Container(
                       // decoration: BoxDecoration(c),
                       width: 90 * rpx,

lib/views/icon_text.dart

@@ -14,7 +14,7 @@ class IconText extends StatelessWidget {
         mainAxisSize: MainAxisSize.min,
         mainAxisAlignment: MainAxisAlignment.center,
         crossAxisAlignment: CrossAxisAlignment.center,
-        children: <Widget>[
+        children: [
           icon,
           Container(
               // alignment: Alignment.center,

lib/views/main_tab_view.dart

@@ -14,7 +14,7 @@ class MainTabView extends StatelessWidget {
     RecommendProvider provider = Provider.of<RecommendProvider>(context);
     return TabBarView(
       controller: provider.controller,
-      children: <Widget>[
+      children: [
         SwiperMain(
           type: "关注",
         ),

lib/views/swiper_main.dart

@@ -17,6 +17,7 @@ class SwiperMain extends StatefulWidget {
 
 class _SwiperMainState extends State<SwiperMain>
     with AutomaticKeepAliveClientMixin {
+      
   @override
   Widget build(BuildContext context) {
     RecommendProvider provider = Provider.of<RecommendProvider>(context);

lib/widgets/WebRequest.dart

@@ -36,7 +36,6 @@ class WebRequest extends Object {
     }
     Uri url = Uri(
         scheme: scheme,
-        //http https
         host: hosts,
         port: ports,
         path: path,

lib/widgets/bottom_bar.dart

@@ -71,7 +71,7 @@ class _BtmBarState extends State<BtmBar> {
       case 2:
         Navigator.pushAndRemoveUntil(
             context,
-            MaterialPageRoute(builder: (context) => SelfHomePage()),
+            MaterialPageRoute(builder: (context) => HomePage()),
             ModalRoute.withName("/selfHome"));
         break;
       case 3:
@@ -101,7 +101,7 @@ class _BtmBarState extends State<BtmBar> {
     return Container(
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceAround,
-        children: <Widget>[
+        children: [
           Expanded(
               flex: 1,
               child: getBtmTextWidget("首页", selected[0], () {
@@ -136,7 +136,7 @@ class _BtmBarState extends State<BtmBar> {
 }
 
 getBtmTextWidget(String content, bool ifSelected, tapFunc, double rpx) {
-  return FlatButton(
+  return TextButton(
       onPressed: () {
         tapFunc();
       },
@@ -167,13 +167,14 @@ class AddIcon extends StatelessWidget {
       padding: EdgeInsets.symmetric(horizontal: 30 * rpx),
       height: iconHeight,
       width: 150 * rpx,
-      child: FlatButton(
-          padding: EdgeInsets.all(0),
+      child: TextButton(
+          style:
+              ButtonStyle(padding: MaterialStateProperty.all(EdgeInsets.zero)),
           onPressed: () {
             tapItem();
           },
           child: Stack(
-            children: <Widget>[
+            children: [
               Positioned(
                 height: iconHeight,
                 width: totalWidth - eachSide,

pubspec.lock

@@ -5,105 +5,91 @@ packages:
     dependency: "direct main"
     description:
       name: after_layout
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.2.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.6.1"
-  boolean_selector:
-    dependency: transitive
-    description:
-      name: boolean_selector
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.9.0"
   camera:
     dependency: "direct main"
     description:
       name: camera
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.5.8+17"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  charcode:
-    dependency: transitive
-    description:
-      name: charcode
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.2.0"
-  clock:
+  collection:
     dependency: transitive
     description:
-      name: clock
-      url: "https://pub.dartlang.org"
+      name: collection
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
-  collection:
+    version: "1.16.0"
+  cross_file:
     dependency: transitive
     description:
-      name: collection
-      url: "https://pub.dartlang.org"
+      name: cross_file
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.15.0"
+    version: "0.3.3+1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "3.0.2"
+  csslib:
+    dependency: transitive
+    description:
+      name: csslib
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.0.1"
+    version: "0.17.2"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.4"
+    version: "1.0.5"
   fading_edge_scrollview:
     dependency: transitive
     description:
       name: fading_edge_scrollview
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.1"
-  fake_async:
-    dependency: transitive
-    description:
-      name: fake_async
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.0"
+    version: "3.0.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.2"
+    version: "2.0.1"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "6.1.2"
   firebase_ml_vision:
     dependency: "direct main"
     description:
       name: firebase_ml_vision
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.9.10"
   flutter:
@@ -115,250 +101,294 @@ packages:
     dependency: transitive
     description:
       name: flutter_page_indicator
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.0.3"
   flutter_plugin_android_lifecycle:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.11"
+    version: "2.0.7"
   flutter_swiper:
     dependency: "direct main"
     description:
       name: flutter_swiper
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.1.6"
-  flutter_test:
-    dependency: transitive
-    description: flutter
-    source: sdk
-    version: "0.0.0"
   flutter_web_plugins:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.0"
+  html:
+    dependency: transitive
+    description:
+      name: html
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.15.0"
   http:
     dependency: transitive
     description:
       name: http
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.2"
+    version: "0.13.5"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "3.1.4"
+    version: "4.0.1"
   image_gallery_saver:
     dependency: "direct main"
     description:
       name: image_gallery_saver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.7.1"
   image_picker:
     dependency: "direct main"
     description:
       name: image_picker
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.7+22"
+    version: "0.8.5+3"
+  image_picker_android:
+    dependency: transitive
+    description:
+      name: image_picker_android
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.8.5+2"
+  image_picker_for_web:
+    dependency: transitive
+    description:
+      name: image_picker_for_web
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.8"
+  image_picker_ios:
+    dependency: transitive
+    description:
+      name: image_picker_ios
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "0.8.5+6"
   image_picker_platform_interface:
     dependency: transitive
     description:
       name: image_picker_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.6"
+    version: "2.6.1"
   image_picker_saver:
     dependency: "direct main"
     description:
       name: image_picker_saver
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.3.0"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.6.3"
+    version: "0.6.4"
   json_annotation:
     dependency: "direct main"
     description:
       name: json_annotation
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.1"
   lpinyin:
     dependency: "direct main"
     description:
       name: lpinyin
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.3"
   marquee:
     dependency: "direct main"
     description:
       name: marquee
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.1"
+    version: "2.2.3"
   marquee_flutter:
     dependency: "direct main"
     description:
       name: marquee_flutter
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.4"
-  matcher:
+  material_color_utilities:
     dependency: transitive
     description:
-      name: matcher
-      url: "https://pub.dartlang.org"
+      name: material_color_utilities
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "0.12.10"
+    version: "0.1.4"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   nested:
     dependency: transitive
     description:
       name: nested
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "1.0.0"
   path:
     dependency: "direct main"
     description:
       name: path
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.2"
   path_provider:
     dependency: "direct main"
     description:
       name: path_provider
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.4"
+    version: "2.0.11"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.19"
+  path_provider_ios:
+    dependency: transitive
+    description:
+      name: path_provider_ios
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.11"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.5"
+    version: "2.1.7"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.6"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.0"
+    version: "2.0.4"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.5"
-  pedantic:
-    dependency: transitive
-    description:
-      name: pedantic
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.11.1"
+    version: "2.1.2"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.0.3"
+    version: "2.1.2"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.2.3"
+    version: "4.2.4"
   provider:
     dependency: "direct main"
     description:
       name: provider
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "6.0.2"
+    version: "6.0.3"
   shared_preferences:
     dependency: "direct main"
     description:
       name: shared_preferences
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.15"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.0.12"
+  shared_preferences_ios:
+    dependency: transitive
+    description:
+      name: shared_preferences_ios
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.1.1"
   shared_preferences_linux:
     dependency: transitive
     description:
       name: shared_preferences_linux
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.1"
   shared_preferences_macos:
     dependency: transitive
     description:
       name: shared_preferences_macos
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.4"
   shared_preferences_platform_interface:
     dependency: transitive
     description:
       name: shared_preferences_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   shared_preferences_web:
     dependency: transitive
     description:
       name: shared_preferences_web
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.3"
+    version: "2.0.4"
   shared_preferences_windows:
     dependency: transitive
     description:
       name: shared_preferences_windows
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.4"
+    version: "2.1.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -368,121 +398,114 @@ packages:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.8.1"
-  stack_trace:
-    dependency: transitive
-    description:
-      name: stack_trace
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.10.0"
+    version: "1.9.1"
   sticky_headers:
     dependency: "direct main"
     description:
       name: sticky_headers
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.8+1"
-  stream_channel:
-    dependency: transitive
-    description:
-      name: stream_channel
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
   stretchy_header:
     dependency: "direct main"
     description:
       name: stretchy_header
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "2.0.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.2.0"
-  test_api:
-    dependency: transitive
-    description:
-      name: test_api
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.0"
+    version: "1.2.1"
   transformer_page_view:
     dependency: transitive
     description:
       name: transformer_page_view
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.1.6"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "1.3.0"
+    version: "1.3.1"
   uuid:
     dependency: "direct main"
     description:
       name: uuid
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "3.0.6"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.1.0"
+    version: "2.1.2"
   video_player:
     dependency: "direct main"
     description:
       name: video_player
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.3"
+    version: "2.4.6"
+  video_player_android:
+    dependency: transitive
+    description:
+      name: video_player_android
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.3.8"
+  video_player_avfoundation:
+    dependency: transitive
+    description:
+      name: video_player_avfoundation
+      url: "https://pub.flutter-io.cn"
+    source: hosted
+    version: "2.3.5"
   video_player_platform_interface:
     dependency: transitive
     description:
       name: video_player_platform_interface
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "4.2.0"
+    version: "5.1.4"
   video_player_web:
     dependency: transitive
     description:
       name: video_player_web
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.0.7"
+    version: "2.0.12"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
-    version: "2.2.10"
+    version: "2.7.0"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "0.2.0+1"
 sdks:
-  dart: ">=2.13.0 <3.0.0"
-  flutter: ">=2.0.0"
+  dart: ">=2.17.0 <3.0.0"
+  flutter: ">=3.0.0"

pubspec.yaml

@@ -25,10 +25,11 @@ dependencies:
   path_provider: ^2.0.2
   path: ^1.8.0
   uuid: ^3.0.6
+  # uses a deprecated version of the Android embedding
   image_picker_saver: ^0.3.0
   image_gallery_saver: ^1.7.1
   firebase_ml_vision: ^0.9.2+2
-  image_picker: ^0.6.7+9
+  image_picker: ^0.8.3+3
 
 dev_dependencies:
   # flutter_test:

test/widget_test.dart

@@ -1,30 +0,0 @@
-// This is a basic Flutter widget test.
-//
-// To perform an interaction with a widget in your test, use the WidgetTester
-// utility that Flutter provides. For example, you can send tap and scroll
-// gestures. You can also use WidgetTester to find child widgets in the widget
-// tree, read text, and verify that the values of widget properties are correct.
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import 'package:douyin_demo/main.dart';
-
-void main() {
-  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-    // Build our app and trigger a frame.
-    await tester.pumpWidget(MyApp());
-
-    // Verify that our counter starts at 0.
-    expect(find.text('0'), findsOneWidget);
-    expect(find.text('1'), findsNothing);
-
-    // Tap the '+' icon and trigger a frame.
-    await tester.tap(find.byIcon(Icons.add));
-    await tester.pump();
-
-    // Verify that our counter has incremented.
-    expect(find.text('0'), findsNothing);
-    expect(find.text('1'), findsOneWidget);
-  });
-}