chore: 升级 Flutter SDK 3.10.7 → 3.29.3，适配 flutter analyze 自动修复

.gitignore

@@ -44,6 +44,7 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+/android/app/.cxx
 
 # fvm
 .fvm/

android/app/build.gradle

-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
-}
-
-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.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    id "dev.flutter.flutter-gradle-plugin"
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 def keystorePropertiesFile = rootProject.file("key.properties")
 def keystoreProperties = new Properties()
 keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     namespace "com.zijin.book.flutter_book"
-//    compileSdkVersion flutter.compileSdkVersion
-    compileSdkVersion 34
-    ndkVersion flutter.ndkVersion
+    compileSdk flutter.compileSdkVersion
+    ndkVersion = "27.0.12077973"
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = "17"
     }
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.zijin.book.flutter_book"
-        // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion 21
+        minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        versionCode flutter.versionCode
+        versionName flutter.versionName
     }
+
     signingConfigs {
-        release{
+        release {
             keyAlias keystoreProperties['keyAlias']
             keyPassword keystoreProperties['keyPassword']
             storeFile file(keystoreProperties['storeFile'])
             storePassword keystoreProperties['storePassword']
         }
-        // debug 使用默认签名
     }
 
     buildTypes {
@@ -65,14 +44,11 @@ android {
             // 使用默认 debug 签名
         }
         release {
-            // TODO: Add your own signing config for the release build.
-            // Signing with the debug keys for now, so `flutter run --release` works.
             signingConfig signingConfigs.release
         }
-
     }
 }
 
 flutter {
-    source '../..'
+    source "../.."
 }

android/app/src/main/AndroidManifest.xml

-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zijing.book.flutterBook">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- INTERNET 权限在开发过程中是必需的。具体来说，Flutter 需要它与正在运行的应用程序进行通信，以允许设置断点、提供热重载等功能-->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.CAMERA" />

android/build.gradle

-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://mirrors.tencent.com/nexus/repository/maven-public/' }
         google()
         mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
