From 22d30658929c80b42a5f87345480972d8a4a4d70 Mon Sep 17 00:00:00 2001
From: "1147192855@qq.com" <1147192855@qq.com>
Date: Wed, 24 Jul 2024 17:45:09 +0800
Subject: [PATCH] =?UTF-8?q?Windows=E8=87=AA=E5=8A=A8=E8=B7=9F=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/app/src/main/AndroidManifest.xml         |  2 +-
 making_school_asignment_app/appcast.xml              |  8 ++++----
 .../lib/common/job/app_version.dart                  |  4 ++--
 .../lib/common/utils/app_upgrade/UpdateDialog.dart   | 12 ++++++++----
 .../lib/common/utils/app_upgrade/upgradeLogic.dart   | 12 +++++-------
 making_school_asignment_app/lib/main.dart            |  4 ++--
 .../lib/page/global_widget/start_page.dart           |  2 +-
 .../windows/packaging/exe/make_config.yaml           |  2 +-
 8 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/making_school_asignment_app/android/app/src/main/AndroidManifest.xml b/making_school_asignment_app/android/app/src/main/AndroidManifest.xml
index 1ff64ab..4e9cb5f 100644
--- a/making_school_asignment_app/android/app/src/main/AndroidManifest.xml
+++ b/making_school_asignment_app/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application
-        android:label="making_school_asignment_app"
+        android:label="点智学"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/making_school_asignment_app/appcast.xml b/making_school_asignment_app/appcast.xml
index 771efeb..b088a3c 100644
--- a/making_school_asignment_app/appcast.xml
+++ b/making_school_asignment_app/appcast.xml
@@ -29,7 +29,7 @@
                        type="application/octet-stream" />
         </item> -->
         <item>
-            <title>Version 1.0.1</title>
+            <title>Version 1.0.0</title>
             #发行说明-读取html方式(2选1)
             <!-- <sparkle:releaseNotesLink>
                 https://your_domain/your_path/release_notes.html
@@ -45,9 +45,9 @@
             </description>
             <pubDate>Sun, 16 Feb 2022 12:00:00 +0800</pubDate>
             #你更新程序的地址
-            <enclosure url="https://dpc-job-oss.23544.com/infra-app/job/1.0.1/3/making_school_asignment_app-1.0.1+2-windows-setup.exe"
-                       sparkle:dsaSignature="MEUCIDbfAOA8SB80Hv2oczzYORVr2FF7PjvLZsQF4BTTFPeqAiEAoLQGiqFQekQyV6Xko1U8yM6bl5/lqK6a6poppG6d4x8="
-                       sparkle:version="1.0.1+2"
+            <enclosure url="https://dpc-job-oss.23544.com/infra-app/making_school_asignment_app/1.0.0/3/making_school_asignment_app-1.0.0+1-windows-setup.exe"
+                       sparkle:dsaSignature="MEUCICOob1N5PNhjRDWh2gHHOuJayep41hP+BMyF26BoYjQLAiEA2dG22KMc2HCQTUyWe1pxWmCJqVmdNQU+Mmfvojg0K2M="
+                       sparkle:version="1.0.0+1"
                        sparkle:os="windows"
                        length="0"
                        type="application/octet-stream" />
