boyrobot 9 months ago
parent
commit
f9c6545a39

File diff suppressed because it is too large
+ 0 - 0
.flutter-plugins-dependencies


+ 3 - 3
android/app/build.gradle

@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion 33
     signingConfigs {
         release {
             storeFile file("../sign/release.jks")
@@ -54,7 +54,7 @@ android {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "yoqi.me.flutternote"
         minSdkVersion 16
-        targetSdkVersion 31
+        targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
 //        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -77,7 +77,7 @@ flutter {
 }
 
 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    // 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'

+ 1 - 0
android/app/src/main/AndroidManifest.xml

@@ -22,6 +22,7 @@
             android:value="14ece3f2826950a4250d19726c8436ff" />
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density"

+ 3 - 3
android/build.gradle

@@ -1,8 +1,8 @@
 buildscript {
-    ext.kotlin_version = '1.3.50'
+    ext.kotlin_version = '1.7.10'
     repositories {
         google()
-        maven{url'http://maven.aliyun.com/nexus/content/groups/public/'}
+        mavenCentral()
     }
 
     dependencies {
@@ -14,7 +14,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        maven{url'http://maven.aliyun.com/nexus/content/groups/public/'}
+        mavenCentral()    
     }
 }
 

+ 5 - 5
ios/Flutter/flutter_export_environment.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 # This is a generated file; do not edit or check into version control.
-export "FLUTTER_ROOT=/home/lyq/flutter"
-export "FLUTTER_APPLICATION_PATH=/home/lyq/workspaces/flutter_note"
+export "FLUTTER_ROOT=/home/vscode/flutter"
+export "FLUTTER_APPLICATION_PATH=/workspaces/Open-IM-Flutter-Demo/finish_project/flutter_note"
 export "COCOAPODS_PARALLEL_CODE_SIGN=true"
 export "FLUTTER_TARGET=lib/main.dart"
 export "FLUTTER_BUILD_DIR=build"
-export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NAME=1.2.1"
 export "FLUTTER_BUILD_NUMBER=1"
 export "DART_OBFUSCATION=false"
-export "TRACK_WIDGET_CREATION=false"
+export "TRACK_WIDGET_CREATION=true"
 export "TREE_SHAKE_ICONS=false"
-export "PACKAGE_CONFIG=.packages"
+export "PACKAGE_CONFIG=.dart_tool/package_config.json"

+ 4 - 4
lib/views/cartpage/bottom_summary.dart

@@ -11,8 +11,7 @@ class BottomCartSummary extends StatelessWidget {
     return Container(
       padding: const EdgeInsets.symmetric(horizontal: 12.0, vertical: 8.0),
       height: 60.0,
-      child:
-          Row(crossAxisAlignment: CrossAxisAlignment.center, children: [
+      child: Row(crossAxisAlignment: CrossAxisAlignment.center, children: [
         Checkbox(
             value: cartProvide.allCheckedState,
             onChanged: (checkState) {
@@ -44,11 +43,12 @@ class BottomCartSummary extends StatelessWidget {
                   ],
                 ))),
         // 结算按钮
-        RaisedButton(
+        ElevatedButton(
           onPressed: () {},
           child: Text('结算(${cartProvide.allCheckedCount})',
               style: TextStyle(color: Colors.white)),
-          color: Colors.pink,
+          style: ButtonStyle(
+              backgroundColor: MaterialStateProperty.all(Colors.pink)),
         )
       ]),
     );

+ 7 - 5
lib/views/cartpage/empty_cart.dart

@@ -24,11 +24,13 @@ class EmptyShoppingCart extends StatelessWidget {
             child: Text('购物车还空着,快去挑选商品吧~',
                 style: TextStyle(fontSize: 12.0, color: Colors.black26)),
           ),
-          RaisedButton(
-              onPressed: () =>
-                  Provide.value<PageIndexProvide>(context).changePage(0),
-              child: Text('随便逛逛', style: TextStyle(color: Colors.white)),
-              color: Colors.pink)
+          ElevatedButton(
+            onPressed: () =>
+                Provide.value<PageIndexProvide>(context).changePage(0),
+            child: Text('随便逛逛', style: TextStyle(color: Colors.white)),
+            style: ButtonStyle(
+                backgroundColor: MaterialStateProperty.all(Colors.pink)),
+          )
         ],
       ),
     );

+ 2 - 2
pubspec.yaml

@@ -1,8 +1,8 @@
 name: flutter_note
 description: Flutter 工作中不断总结.
-version: 1.0.0+1
+version: 1.2.1+1
 environment:
-  sdk: ">=2.17.6 <3.0.0"
+  sdk: ">=2.19.2 <3.0.0"
 
 dependencies:
   flutter:

Some files were not shown because too many files changed in this diff