Manic EMU is an all-in-one retro game emulator for iOS. It packs powerful features while keeping a clean, sleek UI and delivering buttery-smooth gameplay.
Swift
Fixing old devices where loading timeouts may get killed by the system watchdog
Daiuno634e34cc6007
diff --git a/ManicEmu/ManicEmu/Sources/Base/ApplicationSceneDelegate.swift b/ManicEmu/ManicEmu/Sources/Base/ApplicationSceneDelegate.swiftindex 6d4a0b53..b0d3b598 100644--- a/ManicEmu/ManicEmu/Sources/Base/ApplicationSceneDelegate.swift+++ b/ManicEmu/ManicEmu/Sources/Base/ApplicationSceneDelegate.swift@@ -23,49 +23,59 @@ class ApplicationSceneDelegate: UIResponder, UIWindowSceneDelegate {ApplicationSceneDelegate.applicationWindow = windowwindow?.tintColor = R.Color.MaininstallGamepadEventInteraction(on: window)- ResourcesKit.loadResources { isSuccess in- Database.setup {- ThemeManager.shared.setup()- self.window?.rootViewController = HomeViewController()- self.window?.makeKeyAndVisible()- BackgroundMusicKit.shared.startMonitoring()- FocusSoundEffects.shared.startMonitoring()- if Settings.defalut.iCloudSyncEnable {- SyncManager.shared.startSync()- }-- if !isSuccess {- UIView.makeAlert(title: R.string.localizable.fatalErrorTitle(), detail: R.string.localizable.fatalErrorDesc(), cancelTitle: R.string.localizable.confirmTitle())- }- if connectionOptions.urlContexts.count > 0 {- self.scene(scene, openURLContexts: connectionOptions.urlContexts)- }-- //设置RetroAchievement- CheevosBridge.setup(with: R.Config.AppVersion, requireCredentials: {- if let user = AchievementsUser.getUser() {- let cheevosUser = CheevosUser()- cheevosUser.userName = user.username- cheevosUser.password = user.password- cheevosUser.token = user.token- return cheevosUser+ let loadThenPresentHome = {+ ResourcesKit.loadResources { isSuccess in+ Database.setup {+ ThemeManager.shared.setup()+ self.window?.rootViewController = HomeViewController()+ self.window?.makeKeyAndVisible()+ BackgroundMusicKit.shared.startMonitoring()+ FocusSoundEffects.shared.startMonitoring()+ if Settings.defalut.iCloudSyncEnable {+ SyncManager.shared.startSync()}- return nil- }, updateCredentials: { cheevosUser in- if let u = cheevosUser?.userName,- let p = cheevosUser?.password,- let t = cheevosUser?.token {- AchievementsUser.updateUser(username: u, password: p, token: t)-++ if !isSuccess {+ UIView.makeAlert(title: R.string.localizable.fatalErrorTitle(), detail: R.string.localizable.fatalErrorDesc(), cancelTitle: R.string.localizable.confirmTitle())}- })-+ if connectionOptions.urlContexts.count > 0 {+ self.scene(scene, openURLContexts: connectionOptions.urlContexts)+ }++ CheevosBridge.setup(with: R.Config.AppVersion, requireCredentials: {+ if let user = AchievementsUser.getUser() {+ let cheevosUser = CheevosUser()+ cheevosUser.userName = user.username+ cheevosUser.password = user.password+ cheevosUser.token = user.token+ return cheevosUser+ }+ return nil+ }, updateCredentials: { cheevosUser in+ if let u = cheevosUser?.userName,+ let p = cheevosUser?.password,+ let t = cheevosUser?.token {+ AchievementsUser.updateUser(username: u, password: p, token: t)++ }+ })+#if SIDE_LOADStikJITHostCoordinator.shared.enableOnLaunchIfNeeded()#endif+ }}}+ // Same unzip conditions as ResourcesKit; keep this read-only so the original extract path is unchanged.+ if Self.needsResourceExtract() {+ window?.rootViewController = LaunchPlaceholderViewController()+ window?.makeKeyAndVisible()+ // Return from scene-create first; unzip still runs on main on the next turn.+ DispatchQueue.main.async(execute: loadThenPresentHome)+ } else {+ loadThenPresentHome()+ }let dropInteraction = UIDropInteraction(delegate: self)window?.addInteraction(dropInteraction)}@@ -85,6 +95,26 @@ class ApplicationSceneDelegate: UIResponder, UIWindowSceneDelegate {}}+ /// Mirrors ResourcesKit's unzip gate without performing any file work.+ private static func needsResourceExtract() -> Bool {+ if let systemCoreVersion = UserDefaults.standard.string(forKey: R.DefaultKey.SystemCoreVersion) {+ let appVersionNumber = UInt64(R.Config.AppVersion.replacingOccurrences(ofPattern: "\\.", withTemplate: ""))!+ let systemCoreVersionNumber = UInt64(systemCoreVersion.replacingOccurrences(ofPattern: "\\.", withTemplate: ""))!+ if systemCoreVersionNumber < appVersionNumber {+ return true+ }+ let systemCoreBuildVersion = UserDefaults.standard.integer(forKey: R.DefaultKey.SystemCoreBuildVersion)+ let appBuildVersion = Int(R.Config.AppBuildVersion)!+ if appBuildVersion > systemCoreBuildVersion {+ return true+ }+ } else {+ return true+ }+ return !FileManager.default.fileExists(atPath: R.Path.Resource)+ || !FileManager.default.fileExists(atPath: R.Path.ExtrasDB)+ }+func sceneDidBecomeActive(_ scene: UIScene) {FilesSyncManager.shared.handleDidBecomeActive()}@@ -243,3 +273,51 @@ extension ApplicationSceneDelegate: UIDropInteractionDelegate {window?.hideDropView()}}++/// LaunchScreen layout plus a spinner, used only while System.core is extracted on first launch or upgrade.+private final class LaunchPlaceholderViewController: UIViewController {+ override var prefersStatusBarHidden: Bool { true }++ override func viewDidLoad() {+ super.viewDidLoad()++ let backgroundImageView = UIImageView(image: R.image.launch_bg())+ backgroundImageView.contentMode = .scaleAspectFill+ backgroundImageView.clipsToBounds = true++ let iconImageView = UIImageView(image: R.image.icon_corner())+ iconImageView.contentMode = .scaleAspectFill+ iconImageView.clipsToBounds = true+ iconImageView.layerCornerRadius = 20++ let titleImageView = UIImageView(image: R.image.app_title_light())+ titleImageView.contentMode = .scaleToFill++ let indicator = UIActivityIndicatorView(style: .large)+ indicator.color = .white+ indicator.hidesWhenStopped = false+ indicator.startAnimating()++ view.addSubview(backgroundImageView)+ view.addSubview(iconImageView)+ view.addSubview(titleImageView)+ view.addSubview(indicator)++ backgroundImageView.snp.makeConstraints { make in+ make.edges.equalToSuperview()+ }+ iconImageView.snp.makeConstraints { make in+ make.centerX.equalToSuperview()+ make.centerY.equalToSuperview().offset(-80)+ make.size.equalTo(80)+ }+ titleImageView.snp.makeConstraints { make in+ make.centerX.equalToSuperview()+ make.centerY.equalToSuperview()+ }+ indicator.snp.makeConstraints { make in+ make.centerX.equalToSuperview()+ make.top.equalTo(titleImageView.snp.bottom).offset(R.Size.ContentSpaceHuge)+ }+ }+}diff --git a/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOptionPerform.swift b/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOptionPerform.swiftindex b539676e..25af4f69 100644--- a/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOptionPerform.swift+++ b/ManicEmu/ManicEmu/Sources/Business/Games/Models/GameOptionPerform.swift@@ -1048,7 +1048,7 @@ extension GameOption {case .quit:PlayViewController.quit()- if !game.isAzaharArticBase {+ if !firstGame.isAzaharArticBase {hideSheetInGaming()}diff --git a/ManicEmu/ManicEmu/Sources/Tools/Others/ResourcesKit.swift b/ManicEmu/ManicEmu/Sources/Tools/Others/ResourcesKit.swiftindex 935554be..a6dedbf1 100644--- a/ManicEmu/ManicEmu/Sources/Tools/Others/ResourcesKit.swift+++ b/ManicEmu/ManicEmu/Sources/Tools/Others/ResourcesKit.swift@@ -54,12 +54,12 @@ struct ResourcesKit {if !FileManager.default.fileExists(atPath: R.Path.ThreeDS.appendingPathComponent("sdmc")) {if FileManager.default.fileExists(atPath: R.Path.Data.appendingPathComponent("3DS/sdmc")) {try? FileManager.safeMoveItem(at: URL(fileURLWithPath: R.Path.Data.appendingPathComponent("3DS/sdmc")),- to: URL(fileURLWithPath: R.Path.ThreeDS.appendingPathComponent("sdmc")),- shouldReplace: true)+ to: URL(fileURLWithPath: R.Path.ThreeDS.appendingPathComponent("sdmc")),+ shouldReplace: true)try? FileManager.safeRemoveItem(at: URL(fileURLWithPath: R.Path.Data.appendingPathComponent("3DS")))} else {try? FileManager.default.createDirectory(atPath: R.Path.ThreeDS.appendingPathComponent("sdmc"),- withIntermediateDirectories: true)+ withIntermediateDirectories: true)}}