From 14c0b343683ddfb9215eeaf3ed7cc801de548fca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sat, 13 Dec 2025 16:11:32 +0800 Subject: [PATCH] Fix unexpected connect error --- .../Views/Dashboard/DashboardViewModel.swift | 6 +-- MacLibrary/SidebarView.swift | 1 + Makefile | 45 +++++++++++++++---- 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/ApplicationLibrary/Views/Dashboard/DashboardViewModel.swift b/ApplicationLibrary/Views/Dashboard/DashboardViewModel.swift index 1d8cfbe..0976b05 100644 --- a/ApplicationLibrary/Views/Dashboard/DashboardViewModel.swift +++ b/ApplicationLibrary/Views/Dashboard/DashboardViewModel.swift @@ -82,7 +82,7 @@ public final class DashboardViewModel: BaseViewModel { systemProxyAvailable = status.available systemProxyEnabled = status.enabled } catch { - alert = AlertState(error: error) + NSLog("reloadSystemProxy: \(error)") } } @@ -117,9 +117,7 @@ public final class DashboardViewModel: BaseViewModel { } } } catch { - await MainActor.run { - alert = AlertState(error: error) - } + NSLog("checkDeprecatedNotes: \(error)") } } diff --git a/MacLibrary/SidebarView.swift b/MacLibrary/SidebarView.swift index 8be448b..442e0be 100644 --- a/MacLibrary/SidebarView.swift +++ b/MacLibrary/SidebarView.swift @@ -17,6 +17,7 @@ public struct SidebarView: View { ProgressView() } else if let profile = environments.extensionProfile { sidebarContent(isConnected: profile.status.isConnectedStrict, profile: profile) + .onReceive(profile.$status) { _ in } .onChangeCompat(of: profile.status) { if !selection.visible(profile) { DispatchQueue.main.async { diff --git a/Makefile b/Makefile index 0df4b1c..d8ef546 100644 --- a/Makefile +++ b/Makefile @@ -1,16 +1,43 @@ -all: ios macos macos_standalone tvos +build_all: build_ios build_macos build_macos_standalone build_tvos -ios: - xcodebuild build -scheme SFI -configuration Debug -destination 'generic/platform=iOS' | xcbeautify | grep -A 3 -e "Build Succeeded" -e "BUILD FAILED" -e "❌" +build_ios: + xcodebuild build -scheme SFI -configuration Debug -destination 'generic/platform=iOS' | xcbeautify | grep -A 10 -e "Build Succeeded" -e "BUILD FAILED" -e "❌" -macos: - xcodebuild build -scheme SFM -configuration Debug -destination 'generic/platform=macOS' | xcbeautify | grep -A 3 -e "Build Succeeded" -e "BUILD FAILED" -e "❌" +build_macos: + xcodebuild build -scheme SFM -configuration Debug -destination 'generic/platform=macOS' | xcbeautify | grep -A 10 -e "Build Succeeded" -e "BUILD FAILED" -e "❌" -macos_standalone: - xcodebuild build -scheme SFM.System -configuration Debug -destination 'generic/platform=macOS' | xcbeautify | grep -A 3 -e "Build Succeeded" -e "BUILD FAILED" -e "❌" +build_macos_standalone: + xcodebuild build -scheme SFM.System -configuration Debug -destination 'generic/platform=macOS' | xcbeautify | grep -A 10 -e "Build Succeeded" -e "BUILD FAILED" -e "❌" -tvos: - xcodebuild build -scheme SFT -configuration Debug -destination 'generic/platform=tvOS' | xcbeautify | grep -A 3 -e "Build Succeeded" -e "BUILD FAILED" -e "❌" +build_tvos: + xcodebuild build -scheme SFT -configuration Debug -destination 'generic/platform=tvOS' | xcbeautify | grep -A 10 -e "Build Succeeded" -e "BUILD FAILED" -e "❌" + + +release: release_ios release_macos release_tvos + +release_ios: archive_ios upload_ios + +archive_ios: + xcodebuild archive -scheme SFI -configuration Release -destination 'generic/platform=iOS' -archivePath build/SFI.xcarchive -allowProvisioningUpdates | xcbeautify | grep -A 10 -e "Archive Succeeded" -e " ARCHIVE FAILED" -e "❌" + +upload_ios: + xcodebuild -exportArchive -archivePath build/SFI.xcarchive -exportOptionsPlist SFI/Upload.plist -allowProvisioningUpdates + +release_maocs: archive_macos upload_macos + +archive_macos: + xcodebuild archive -scheme SFM -configuration Release -archivePath build/SFM.xcarchive -allowProvisioningUpdates | xcbeautify | grep -A 10 -e "Archive Succeeded" -e " ARCHIVE FAILED" -e "❌" + +upload_macos: + xcodebuild -exportArchive -archivePath build/SFM.xcarchive -exportOptionsPlist SFI/Upload.plist -allowProvisioningUpdates + +release_tvos: archive_tvos upload_tvos + +archive_tvos: + xcodebuild archive -scheme SFT -configuration Release -archivePath build/SFT.xcarchive -allowProvisioningUpdates | xcbeautify | grep -A 10 -e "Archive Succeeded" -e " ARCHIVE FAILED" -e "❌" + +upload_tvos: + xcodebuild -exportArchive -archivePath "build/SFT.xcarchive" -exportOptionsPlist SFI/Upload.plist -allowProvisioningUpdates fmt: swiftformat .