flutter sdk升级最新版本

video_player报错,无奈,删除了封装的库
还有其它部分的错误更改

Author: softfatgay

.gitignore

@@ -8,8 +8,6 @@
 .buildlog/
 .history
 .svn/
-.gradle
-
 
 # IntelliJ related
 *.iml
@@ -26,50 +24,14 @@
 **/doc/api/
 .dart_tool/
 .flutter-plugins
+.flutter-plugins-dependencies
 .packages
 .pub-cache/
 .pub/
 /build/
 
-# Android related
-**/android/**/gradle-wrapper.jar
-**/android/.gradle
-**/android/captures/
-**/android/gradlew
-**/android/gradlew.bat
-**/android/local.properties
-**/android/**/GeneratedPluginRegistrant.java
-
-# iOS/XCode related
-**/ios/**/*.mode1v3
-**/ios/**/*.mode2v3
-**/ios/**/*.moved-aside
-**/ios/**/*.pbxuser
-**/ios/**/*.perspectivev3
-**/ios/**/*sync/
-**/ios/**/.sconsign.dblite
-**/ios/**/.tags*
-**/ios/**/.vagrant/
-**/ios/**/DerivedData/
-**/ios/**/Icon?
-**/ios/**/Pods/
-**/ios/**/.symlinks/
-**/ios/**/profile
-**/ios/**/xcuserdata
-**/ios/.generated/
-**/ios/Flutter/App.framework
-**/ios/Flutter/Flutter.framework
-**/ios/Flutter/Generated.xcconfig
-**/ios/Flutter/app.flx
-**/ios/Flutter/app.zip
-**/ios/Flutter/flutter_assets/
-**/ios/Flutter/flutter_export_environment.sh
-**/ios/ServiceDefinitions.json
-**/ios/Runner/GeneratedPluginRegistrant.*
+# Web related
+lib/generated_plugin_registrant.dart
 
 # Exceptions to above rules.
-!**/ios/**/default.mode1v3
-!**/ios/**/default.mode2v3
-!**/ios/**/default.pbxuser
-!**/ios/**/default.perspectivev3
 !/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: cc949a8e8b9cf394b9290a8e80f87af3e207dce5
+  revision: 27321ebbad34b0a3fafe99fac037102196d655ff
   channel: stable
 
 project_type: app

README.md

@@ -1,60 +1,16 @@
-# FlutterWant
+# flutter_want
 
->项目是基于 luoGuoXiong 的 easyMarketFlutter 而写的,其中前三个模块的接口也是其项目用的api，其次，再次非常感谢luoGuoXiong，作为一个初学者，给我提供了非常大的帮,希望对大家有用.
->
->需要注意,项目中使用了kotlin,编译不通过的,注意更改build文件
->
-### [Peroluo(给他点赞)](https://github.com/Peroluo) 
->
-### [easyMarketFlutter地址](https://github.com/Peroluo/easyMarketFlutter) 
->
->
-## [关于我](https://github.com/softfatgay)
+A new Flutter application.
 
-## [demo.apk下载地址](https://www.pgyer.com/QjBP)
+## Getting Started
 
+This project is a starting point for a Flutter application.
 
-## 在此基础上增加的一些功能
+A few resources to get you started if this is your first Flutter project:
 