+}
+subprojects { sub ->
+    if (sub.state.executed) {
+        if (sub.hasProperty('android') && sub.android.namespace == null) {
+            sub.android.namespace = sub.group
+        }
+    } else {
+        sub.afterEvaluate { p ->
+            if (p.hasProperty('android') && p.android.namespace == null) {
+                p.android.namespace = p.group
+            }
+        }
+    }
 }
 
 tasks.register("clean", Delete) {

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip

android/settings.gradle

-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null : "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        maven { url 'https://maven.aliyun.com/repository/google' }
+        maven { url 'https://maven.aliyun.com/repository/central' }
+        maven { url 'https://maven.aliyun.com/repository/public' }
+        maven { url 'https://mirrors.tencent.com/nexus/repository/maven-public/' }
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "8.7.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+}
+
+include ":app"
+
+gradle.beforeProject { project ->
+    project.buildscript {
+        repositories {
+            maven { url 'https://maven.aliyun.com/repository/google' }
+            maven { url 'https://maven.aliyun.com/repository/central' }
+            maven { url 'https://maven.aliyun.com/repository/public' }
+            maven { url 'https://mirrors.tencent.com/nexus/repository/maven-public/' }
+            google()
+            mavenCentral()
+        }
+        configurations.all {
+            resolutionStrategy {
+                eachDependency { details ->
+                    if (details.requested.group == 'com.android.tools.build' && details.requested.name == 'gradle') {
+                        details.useVersion '8.7.0'
+                    }
+                }
+            }
+        }
+    }
+}

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

ios/Podfile

-# Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+platform :ios, '13.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -27,6 +26,8 @@ require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelpe
 
 flutter_ios_podfile_setup
 
+use_modular_headers!
+
 target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
   target 'RunnerTests' do
@@ -37,6 +38,24 @@ end
 post_install do |installer|
   installer.pods_project.targets.each do |target|
     flutter_additional_ios_build_settings(target)
+
+    # Fix WXApi.h not found for fluwx
+    if target.name == 'fluwx'
+      target.build_configurations.each do |config|
+        config.build_settings['FRAMEWORK_SEARCH_PATHS'] ||= ['$(inherited)']
+        config.build_settings['FRAMEWORK_SEARCH_PATHS'] << '$(BUILT_PRODUCTS_DIR)/WechatOpenSDK-XCFramework'
+        config.build_settings['HEADER_SEARCH_PATHS'] ||= ['$(inherited)']
+        config.build_settings['HEADER_SEARCH_PATHS'] << '${PODS_ROOT}/WechatOpenSDK-XCFramework/WechatOpenSDK.xcframework/ios-arm64/WechatOpenSDK.framework/Headers'
+      end
+    end
+
+    # Fix flutter_sound modular header issue
+    if target.name == 'flutter_sound' || target.name == 'flutter_sound_core'
+      target.build_configurations.each do |config|
+        config.build_settings['DEFINES_MODULE'] = 'YES'
+      end
+    end
+
     target.build_configurations.each do |config|
       config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
         '$(inherited)',

ios/Podfile.lock

@@ -14,14 +14,14 @@ PODS:
   - flutter_inappwebview_ios (0.0.1):
     - Flutter
     - flutter_inappwebview_ios/Core (= 0.0.1)
-    - OrderedSet (~> 5.0)
+    - OrderedSet (~> 6.0.3)
   - flutter_inappwebview_ios/Core (0.0.1):
     - Flutter
-    - OrderedSet (~> 5.0)
-  - flutter_sound (9.2.13):
+    - OrderedSet (~> 6.0.3)
+  - flutter_sound (9.30.0):
     - Flutter
-    - flutter_sound_core (= 9.2.13)
-  - flutter_sound_core (9.2.13)
+    - flutter_sound_core (= 9.30.0)
+  - flutter_sound_core (9.30.0)
   - flutter_tts (0.0.1):
     - Flutter
   - fluwx (0.0.1):
@@ -29,24 +29,25 @@ PODS:
     - fluwx/pay (= 0.0.1)
   - fluwx/pay (0.0.1):
     - Flutter
-    - WechatOpenSDK-XCFramework (~> 2.0.2)
+    - WechatOpenSDK-XCFramework (~> 2.0.4)
   - image_picker_ios (0.0.1):
     - Flutter
   - just_audio (0.0.1):
     - Flutter
-  - OrderedSet (5.0.0)
+    - FlutterMacOS
+  - OrderedSet (6.0.3)
   - package_info_plus (0.4.5):
     - Flutter
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - permission_handler_apple (9.1.1):
+  - permission_handler_apple (9.3.0):
     - Flutter
-  - ReachabilitySwift (5.0.0)
+  - ReachabilitySwift (5.2.4)
   - shared_preferences_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - sqflite (0.0.3):
+  - sqflite_darwin (0.0.4):
     - Flutter
     - FlutterMacOS
   - tobias (0.0.1):
@@ -54,7 +55,7 @@ PODS:
     - tobias/normal (= 0.0.1)
   - tobias/normal (0.0.1):
     - Flutter
-  - WechatOpenSDK-XCFramework (2.0.2)
+  - WechatOpenSDK-XCFramework (2.0.5)
 
 DEPENDENCIES:
   - audio_session (from `.symlinks/plugins/audio_session/ios`)
@@ -68,12 +69,12 @@ DEPENDENCIES:
   - flutter_tts (from `.symlinks/plugins/flutter_tts/ios`)
   - fluwx (from `.symlinks/plugins/fluwx/ios`)
   - image_picker_ios (from `.symlinks/plugins/image_picker_ios/ios`)
-  - just_audio (from `.symlinks/plugins/just_audio/ios`)
+  - just_audio (from `.symlinks/plugins/just_audio/darwin`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
-  - sqflite (from `.symlinks/plugins/sqflite/darwin`)
+  - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`)
   - tobias (from `.symlinks/plugins/tobias/ios`)
 
 SPEC REPOS:
@@ -107,7 +108,7 @@ EXTERNAL SOURCES:
   image_picker_ios:
     :path: ".symlinks/plugins/image_picker_ios/ios"
   just_audio:
-    :path: ".symlinks/plugins/just_audio/ios"
+    :path: ".symlinks/plugins/just_audio/darwin"
   package_info_plus:
     :path: ".symlinks/plugins/package_info_plus/ios"
   path_provider_foundation:
@@ -116,35 +117,35 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/permission_handler_apple/ios"
   shared_preferences_foundation:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
-  sqflite:
-    :path: ".symlinks/plugins/sqflite/darwin"
+  sqflite_darwin:
+    :path: ".symlinks/plugins/sqflite_darwin/darwin"
   tobias:
     :path: ".symlinks/plugins/tobias/ios"
 
 SPEC CHECKSUMS:
-  audio_session: 9bdd3bf46960d4322cb8c3cb6138295dcfe84eee
+  audio_session: 9bb7f6c970f21241b19f5a3658097ae459681ba0
   connectivity_plus: 481668c94744c30c53b8895afb39159d1e619bdf
   device_info_plus: 335f3ce08d2e174b9fdc3db3db0f4e3b1f66bd89
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_app_update: 816fdb2e30e4832a7c45e3f108d391c42ef040a9
   flutter_inapp_purchase: 722da12971a50f306f37e62fc1aaf576b1cbecf6
-  flutter_inappwebview_ios: 25b61a1b550d1068e4ddaf490fc1d03c2ce6828d
-  flutter_sound: 49be32081884d275fe91d48262f4b1fcd86e10d3
-  flutter_sound_core: 26c10e5832e76aaacfae252d8925232281c486ae
+  flutter_inappwebview_ios: b89ba3482b96fb25e00c967aae065701b66e9b99
+  flutter_sound: d95194f6476c9ad211d22b3a414d852c12c7ca44
+  flutter_sound_core: 7f2626d249d3a57bfa6da892ef7e22d234482c1a
   flutter_tts: b88dbc8655d3dc961bc4a796e4e16a4cc1795833
-  fluwx: 70e62e0330c46b988a1c79ce9731f0d4bc4b26fb
-  image_picker_ios: 85f2b3c9fb98c09d63725c4d12ebd585b56ec35d
-  just_audio: 6c031bb61297cf218b4462be616638e81c058e97
-  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
+  fluwx: 49b4472b54762abde51daa0bc348ba05520016ac
+  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  just_audio: 4e391f57b79cad2b0674030a00453ca5ce817eed
+  OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94
   package_info_plus: 566e1b7a2f3900e4b0020914ad3fc051dcc95596
-  path_provider_foundation: 608fcb11be570ce83519b076ab6a1fffe2474f05
-  permission_handler_apple: 3787117e48f80715ff04a3830ca039283d6a4f29
-  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
-  shared_preferences_foundation: 0b09b969fb36da5551c0bc4a2dbd9d0ff9387478
-  sqflite: c35dad70033b8862124f8337cc994a809fcd9fa3
-  tobias: 50b529c2501d277c83fef9976803a001eb58a057
-  WechatOpenSDK-XCFramework: acdeeda129efbef9532bca8a10c24e1b4b8c7d69
+  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
+  ReachabilitySwift: 32793e867593cfc1177f5d16491e3a197d2fccda
+  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
+  tobias: f9c405df3ded93ad34539200fe3e7779cfb19081
+  WechatOpenSDK-XCFramework: ff342ae616bb86df3d236aca38059dfd4bc4a949
 
-PODFILE CHECKSUM: 293dca100fbb3eb6a866f640cf85127844630abc
+PODFILE CHECKSUM: 0aacc79f1960df8adf7daf6d51083f9a8617a20a
 
 COCOAPODS: 1.16.2

ios/Runner.xcodeproj/project.pbxproj

@@ -231,7 +231,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C80F0294D02FB00263BE5 = {
@@ -468,7 +468,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -592,7 +592,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -641,7 +641,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -59,6 +59,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">

ios/Runner/Info.plist

@@ -34,9 +34,26 @@
 				<string>zijingbook</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>weixin</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>1111</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>LSApplicationQueriesSchemes</key>
+	<array>
+		<string>weixin</string>
+		<string>weixinULAPI</string>
+		<string>weixinURLParamsAPI</string>
+		<string>alipays</string>
+	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

ios/Runner/Runner.entitlements

@@ -3,6 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>com.apple.developer.associated-domains</key>
-	<array/>
+	<array>
+		<string>applinks:testdomain.com</string>
+	</array>
 </dict>
 </plist>

lib/models/order.dart

@@ -141,7 +141,7 @@ class OrderListModel {
         totalPrice: totalPrice ?? this.totalPrice,
         finalTotalPrice: finalTotalPrice ?? this.finalTotalPrice,
         status: status ?? this.status,
-        num_: num_ ?? this.num_,
+        num_: num_ ?? num_,
         payType: payType ?? this.payType,
         types: types ?? this.types,
         createTime: createTime ?? this.createTime,

lib/pages/book_detail/controller.dart

@@ -61,7 +61,7 @@ class BookDetailController extends GetxController with GetSingleTickerProviderSt
 
     ChapterModel? tModel = findChapterById(chapters, currentChapterId);
     if(tModel != null){
-      updateParentsStatus(chapters, tModel!);
+      updateParentsStatus(chapters, tModel);
     }
 
   }

lib/pages/book_detail/view.dart

@@ -276,7 +276,7 @@ class _BookDetailPageState extends State<BookDetailPage> with SingleTickerProvid
     final PopBackModel? backModel = await context.pushNamed(Routes.web,queryParameters: {'book_id': controller.bookDetails.bookId.toString(),'chapter_id': chapterId,'chapter_name':chapterName,'note_id':'0'},extra: controller.bookDetails);
     if (backModel!.back == true){
       controller.getChapters();
-      controller.currentChapterId = int.parse(backModel!.chapterId);
+      controller.currentChapterId = int.parse(backModel.chapterId);
       controller.getBookDetails();
       // controller.setCurrentReadChapterId(backModel!.chapterId);
     }

lib/pages/book_pay/controller.dart

@@ -123,7 +123,7 @@ class BookPayController extends GetxController {
   /// 总价钱
   double  getOriginalPrice(){
     Decimal price = Decimal.zero;
-    for (CourseModel model in buy!) {
+    for (CourseModel model in buy) {
       if (model.status == 1){
         if (model.selected == true){
           price = price + Decimal.parse(model.vipPrice??'0.00');

lib/pages/book_pay/view.dart

@@ -29,9 +29,9 @@ class _BookPayPageState extends State<BookPayPage> {
                     physics: const NeverScrollableScrollPhysics(),
                     shrinkWrap:true,
                     itemBuilder: (BuildContext context, int index){
-                      return BuildItem(model: controller.buy![index],);
+                      return BuildItem(model: controller.buy[index],);
                     },
-                    itemCount: controller.buy!.length,
+                    itemCount: controller.buy.length,
                   ),
                   controller.showModel.couponSwitch =='0' && controller.showModel.integralSwitch =='0'?const SizedBox():SizedBox(height: 10.w,),
                   Visibility(

lib/pages/change_phone/controller.dart

@@ -33,10 +33,8 @@ class ChangePhoneController extends GetxController {
 
   /// 停止计时器
   void stop() {
-    if (_timer != null) {
     _timer.cancel();
     _isCounting = false;
-    }
       _countDown = 60;
   }
 

lib/pages/forget_pwd/controller.dart

@@ -32,10 +32,8 @@ class ForgetPwdController extends GetxController {
 
   /// 停止计时器
   void stop() {
-    if (_timer != null) {
     _timer.cancel();
     _isCounting = false;
-    }
       _countDown = 60;
   }
 

lib/pages/help_center/widgets/item.dart

@@ -18,7 +18,7 @@ class BuildItem extends StatelessWidget {
               Row(
                 children: <Widget>[
                   Text(
-                    '${model!.index}.',
+                    '${model.index}.',
                     style: TextStyle(
                         fontSize: 14.w, height: 1.5.w, color: Colours.c3),
                   ),

lib/pages/login/controller.dart

@@ -81,10 +81,8 @@ class LoginController extends GetxController {
 
   /// 停止计时器
   void stop() {
-    if (_timer != null) {
     _timer.cancel();
     _isCounting = false;
-    }
       _countDown = 60;
   }
 

lib/pages/login/index.dart

@@ -12,7 +12,6 @@ import 'package:flutter_book/theme.dart';
 import 'package:flutter_book/utils/index.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:get/get_state_manager/src/simple/get_controllers.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../routes/index.dart';

lib/pages/mine/index.dart

@@ -7,7 +7,6 @@ import 'package:flutter_book/utils/index.dart';
 import 'package:flutter_book/widgets/index.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:get/get_state_manager/src/simple/get_controllers.dart';
 import 'package:go_router/go_router.dart';
 
 import '../../apis/index.dart';

lib/pages/read_web/index.dart

@@ -16,7 +16,6 @@ import 'package:flutter_book/utils/index.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_sound/public/flutter_sound_recorder.dart';
 import 'package:flutter_sound_platform_interface/flutter_sound_platform_interface.dart';
-import 'package:flutter_sound_platform_interface/flutter_sound_recorder_platform_interface.dart';
 import 'package:flutter_tts/flutter_tts.dart';
 import 'package:get/get.dart';
 import 'package:go_router/go_router.dart';

lib/pages/read_web/widgets/note.dart

@@ -151,6 +151,7 @@ class _ReadNotePageState extends State<ReadNotePage> {
                         },
                       );
                     }
+                    return null;
                   },
                   itemCount: controller.notes.length,
                 ),

lib/pages/search/widgets/history.dart

@@ -53,7 +53,7 @@ class _BuildHistoryState extends State<BuildHistory> {
   }
 
   List <Widget> _buildItem(List<String> searchList){
-    if (searchList == null || searchList.isEmpty){
+    if (searchList.isEmpty){
       List<Widget> list = [
         const SizedBox(
           width: 0,

lib/pages/user_coin_recharge/controller.dart

@@ -13,7 +13,7 @@ class CoinRechargeController extends GetxController {
   List<IAPItem> _items = [];
   List<PurchasedItem> _purchases = [];
   //未完成的订单
-  List<PurchasedItem> _pendingPurchases = [];
+  final List<PurchasedItem> _pendingPurchases = [];
   // 支付宝
   Tobias tobias = Tobias();
   // 微信

lib/pages/user_discuss_des/widgets/discuss.dart

@@ -375,7 +375,7 @@ class _BuildDiscussState extends State<BuildDiscuss> {
   void _showKeyboard(BuildContext context) {
     _focusNode.requestFocus();
     FocusScope.of(context).requestFocus(_focusNode);
-    Overlay.of(context)?.insert(
+    Overlay.of(context).insert(
       OverlayEntry(
         builder: (context) => Positioned(
           bottom: MediaQuery.of(context).viewInsets.bottom,

lib/pages/user_edit_note/controller.dart

@@ -130,7 +130,7 @@ class UserEditNoteController extends GetxController {
 
     _mRecorder.startRecorder(
       toFile: '$filePath/$fileName',
-      audioSource: sound_recorder_platform.AudioSource.microphone,
+      audioSource: AudioSource.microphone,
       codec: Codec.aacMP4,
     );
   }

lib/pages/user_edit_note/index.dart

@@ -10,7 +10,6 @@ import 'package:flutter_book/utils/index.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_sound/public/flutter_sound_recorder.dart';
 import 'package:flutter_sound_platform_interface/flutter_sound_platform_interface.dart';
-import 'package:flutter_sound_platform_interface/flutter_sound_recorder_platform_interface.dart' as sound_recorder_platform;
 import 'package:get/get.dart';
 import 'package:go_router/go_router.dart';
 import 'package:just_audio/just_audio.dart' as just_audio;

lib/pages/user_order/controller.dart

@@ -36,7 +36,7 @@ class UserOrderController extends GetxController
   }
 
   /// 获取订单列表
-  Future<void> _getOrders({bool isRefresh = false, String keys ='',int ?tabIndex}) async {
+  Future<void> _getOrders({bool isRefresh = false, String keys =''}) async {
     if (isRefresh) _page = 1;
     // 网路请求
     final result = await MineAPI.orderList(

lib/pages/user_order/widgets/list.dart

@@ -65,6 +65,7 @@ class _BuildListPageState extends State<BuildListPage>
                 return BuiltRefunded(model: model,);
               }
             }
+            return null;
           },
           itemCount: controller.orderList.length,
           // itemCount: widget.models.length,

lib/pages/user_order/widgets/search.dart

@@ -68,6 +68,7 @@ class _SearchPageState extends State<OrderSearchPage> {
                 return BuiltRefunded(model: model,);
               }
             }
+            return null;
           },
           itemCount: controller.orderList.length,
           // itemCount: widget.models.length,

lib/pages/user_order_awaiting/view.dart

@@ -69,7 +69,7 @@ class _UserOrderAwaitingState extends State<UserOrderAwaitingPage> {
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
                               Image.network(
-                                myController.model?.bookList?[0].img ?? '',
+                                myController.model.bookList?[0].img ?? '',
                                 fit: BoxFit.cover, // 设置适应方式为充满
                                 width: 72.0.w,
                                 height: 86.0.w,

lib/pages/user_order_cancel_detail/view.dart

@@ -50,7 +50,7 @@ class _UserOrderRefundedState extends State<UserOrderCancelDetailPage> {
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
                             Image.network(
-                              controller.model?.bookList==null?'http://zxts-book-file.zijingebook.com/2024-01/29/b91194564969b9151fa382807977282acdffa22d.jpg':
+                              controller.model.bookList==null?'http://zxts-book-file.zijingebook.com/2024-01/29/b91194564969b9151fa382807977282acdffa22d.jpg':
                               controller.model.bookList![0].img??'',
                               // 用实际图片链接替换
                               fit: BoxFit.cover, // 设置适应方式为充满
@@ -70,7 +70,7 @@ class _UserOrderRefundedState extends State<UserOrderCancelDetailPage> {
                                     SizedBox(
                                       height: 62.5.w,
                                       child:  Text(
-                                        controller.model?.bookList?[0].name??'',
+                                        controller.model.bookList?[0].name??'',
                                         style: TextStyle(
                                           color: Colours.c3,
                                           fontWeight: Fonts.bold,

lib/pages/user_order_coin_awaiting/controller.dart

@@ -28,7 +28,7 @@ class UserOrderCoinAwaitingController extends GetxController {
   List<IAPItem> _items = [];
   List<PurchasedItem> _purchases = [];
   ///未完成的订单
-  List<PurchasedItem> _pendingPurchases = [];
+  final List<PurchasedItem> _pendingPurchases = [];
   // 紫荆币数据
   List<CoinModel> data = [];
 

lib/pages/user_order_coin_cancel/controller.dart

@@ -28,7 +28,7 @@ class UserOrderCoinCancelController extends GetxController {
   List<IAPItem> _items = [];
   List<PurchasedItem> _purchases = [];
   ///未完成的订单
-  List<PurchasedItem> _pendingPurchases = [];
+  final List<PurchasedItem> _pendingPurchases = [];
 
   List<CoinModel> data = [];
 

lib/pages/user_order_coin_completed/controller.dart

@@ -27,7 +27,7 @@ class UserOrderCoinCompletedController extends GetxController {
   List<IAPItem> _items = [];
   List<PurchasedItem> _purchases = [];
   ///未完成的订单
-  List<PurchasedItem> _pendingPurchases = [];
+  final List<PurchasedItem> _pendingPurchases = [];
 
   List<CoinModel> data = [];
 

lib/pages/user_order_evaluate/view.dart

@@ -41,7 +41,7 @@ class _UserOrderEvaluatePageState extends State<UserOrderEvaluatePage> with Auto
           onTap: () {
             controller.focusNodes[_index]!.unfocus();
           },
-          child: (controller.orderInfoModel==null ||controller.orderInfoModel.bookList==null)?
+          child: (controller.orderInfoModel.bookList==null)?
           Container(
             alignment: Alignment.center,
             child: const CircularProgressIndicator(),):

lib/pages/user_order_refunded/view.dart

@@ -50,7 +50,7 @@ class _UserOrderRefundedState extends State<UserOrderRefundedPage> {
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
                             Image.network(
-                              controller.model?.bookList==null?'http://zxts-book-file.zijingebook.com/2024-01/29/b91194564969b9151fa382807977282acdffa22d.jpg':
+                              controller.model.bookList==null?'http://zxts-book-file.zijingebook.com/2024-01/29/b91194564969b9151fa382807977282acdffa22d.jpg':
                               controller.model.bookList![0].img??'',
                               // 用实际图片链接替换
                               fit: BoxFit.cover, // 设置适应方式为充满
@@ -70,7 +70,7 @@ class _UserOrderRefundedState extends State<UserOrderRefundedPage> {
                                     SizedBox(
                                       height: 62.5.w,
                                       child:  Text(
-                                        controller.model?.bookList?[0].name??'',
+                                        controller.model.bookList?[0].name??'',
                                         style: TextStyle(
                                           color: Colours.c3,
                                           fontWeight: Fonts.bold,

lib/theme.dart

@@ -72,7 +72,6 @@ abstract class AppTheme {
 
   static ThemeData get light {
     var scheme = ColorScheme.light(
-      background: Colors.white,
       onBackground: const Color(0xFF333333),
       surface: Colors.white,
       onSurface: const Color(0xFF333333),
@@ -91,7 +90,6 @@ abstract class AppTheme {
 
   static ThemeData get dark {
     var scheme = ColorScheme.dark(
-      background: const Color(0xFF0D0D0D),
       onBackground: Colors.white,
       surface: const Color(0xFF252525),
       onSurface: Colors.white,
@@ -112,7 +110,7 @@ abstract class AppTheme {
     return ThemeData(
       useMaterial3: false,
       colorScheme: scheme,
-      scaffoldBackgroundColor: scheme.background,
+      scaffoldBackgroundColor: scheme.surface,
       splashColor: Colors.transparent,
       highlightColor: Colors.transparent,
       dialogTheme: DialogTheme(
@@ -149,12 +147,12 @@ abstract class AppTheme {
         centerTitle: true,
         toolbarHeight: 56.w,
         iconTheme: IconThemeData(
-          color: scheme.onBackground,
+          color: scheme.onSurface,
           size: 22.w,
         ),
 
         titleTextStyle: TextStyle(
-          color: scheme.onBackground,
+          color: scheme.onSurface,
           fontSize: 17.w,
           fontWeight: FontWeight.w600,
           height: 1.2,
@@ -169,13 +167,13 @@ abstract class AppTheme {
       textTheme: TextTheme(
         bodyMedium: TextStyle(
           fontSize: 16.w,
-          color: scheme.onBackground,
+          color: scheme.onSurface,
         ),
         labelLarge: TextStyle(
           fontWeight: FontWeight.w600,
           fontSize: 16.w,
           height: 1.2,
-          color: scheme.onBackground,
+          color: scheme.onSurface,
         ),
       ),
       // bottomAppBarTheme: BottomAppBarTheme(
@@ -193,7 +191,7 @@ abstract class AppTheme {
         selectedLabelStyle: TextStyle(fontSize: 11.w, fontWeight: Fonts.medium),
         unselectedIconTheme: IconThemeData(
           size: 15.w,
-          color: scheme.onBackground.withOpacity(0.5),
+          color: scheme.onSurface.withOpacity(0.5),
         ),
         selectedIconTheme: IconThemeData(
           size: 15.w,
@@ -202,17 +200,17 @@ abstract class AppTheme {
       ),
       outlinedButtonTheme: OutlinedButtonThemeData(
         style: ButtonStyle(
-          elevation: MaterialStateProperty.all(0),
-          minimumSize: MaterialStateProperty.all(Size.zero),
+          elevation: WidgetStateProperty.all(0),
+          minimumSize: WidgetStateProperty.all(Size.zero),
           tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-          overlayColor: MaterialStateProperty.all(Colors.transparent),
+          overlayColor: WidgetStateProperty.all(Colors.transparent),
         ),
       ),
       inputDecorationTheme: InputDecorationTheme(
         isCollapsed: true,
         isDense: true,
         filled: true,
-        fillColor: scheme.background,
+        fillColor: scheme.surface,
         labelStyle: TextStyle(
           fontSize: 15.w,
           color: Colours.c3,
@@ -220,7 +218,7 @@ abstract class AppTheme {
         ),
         helperStyle: TextStyle(
           fontSize: 15.w,
-          color: scheme.onBackground.withOpacity(0.7),
+          color: scheme.onSurface.withOpacity(0.7),
         ),
         contentPadding: EdgeInsets.symmetric(
           horizontal: 10.w,
@@ -253,7 +251,7 @@ abstract class AppTheme {
       ),
       tabBarTheme: TabBarTheme(
         labelColor: scheme.primary,
-        unselectedLabelColor: scheme.background,
+        unselectedLabelColor: scheme.surface,
         labelStyle: TextStyle(
           color: scheme.onPrimary,
           fontSize: 16.w,
@@ -268,7 +266,7 @@ abstract class AppTheme {
       ),
       dividerTheme: DividerThemeData(
         thickness: 1.w,
-        color: scheme.onBackground.withOpacity(0.08),
+        color: scheme.onSurface.withOpacity(0.08),
       ),
     );
   }

lib/widgets/button.dart

@@ -87,11 +87,11 @@ class CustomButton extends StatelessWidget {
       child: OutlinedButton(
         onPressed: onPressed,
         style: ButtonStyle(
-          textStyle: MaterialStateProperty.all(
+          textStyle: WidgetStateProperty.all(
             Theme.of(context).textTheme.labelLarge?.copyWith(fontSize: _fontSize),
           ),
-          padding: MaterialStateProperty.all(padding ?? _padding),
-          foregroundColor: MaterialStateProperty.resolveWith((states) {
+          padding: WidgetStateProperty.all(padding ?? _padding),
+          foregroundColor: WidgetStateProperty.resolveWith((states) {
             switch (type) {
               case CustomButtonType.filled:
                 return foregroundColor ??
@@ -100,25 +100,25 @@ class CustomButton extends StatelessWidget {
               case CustomButtonType.borderless:
                 final color = foregroundColor ?? colorScheme.primary;
                 final opacity = color.opacity / 2;
-                if (states.contains(MaterialState.pressed)) {
+                if (states.contains(WidgetState.pressed)) {
                   return color.withOpacity(opacity);
                 }
-                if (states.contains(MaterialState.disabled)) {
+                if (states.contains(WidgetState.disabled)) {
                   return color.withOpacity(opacity);
                 }
                 return color;
             }
           }),
-          backgroundColor: MaterialStateProperty.resolveWith((states) {
+          backgroundColor: WidgetStateProperty.resolveWith((states) {
             switch (type) {
               case CustomButtonType.filled:
                 final color = backgroundColor ??
                     colorScheme.primary.withOpacity(isIcon ? 0.1 : 1);
                 final opacity = color.opacity / 2;
-                if (states.contains(MaterialState.pressed)) {
+                if (states.contains(WidgetState.pressed)) {
                   return color.withOpacity(opacity);
                 }
-                if (states.contains(MaterialState.disabled)) {
+                if (states.contains(WidgetState.disabled)) {
                   return color.withOpacity(opacity);
                 }
                 return color;
@@ -127,7 +127,7 @@ class CustomButton extends StatelessWidget {
                 return Colors.transparent;
             }
           }),
-          side: MaterialStateProperty.resolveWith((states) {
+          side: WidgetStateProperty.resolveWith((states) {
             switch (type) {
               case CustomButtonType.filled:
               case CustomButtonType.borderless:
@@ -135,13 +135,13 @@ class CustomButton extends StatelessWidget {
               case CustomButtonType.ghost:
                 final color = foregroundColor ?? colorScheme.primary;
                 final opacity = color.opacity / 2;
-                if (states.contains(MaterialState.pressed)) {
+                if (states.contains(WidgetState.pressed)) {
                   return BorderSide(
                     color: color.withOpacity(opacity),
                     width: 2.w,
                   );
                 }
-                if (states.contains(MaterialState.disabled)) {
+                if (states.contains(WidgetState.disabled)) {
                   return BorderSide(color: color.withOpacity(opacity));
                 }
                 return BorderSide(
@@ -150,7 +150,7 @@ class CustomButton extends StatelessWidget {
                 );
             }
           }),
-          shape: MaterialStateProperty.all(_shape),
+          shape: WidgetStateProperty.all(_shape),
         ),
         child: child,
       ),

pubspec.yaml

@@ -42,41 +42,41 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.2
-  logger: 1.3.0
+  logger: ^2.0.0
   # getX
-  get: 4.6.5
+  get: ^4.6.5
   # 路由
-  go_router: 10.1.0
-  flutter_easyloading: 3.0.5
+  go_router: ^10.1.0
+  flutter_easyloading: ^3.0.5
   # 存储基本数据
-  shared_preferences: 2.1.1
+  shared_preferences: ^2.3.0
   # 屏幕适配
-  flutter_screenutil: 5.8.2
+  flutter_screenutil: ^5.8.2
   # 加载图片
-  extended_image: 8.0.2
+  extended_image: ^8.0.2
   # 网络
-  dio: 5.3.3
-  crypto: 3.0.3
-  convert: 3.0.1
+  dio: ^5.3.3
+  crypto: ^3.0.3
+  convert: ^3.0.1
   # 录音
-  flutter_tts: 3.8.5
+  flutter_tts: ^3.8.5
   # webview
   flutter_inappwebview: ^6.0.0
-  intl: 0.18.0
+  intl: ^0.19.0
 
   # 录音
-  flutter_sound: ^9.2.13
-  permission_handler: 11.0.1
+  flutter_sound: 9.30.0
+  permission_handler: ^12.0.0
   audio_session: ^0.1.6
-  flutter_sound_platform_interface: 9.2.13
+  flutter_sound_platform_interface: 9.30.0
   # 获取目录结构
   path_provider: ^2.0.2
   # 下拉刷新 上拉加载更多
-  easy_refresh: 3.3.2+1
+  easy_refresh: ^3.3.2+1
   # 角标
   badges: ^3.1.2
   # 图片预览 或 banner
-  carousel_slider: 4.2.1
+  carousel_slider: 5.1.2
   # 评星
   flutter_star: ^1.2.0
   # toast
@@ -88,7 +88,7 @@ dependencies:
   # 微信支付
   fluwx: ^4.4.9
   #
-  image_picker: 0.8.7+5
+  image_picker: ^1.1.0
   # 获取package 信息
   package_info_plus: ^4.2.0
   # 版本更新