diff --git a/making_school_asignment_app/lib/common/job/app_version.dart b/making_school_asignment_app/lib/common/job/app_version.dart
index aa8de30..ff2354a 100644
--- a/making_school_asignment_app/lib/common/job/app_version.dart
+++ b/making_school_asignment_app/lib/common/job/app_version.dart
@@ -28,7 +28,7 @@ class AppVersion extends Object {
   int ftuType;
 
   @JsonKey(name: 'downloadUrl')
-  String downloadUrl;
+  String? downloadUrl;
 
   @JsonKey(name: 'description')
   String? description;
@@ -44,7 +44,7 @@ class AppVersion extends Object {
     this.downloadUrl,
     this.description,
   ) {
-    downloadUrl = RequestConfig.imgUrl + downloadUrl;
+    if (downloadUrl != null) downloadUrl = RequestConfig.imgUrl + downloadUrl!;
   }
 
   factory AppVersion.fromJson(Map<String, dynamic> srcJson) => _$AppVersionFromJson(srcJson);
diff --git a/making_school_asignment_app/lib/common/utils/app_upgrade/UpdateDialog.dart b/making_school_asignment_app/lib/common/utils/app_upgrade/UpdateDialog.dart
index 64ddc28..00e4f86 100644
--- a/making_school_asignment_app/lib/common/utils/app_upgrade/UpdateDialog.dart
+++ b/making_school_asignment_app/lib/common/utils/app_upgrade/UpdateDialog.dart
@@ -169,15 +169,19 @@ class DownloadButton extends StatelessWidget {
       final count = logic.downloadRatio.value;
       if (count > 0) return Container();
       var primaryColor = Theme.of(context).primaryColor;
+
+      if (updateAppEvent.equipment == Equipment.windows) {
+        return SizedBox(
+          child: quickText('若没有弹出更新弹框，可关闭APP重新打开执行更新...', size: 16.sp),
+        );
+      }
+
       return Container(
         height: 38.h,
         width: 245.w,
         decoration: BoxDecoration(
           borderRadius: BorderRadius.all(Radius.circular(42.h)),
-          gradient: LinearGradient(colors: [
-            primaryColor,
-            primaryColor.withOpacity(0.7),
-          ]),
+          gradient: LinearGradient(colors: [primaryColor, primaryColor.withOpacity(0.7)]),
         ),
         child: MaterialButton(
           onPressed: () => easyThrottle('DownloadButton_App_Upgrade', duration: const Duration(milliseconds: 1000), () async {
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 87091d1..6f23c6e 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
@@ -33,12 +33,10 @@ class UpgradeLogic extends GetxController with RequestToolMixin {
       } else if (Platform.isIOS) {
         deviceInfo = "ios";
         deviceType = 2;
-      }
-      //  else if (Platform.isWindows) {
-      //   deviceInfo = "windows";
-      //   deviceType = 3;
-      // }
-      else {
+      } else if (Platform.isWindows) {
+        deviceInfo = "windows";
+        deviceType = 3;
+      } else {
         return;
       }
 
@@ -53,7 +51,7 @@ class UpgradeLogic extends GetxController with RequestToolMixin {
         // String buildNumber = packageInfo.buildNumber; //小版本号
 
         Map json = {
-          'downloadPath': result.downloadUrl,
+          'downloadPath': Platform.isWindows ? '' : result.downloadUrl,
           'version': result.version,
           'systemType': deviceType,
           'description': result.description ?? 'APP新版本更新'
diff --git a/making_school_asignment_app/lib/main.dart b/making_school_asignment_app/lib/main.dart
index 73c9a62..3e1c63e 100644
--- a/making_school_asignment_app/lib/main.dart
+++ b/making_school_asignment_app/lib/main.dart
@@ -30,8 +30,8 @@ void main() async {
   WidgetsFlutterBinding.ensureInitialized();
 
   // Windows
-  if(Platform.isWindows){
-    String feedURL = '${RequestConfig.imgUrl}infra-app/job/3/appcast.xml';
+  if (Platform.isWindows) {
+    String feedURL = '${RequestConfig.imgUrl}infra-app/making_school_asignment_app/3/appcast.xml';
     await autoUpdater.setFeedURL(feedURL);
     await autoUpdater.checkForUpdates();
     await autoUpdater.setScheduledCheckInterval(3600);
diff --git a/making_school_asignment_app/lib/page/global_widget/start_page.dart b/making_school_asignment_app/lib/page/global_widget/start_page.dart
index 047f15b..b04717f 100644
--- a/making_school_asignment_app/lib/page/global_widget/start_page.dart
+++ b/making_school_asignment_app/lib/page/global_widget/start_page.dart
@@ -18,7 +18,7 @@ import 'package:making_school_asignment_app/page/work_page/work_view.dart';
 import 'package:making_school_asignment_app/routes/app_pages.dart';
 
 class StartPage extends StatefulWidget {
-  const StartPage({Key? key}) : super(key: key);
+  const StartPage({super.key});
 
   @override
   State<StartPage> createState() => _StartPageState();
diff --git a/making_school_asignment_app/windows/packaging/exe/make_config.yaml b/making_school_asignment_app/windows/packaging/exe/make_config.yaml
index e8bac6e..049374b 100644
--- a/making_school_asignment_app/windows/packaging/exe/make_config.yaml
+++ b/making_school_asignment_app/windows/packaging/exe/make_config.yaml
@@ -3,7 +3,7 @@
 app_id: 9EBCC58D-39D5-4A4A-92B6-966DFFD6CA22
 publisher: LeanFlutter
 publisher_url: https://github.com/leanflutter/flutter_distributor
-display_name: 作业批阅
+display_name: 点智学
 create_desktop_icon: true
 # See: https://jrsoftware.org/ishelp/index.php?topic=setup_defaultdirname
 # install_dir_name: "D:\\HELLO-WORLD"