->1.为了演示与luoGuoXiong使用的Dio网络库对比，把几个接口返回数据进行了封装，直接解析成大家比较直观的java Model类型
->
->2.添加了flutter与安卓原生的交互，调用安卓activity，并为其传递参数
->
->3.为了方便大家理解，项目目录重新划分，以文件的形式，把各个模块区分
->
->4.其中实现比较复杂的模块，使用了比较简单的形式实现
->
->5.其中部分模块实现安卓原生吸附的效果
->
->6.拍照/相册(我的界面，点击图像),弹出框等其他一些内容
->
->7.视频播放(chewie,更改了源码,添加全屏标题返回键,双击手势等一些UI改动)
->
->8.增加搜索功能,封装有StafulWidget的组件,带回调参数的,供大家参考(搜索框)
->
->9.富文本，以及富文本点击事件，跳转安卓原生Webview等其他一些功能
->
->10.后续我会持续更新此项目，也会持续跟进luoGuoXiong的项目，由于本人没有api接口，只能用他的😀😁😂😃😄
+- [Lab: Write your first Flutter app](https://flutter.dev/docs/get-started/codelab)
+- [Cookbook: Useful Flutter samples](https://flutter.dev/docs/cookbook)
 
-## 使用的第三方库
-1. [Flutter中文网](https://flutterchina.club/) 
-2. [Dio](https://pub.flutter-io.cn/packages/dio)
-3. [webview_flutter](https://pub.flutter-io.cn/packages/webview_flutter)
-4. [cached_network_image](https://pub.flutter-io.cn/packages/cached_network_image)
-5. [flutter_swiper](https://pub.flutter-io.cn/packages/flutter_swiper) 
-6. [Toast](https://pub.flutter-io.cn/packages/toast)
-7. [flutter_html](https://pub.flutter-io.cn/packages/flutter_html)
-8. [image_picker](https://pub.flutter-io.cn/packages/image_picker)
-9. [common_utils](https://pub.flutter-io.cn/packages/common_utils)
-10. [package_info](https://pub.flutter-io.cn/packages/package_info)
->
->
-
-
-
-## 最后
-*谢谢大家
->
-*站在巨人的肩上才能看的更远,一起学习
->
-*我的邮箱 [email protected]
+For help getting started with Flutter, view our
+[online documentation](https://flutter.dev/docs), which offers tutorials,
+samples, guidance on mobile development, and a full API reference.

android/.gitignore

@@ -0,0 +1,7 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java

android/app/build.gradle

@@ -8,7 +8,7 @@ if (localPropertiesFile.exists()) {
 
 def flutterRoot = localProperties.getProperty('flutter.sdk')
 if (flutterRoot == null) {
-//    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
 }
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
@@ -38,12 +38,12 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.want"
+        applicationId "com.example.flutter_want"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -62,9 +62,8 @@ flutter {
 dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-
 }

android/app/src/debug/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.want">
+    package="com.example.flutter_want">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/AndroidManifest.xml

@@ -1,37 +1,35 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.want">
-
+    package="com.example.flutter_want">
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
          In most cases you can leave this as-is, but you if you want to provide
          additional functionality it is fine to subclass or reimplement
          FlutterApplication and put your custom class here. -->
+
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="FlutterWant"
-        android:theme="@style/AppTheme"
+        android:label="flutter_want"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:usesCleartextTraffic="true"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
-            <!-- This keeps the window background of the activity showing
-                 until Flutter renders its first frame. It can be removed if
-                 there is no splash screen (such as the default splash screen
-                 defined in @style/LaunchTheme). -->
-            <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <!-- Don't delete the meta-data below.
+             This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
 
         <activity android:name=".WebViewActivity" />
     </application>

android/app/src/main/kotlin/com/example/want/Const.java renamed to android/app/src/main/kotlin/com/example/flutter_want/Const.java

@@ -1,4 +1,4 @@
-package com.example.want;
+package com.example.flutter_want;
 
 public class Const {
      static final String flutterJumpActivity = "com.example.want/flutter2activity";

android/app/src/main/kotlin/com/example/want/FlutterPluginCounter.java renamed to android/app/src/main/kotlin/com/example/flutter_want/FlutterPluginCounter.java

@@ -1,4 +1,4 @@
-package com.example.want;
+package com.example.flutter_want;
 
 import android.app.Activity;
 import android.util.Log;

android/app/src/main/kotlin/com/example/want/FlutterPluginJumpToActivity.java renamed to android/app/src/main/kotlin/com/example/flutter_want/FlutterPluginJumpToActivity.java

@@ -1,4 +1,4 @@
-package com.example.want;
+package com.example.flutter_want;
 
 import android.app.Activity;
 import android.content.Intent;

android/app/src/main/kotlin/com/example/flutter_want/MainActivity.kt

@@ -0,0 +1,12 @@
+package com.example.flutter_want
+
+import androidx.annotation.NonNull
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugins.GeneratedPluginRegistrant
+
+class MainActivity: FlutterActivity() {
+    override fun configureFlutterEngine(@NonNull flutterEngine: FlutterEngine) {
+        GeneratedPluginRegistrant.registerWith(flutterEngine)
+    }
+}

android/app/src/main/kotlin/com/example/want/WebViewActivity.java renamed to android/app/src/main/kotlin/com/example/flutter_want/WebViewActivity.java

@@ -1,12 +1,9 @@
-package com.example.want;
+package com.example.flutter_want;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.view.View;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-
-import java.io.Serializable;
 import java.util.HashMap;
 
 public class WebViewActivity extends Activity {

android/app/src/main/kotlin/com/example/want/MainActivity.kt

@@ -6,7 +6,8 @@
              Flutter draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+
     <style name="AppTheme" parent="@android:style/Theme.Light.NoTitleBar">
-<!--        <item name="android:windowBackground">@null</item>-->
+        <!--        <item name="android:windowBackground">@null</item>-->
     </style>
 </resources>

android/app/src/main/res/drawable/open.jpg renamed to android/app/src/main/res/drawable/open.png

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_app">
+    package="com.example.flutter_want">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

android/app/src/main/res/values/styles.xml

@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

android/app/src/profile/AndroidManifest.xml

@@ -1,2 +1,4 @@
 org.gradle.jvmargs=-Xmx1536M
-
+android.enableR8=true
+android.useAndroidX=true
+android.enableJetifier=true

android/build.gradle

@@ -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-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip

android/gradle.properties

@@ -0,0 +1 @@
+{}

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,32 @@
+*.mode1v3
+*.mode2v3
+*.moved-aside
+*.pbxuser
+*.perspectivev3
+**/*sync/
+.sconsign.dblite
+.tags*
+**/.vagrant/
+**/DerivedData/
+Icon?
+**/Pods/
+**/.symlinks/
+profile
+xcuserdata
+**/.generated/
+Flutter/App.framework
+Flutter/Flutter.framework
+Flutter/Flutter.podspec
+Flutter/Generated.xcconfig
+Flutter/app.flx
+Flutter/app.zip
+Flutter/flutter_assets/
+Flutter/flutter_export_environment.sh
+ServiceDefinitions.json
+Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!default.mode1v3
+!default.mode2v3
+!default.pbxuser
+!default.perspectivev3

android/res/values/strings_en.arb

@@ -1,2 +1 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/.gitignore

@@ -1,2 +1 @@
-#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"