Revert "revert"

This reverts commit 09d07b10aad508da7069ff052232af8a3db0321c.

android/app/build.gradle

@@ -78,8 +78,8 @@ android {
         multiDexEnabled true
 
         ndk {
-            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a'  //其他通用
-//            abiFilters 'arm64-v8a', 'x86'  //魅族用
+//            abiFilters 'armeabi', 'armeabi-v7a', 'arm64-v8a'  //其他通用
+            abiFilters 'arm64-v8a', 'x86'  //魅族用
 //            abiFilters 'arm64-v8a'  //谷歌用
         }
 

android/build.gradle

@@ -1,15 +1,15 @@
-//buildscript {
-//    ext.kotlin_version = '2.0.20'
-//    repositories {
-//        google()
-//        mavenCentral()
-//    }
-//
-//    dependencies {
-//        classpath 'com.android.tools.build:gradle:8.3.1'
-//        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-//    }
-//}
+buildscript {
+    ext.kotlin_version = '2.0.20'
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.3.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+}
 
 allprojects {
     repositories {
@@ -20,17 +20,17 @@ allprojects {
 
 rootProject.buildDir = '../build'
 /// 升级flutter3.24.3后需要加这段代码，否则打包报错
-//subprojects {
-//    afterEvaluate { project ->
-//        if (project.plugins.hasPlugin("com.android.application") ||
-//                project.plugins.hasPlugin("com.android.library")) {
-//            project.android {
-//                compileSdkVersion 34
-//                buildToolsVersion "34.0.0"
-//            }
-//        }
-//    }
-//}
+subprojects {
+    afterEvaluate { project ->
+        if (project.plugins.hasPlugin("com.android.application") ||
+                project.plugins.hasPlugin("com.android.library")) {
+            project.android {
+                compileSdkVersion 34
+                buildToolsVersion "34.0.0"
+            }
+        }
+    }
+}
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }

android/gradle/wrapper/gradle-wrapper.properties

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

android/settings.gradle

@@ -1,66 +1,14 @@
-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
-    }()
+include ':app'
 
-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+def properties = new Properties()
 
-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
+assert localPropertiesFile.exists()
+localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
 
-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0" // apply true
-    id "com.android.application" version "8.4.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
-}
-
-include ":app"
-//pluginManagement {
-//    def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-//    def properties = new Properties()
-//
-//    assert localPropertiesFile.exists()
-//    localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-//
-//    def flutterSdkPath = properties.getProperty("flutter.sdk")
-//    assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-//
-//    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
-//
-//    repositories {
-//        google()
-//        mavenCentral()
-//        gradlePluginPortal()
-//    }
-//}
-//
-//plugins {
-//    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-//    id "com.android.application" version "8.3.1" apply false
-//    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
-//}
-//
-//include ':app'
-
-//include ':app'
-//
-//def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-//def properties = new Properties()
-//
-//assert localPropertiesFile.exists()
-//localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
-//
-//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"
+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"
 
 //pluginManagement {
 //    def flutterSdkPath = {

lib/pages/today/practice_assess/page/exam_page.dart

@@ -12,6 +12,7 @@ import 'package:iquokka/pages/today/practice_assess/view/knowledge_view.dart';
 import 'package:iquokka/pages/today/practice_assess/view/multiple_choice_view.dart';
 import 'package:iquokka/pages/today/practice_assess/view/single_choice_view.dart';
 import 'package:iquokka/utils/tips_dialog.dart';
+import 'package:syncfusion_flutter_sliders/sliders.dart';
 
 import '../../../../common/AC.dart';
 import '../../../../gen_a/A.dart';

linux/flutter/generated_plugin_registrant.cc

@@ -8,7 +8,6 @@
 
 #include <dynamic_color/dynamic_color_plugin.h>
 #include <file_selector_linux/file_selector_plugin.h>
-#include <flutter_timezone/flutter_timezone_plugin.h>
 #include <gtk/gtk_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
 
@@ -19,9 +18,6 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) file_selector_linux_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "FileSelectorPlugin");
   file_selector_plugin_register_with_registrar(file_selector_linux_registrar);
-  g_autoptr(FlPluginRegistrar) flutter_timezone_registrar =
-      fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterTimezonePlugin");
-  flutter_timezone_plugin_register_with_registrar(flutter_timezone_registrar);
   g_autoptr(FlPluginRegistrar) gtk_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "GtkPlugin");
   gtk_plugin_register_with_registrar(gtk_registrar);

linux/flutter/generated_plugins.cmake

@@ -5,7 +5,6 @@
 list(APPEND FLUTTER_PLUGIN_LIST
   dynamic_color
   file_selector_linux
-  flutter_timezone
   gtk
   url_launcher_linux
 )

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -8,7 +8,7 @@ import Foundation
 import app_links
 import appkit_ui_element_colors
 import audio_session
