From 80d07e43c57a43bd0231bd9ade0c28329a3bd672 Mon Sep 17 00:00:00 2001
From: "1147192855@qq.com" <1147192855@qq.com>
Date: Fri, 1 Nov 2024 13:53:37 +0800
Subject: [PATCH] no message

---
 .../app/src/main/res/drawable/background.png  | Bin 69 -> 6323 bytes
 .../flutter_native_splash.yaml                |   2 +-
 .../utils/app_upgrade/upgradeLogic.dart       |  33 ++++++++++--------
 making_school_asignment_app/web/index.html    |   4 +++
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/making_school_asignment_app/android/app/src/main/res/drawable/background.png b/making_school_asignment_app/android/app/src/main/res/drawable/background.png
index 3107d37fa533216ce211fdcdd7c9b8633fab4cc4..b2901c910580366192b4b76917f50637fae68cd2 100644
GIT binary patch
literal 6323
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

literal 69
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1SBVv2j2ryJf1F&Ar*|tKmY%?XJF%FW@0Ma
R`v54;;OXk;vd$@?2>`rk4}t&y

diff --git a/making_school_asignment_app/flutter_native_splash.yaml b/making_school_asignment_app/flutter_native_splash.yaml
index ed05c25..8360b87 100644
--- a/making_school_asignment_app/flutter_native_splash.yaml
+++ b/making_school_asignment_app/flutter_native_splash.yaml
@@ -5,7 +5,7 @@ flutter_native_splash:
   # 如需恢复默认的白屏，执行如下命令
   # flutter pub run flutter_native_splash:remove
   # 设置闪屏页的默认态logo或背景图片路径
-  color: "##FFFFFF"
+  color: "#FFFFFF"
   image_ios: assets/images/splash_native.png
   background_image_android: assets/images/splash_native.png
   android_12:
diff --git a/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart b/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart
index 67c450d..3dc4626 100644
--- a/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart
+++ b/making_school_asignment_app/lib/common/utils/app_upgrade/upgradeLogic.dart
@@ -24,20 +24,7 @@ class UpgradeLogic extends GetxController with RequestToolMixin {
 
   void getAppUpgrade(BuildContext context) async {
     if (!const bool.fromEnvironment('dart.vm.product')) return;
-    DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
-    AndroidDeviceInfo androidInfo = await deviceInfoPlugin.androidInfo;
-    Permission storagePermission;
-    if (androidInfo.version.sdkInt >= 33) {
-      storagePermission = Permission.manageExternalStorage;
-    } else {
-      storagePermission = Permission.storage;
-    }
-    PermissionDescribeUtil.instance.toLaunchPermissionRequest(
-      context,
-      title: '储存权限请求',
-      describe: "为了提供更好的服务，需要获取到存储权限用于保存APP升级文件APK，进行升级",
-      permissions: [storagePermission],
-    );
+
     try {
       showUpgrade.value = true;
       // if (['18888888888'].contains(user.loginName)) return;
@@ -74,7 +61,23 @@ class UpgradeLogic extends GetxController with RequestToolMixin {
           'description': result.description ?? 'APP新版本更新'
         };
         UpdateAppEvent updateAppEvent = UpdateAppEvent.fromJson(json, localVersion, deviceInfo, appName, packageName, typeName: 'systemType');
-        if (updateAppEvent.upgrade) await UpdateDialog.showUpdateDialog(context, updateAppEvent);
+        if (updateAppEvent.upgrade) {
+          DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
+          AndroidDeviceInfo androidInfo = await deviceInfoPlugin.androidInfo;
+          Permission storagePermission;
+          if (androidInfo.version.sdkInt >= 33) {
+            storagePermission = Permission.manageExternalStorage;
+          } else {
+            storagePermission = Permission.storage;
+          }
+          PermissionDescribeUtil.instance.toLaunchPermissionRequest(
+            context,
+            title: '储存权限请求',
+            describe: "为了提供更好的服务，需要获取到存储权限用于保存APP升级文件APK，进行升级",
+            permissions: [storagePermission],
+          );
+          await UpdateDialog.showUpdateDialog(context, updateAppEvent);
+        }
       }
     } finally {
       showUpgrade.value = false;
diff --git a/making_school_asignment_app/web/index.html b/making_school_asignment_app/web/index.html
index 4e88d38..be6f12e 100644
--- a/making_school_asignment_app/web/index.html
+++ b/making_school_asignment_app/web/index.html
@@ -191,6 +191,10 @@
   
   
   
+  
+  
+  
+