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 3107d37..b2901c9 100644 Binary files a/making_school_asignment_app/android/app/src/main/res/drawable/background.png and b/making_school_asignment_app/android/app/src/main/res/drawable/background.png differ 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 @@ + + + +