-import connectivity_plus
+import connectivity_plus_macos
 import device_info_plus
 import dynamic_color
 import file_selector_macos
@@ -25,17 +25,16 @@ import photo_manager
 import rate_my_app
 import share_plus
 import shared_preferences_foundation
-import sqflite_darwin
+import sqflite
 import url_launcher_macos
 import video_player_avfoundation
 import wakelock_plus
-import webview_flutter_wkwebview
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
   AppkitUiElementColorsPlugin.register(with: registry.registrar(forPlugin: "AppkitUiElementColorsPlugin"))
   AudioSessionPlugin.register(with: registry.registrar(forPlugin: "AudioSessionPlugin"))
-  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
+  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
@@ -56,5 +55,4 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
   FVPVideoPlayerPlugin.register(with: registry.registrar(forPlugin: "FVPVideoPlayerPlugin"))
   WakelockPlusMacosPlugin.register(with: registry.registrar(forPlugin: "WakelockPlusMacosPlugin"))
-  WebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "WebViewFlutterPlugin"))
 }

pubspec.yaml

@@ -17,7 +17,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
 
-version: 1.16.4+166
+version: 1.16.4+164
 
 environment:
   sdk: ">=3.1.5 <4.0.0"
@@ -48,11 +48,9 @@ dependencies:
   dots_indicator: ^2.1.0
   flutter_pickers: ^2.1.8
   image_picker: ^1.0.7
-#  image_cropper: ^5.0.0
-  image_cropper: ^9.1.0
+  image_cropper: ^5.0.0
 #  image_gallery_saver: ^2.0.3 #保存图片到相册
-#  image_gallery_saver_plus: '^3.0.5'
-  image_gallery_saver_plus: ^4.0.1
+  image_gallery_saver_plus: '^3.0.5'
   flutter_image_compress: ^2.2.0 #压缩图片
   wechat_assets_picker: ^9.1.0 #模仿微信选择图片
   photo_view: ^0.14.0 #图片预览
@@ -60,8 +58,7 @@ dependencies:
 #  fluwx: ^3.13.1
   fluwx: ^5.4.1
   dio: ^4.0.6
-#  connectivity_plus: ^2.3.4
-  connectivity_plus: ^6.1.4
+  connectivity_plus: ^2.3.4
   sp_util: ^2.0.3
   easy_refresh: ^3.4.0
 
@@ -91,11 +88,9 @@ dependencies:
   #  flutter_swiper : ^1.1.6
   flutter_sound: ^9.6.0
 #  flutter_sound: ^9.16.3
-  umeng_common_sdk: ^1.2.9
+  umeng_common_sdk: ^1.2.7
   umeng_push_sdk: ^2.3.0 #友盟推送
-#  flutter_s_umeng_push: ^0.4.2
-#  flutter_qq_ads: ^2.5.0
-#  flutter_qq_ads: ^2.9.0
+  flutter_qq_ads: ^2.5.0
 
   #状态管理
   get: ^4.6.6
@@ -117,7 +112,7 @@ dependencies:
 
   custom_sliding_segmented_control: ^1.7.5
 
-#  syncfusion_flutter_sliders: ^24.1.46
+  syncfusion_flutter_sliders: ^24.1.46
 
   #画虚线
   dotted_border: ^2.0.0+3
@@ -160,8 +155,7 @@ dependencies:
   home_widget: ^0.7.0
   workmanager: ^0.5.2
   app_links: ^6.3.1
-#  flutter_timezone: ^1.0.8
-  flutter_timezone: ^4.1.1
+  flutter_timezone: ^1.0.8
   logger: ^2.4.0
   #intl: ^0.19.0 #多语言
   #easy_localization: ^3.0.7 #多语言

windows/flutter/generated_plugin_registrant.cc

@@ -7,10 +7,9 @@
 #include "generated_plugin_registrant.h"
 
 #include <app_links/app_links_plugin_c_api.h>
-#include <connectivity_plus/connectivity_plus_windows_plugin.h>
+#include <connectivity_plus_windows/connectivity_plus_windows_plugin.h>
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <file_selector_windows/file_selector_windows.h>
-#include <flutter_timezone/flutter_timezone_plugin_c_api.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
@@ -24,8 +23,6 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
   FileSelectorWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FileSelectorWindows"));
-  FlutterTimezonePluginCApiRegisterWithRegistrar(
-      registry->GetRegistrarForPlugin("FlutterTimezonePluginCApi"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PermissionHandlerWindowsPlugin"));
   SharePlusWindowsPluginCApiRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -4,10 +4,9 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   app_links
-  connectivity_plus
+  connectivity_plus_windows
   dynamic_color
   file_selector_windows
-  flutter_timezone
   permission_handler_windows
   share_plus
   url_launcher_windows