From f260d7537261ad114643dc44f65c27d8e89cab18 Mon Sep 17 00:00:00 2001 From: TrueZhuangjia Date: Thu, 3 Apr 2025 00:13:52 +0800 Subject: [PATCH] preset advanced widget template profile --- Limelight/Input/CustomOSC/OSCProfile.h | 1 + .../Input/CustomOSC/OSCProfilesManager.h | 5 +- .../Input/CustomOSC/OSCProfilesManager.m | 45 +++++++++++++++--- Limelight/PresetConfigs/widgetTemplates.bin | Bin 0 -> 71105 bytes .../LayoutOnScreenControlsViewController.m | 11 ++++- Moonlight.xcodeproj/project.pbxproj | 12 +++++ 6 files changed, 64 insertions(+), 10 deletions(-) create mode 100755 Limelight/PresetConfigs/widgetTemplates.bin diff --git a/Limelight/Input/CustomOSC/OSCProfile.h b/Limelight/Input/CustomOSC/OSCProfile.h index 1161b12f..a424a78f 100644 --- a/Limelight/Input/CustomOSC/OSCProfile.h +++ b/Limelight/Input/CustomOSC/OSCProfile.h @@ -10,6 +10,7 @@ #import "OnScreenButtonState.h" NS_ASSUME_NONNULL_BEGIN +#define DEFAULT_TEMPLATE_NAME @"高级控件模板(Advanced widget templates)" /** This object contains information pertaining to any of the user created, custom on screen controller layout configurations, or 'profiles.' The object contains a 'name' property for easy reference, as well as an 'isSelected' property which is used to determine whether this particular custom OSC layout should show on screen during game stream view. Only one 'OSCProfile' is set to 'isSelected' at any given time. The object also contains an array of 'OnScreenButtonStates' which provides information that allows us to move and hide/unhide each of the 19 on screen buttons. Note that the 'buttonStates' property should contain an NSMutableArray of ENCODED 'OnScreenButtonState' objects. This allows us to save the 'OSCProfile' object to NSUserDefaults. diff --git a/Limelight/Input/CustomOSC/OSCProfilesManager.h b/Limelight/Input/CustomOSC/OSCProfilesManager.h index 6448df13..f237ba7c 100644 --- a/Limelight/Input/CustomOSC/OSCProfilesManager.h +++ b/Limelight/Input/CustomOSC/OSCProfilesManager.h @@ -16,6 +16,7 @@ NS_ASSUME_NONNULL_BEGIN Note that the implementation file contains a number of 'Helper' methods. These helper methods are only used in this class's implementation file and help to reduce re-writing large blocks of code that are called multiple times throughout the file */ @interface OSCProfilesManager : NSObject +@property NSMutableArray *currentProfiles; + (OSCProfilesManager *) sharedManager:(CGRect)viewBounds; @@ -40,7 +41,7 @@ NS_ASSUME_NONNULL_BEGIN - (NSMutableArray *) getEncodedProfiles; - (void) importEncodedProfiles:(NSMutableArray* )profilesEncoded; - (OnScreenButtonState *)unarchiveButtonStateEncoded:(NSData *)data; - +- (void) importDefaultTemplates; #pragma mark - Setters /** @@ -64,7 +65,7 @@ NS_ASSUME_NONNULL_BEGIN * Lets the caller of this method know whether a profile with a given name already exists in persistent storage */ - (BOOL) profileNameAlreadyExist:(NSString*)name; - +- (BOOL) profileName:(NSString*) name alreadyExistIn:(NSMutableArray*)profiles; @end diff --git a/Limelight/Input/CustomOSC/OSCProfilesManager.m b/Limelight/Input/CustomOSC/OSCProfilesManager.m index 3c46c12d..d3282b18 100644 --- a/Limelight/Input/CustomOSC/OSCProfilesManager.m +++ b/Limelight/Input/CustomOSC/OSCProfilesManager.m @@ -27,6 +27,7 @@ static CGRect streamViewBounds; dispatch_once(&onceToken, ^{ _sharedManager = [[self alloc] init]; }); + // _sharedManager.currentProfiles = [_sharedManager getAllProfiles]; return _sharedManager; } @@ -137,14 +138,38 @@ static CGRect streamViewBounds; } - (void) importEncodedProfiles:(NSMutableArray* )profilesEncoded { - NSMutableArray* localEncodedPofiles = [self getEncodedProfiles]; - [localEncodedPofiles removeObjectAtIndex:0]; + NSMutableArray* targetProfiles = [_currentProfiles mutableCopy]; //_currentProfiles is availabled as long as getAllProfiles was called before calling this method (_currentProfiles avoids frequent accessing persisted data) + if([self profileName:DEFAULT_TEMPLATE_NAME alreadyExistIn:targetProfiles] && targetProfiles.count > 1) [targetProfiles removeObjectAtIndex:1]; + if(targetProfiles.count > 0) [targetProfiles removeObjectAtIndex:0]; + NSMutableArray* localEncodedPofiles = [self encodedProfilesFromArray:targetProfiles]; [profilesEncoded addObjectsFromArray:localEncodedPofiles]; NSData *data = [NSKeyedArchiver archivedDataWithRootObject:profilesEncoded requiringSecureCoding:YES error:nil]; [[NSUserDefaults standardUserDefaults] setObject:data forKey:@"OSCProfiles"]; [[NSUserDefaults standardUserDefaults] synchronize]; } +- (void) importDefaultTemplates{ + NSString *filePath = [[NSBundle mainBundle] pathForResource:@"widgetTemplates" ofType:@"bin"]; + if (filePath) { + // 2. 读取二进制数据 + NSError *error; + NSData *fileData = [NSData dataWithContentsOfFile:filePath options:NSDataReadingMappedIfSafe error:&error]; + NSMutableArray *profilesEncoded; + if (fileData && !error) { + // 3. 成功读取 + NSSet *classes = [NSSet setWithObjects: [NSMutableData class], [NSMutableArray class], nil]; + if (@available(iOS 13.0, *)) { + // 在 iOS 13 及以上使用 unarchivedObjectOfClasses + profilesEncoded = [NSKeyedUnarchiver unarchivedObjectOfClasses:classes fromData:fileData error:&error]; + } else { + // 在 iOS 12 及以下使用 unarchiveObjectWithData（旧方法） + profilesEncoded = [NSKeyedUnarchiver unarchivedObjectOfClass:[NSMutableArray class] fromData:fileData error:&error]; + } + [self importEncodedProfiles:profilesEncoded]; + } + } +} + #pragma mark - Globally Accessible Methods @@ -165,6 +190,7 @@ static CGRect streamViewBounds; profileDecoded = [NSKeyedUnarchiver unarchivedObjectOfClasses: classes fromData:profileEncoded error: nil]; [profilesDecoded addObject: profileDecoded]; } + _currentProfiles = profilesDecoded; return profilesDecoded; } @@ -352,15 +378,22 @@ static CGRect streamViewBounds; - (BOOL) profileNameAlreadyExist:(NSString*)name { NSMutableArray *profiles = [self getAllProfiles]; - /* Iterate through the decoded profiles and return 'YES' if one of the profiles' 'name' properties equals the 'name' passed into this method */ for (OSCProfile *profile in profiles) { - if ([profile.name isEqualToString:name]) { return YES; } } - + return NO; +} + +- (BOOL) profileName:(NSString*) name alreadyExistIn:(NSMutableArray*)profiles { + /* Iterate through the decoded profiles and return 'YES' if one of the profiles' 'name' properties equals the 'name' passed into this method */ + for (OSCProfile *profile in profiles) { + if ([profile.name isEqualToString:name]) { + return YES; + } + } return NO; } @@ -373,7 +406,7 @@ static CGRect streamViewBounds; error:nil]; } else { // 在 iOS 12 及以下使用 unarchiveObjectWithData（旧方法） - buttonState = [NSKeyedUnarchiver unarchivedObjectOfClass: [OnScreenButtonState class] fromData:data error:nil]; + buttonState = [NSKeyedUnarchiver unarchivedObjectOfClass:[OnScreenButtonState class] fromData:data error:nil]; } return buttonState; } diff --git a/Limelight/PresetConfigs/widgetTemplates.bin b/Limelight/PresetConfigs/widgetTemplates.bin new file mode 100755 index 0000000000000000000000000000000000000000..2dd7e6e13b7b5f70c795518ad3044a65718beb68 GIT binary patch literal 71105 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 KX$ZwA$_fBx5VYt3 literal 0 HcmV?d00001 diff --git a/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m b/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m index 875f6506..1b916842 100644 --- a/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m +++ b/Limelight/ViewControllers/CustomOSCViewControl/LayoutOnScreenControlsViewController.m @@ -162,11 +162,18 @@ [self addInnerAnalogSticksToOuterAnalogLayers]; // allows inner and analog sticks to be dragged together around the screen together as one unit which is the expected behavior self.undoButton.alpha = 0.3; // no changes to undo yet, so fade out the undo button a bit - - if ([[profilesManager getAllProfiles] count] == 0) { // if no saved OSC profiles exist yet then create one called 'Default' and associate it with Moonlight's legacy 'Full' OSC layout that's already been laid out on the screen at this point + + NSMutableArray* allProfiles = [profilesManager getAllProfiles]; + /* + if ([allProfiles count] == 0) { // if no saved OSC profiles exist yet then create one called 'Default' and associate it with Moonlight's legacy 'Full' OSC layout that's already been laid out on the screen at this point [profilesManager saveProfileWithName:@"Default" andButtonLayers:self.layoutOSC.OSCButtonLayers]; + [profilesManager importDefaultTemplates]; + }*/ + if (![profilesManager profileName:DEFAULT_TEMPLATE_NAME alreadyExistIn:allProfiles]){ + [profilesManager importDefaultTemplates]; } + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setControllerCALayerSliderValues:) name:@"LegacyOscCALayerSelectedNotification" diff --git a/Moonlight.xcodeproj/project.pbxproj b/Moonlight.xcodeproj/project.pbxproj index bb47652a..4c39f080 100644 --- a/Moonlight.xcodeproj/project.pbxproj +++ b/Moonlight.xcodeproj/project.pbxproj @@ -18,6 +18,7 @@ 84351B2D2C29AD6100A77989 /* ToolBarContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84351B292C29AD6000A77989 /* ToolBarContainerView.m */; }; 84351B5C2C29ADBE00A77989 /* ProfileTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 84351B592C29ADBE00A77989 /* ProfileTableViewCell.m */; }; 84351B5D2C29ADBE00A77989 /* ProfileTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84351B5B2C29ADBE00A77989 /* ProfileTableViewCell.xib */; }; + 843667F02D9D7173004A7D7F /* widgetTemplates.bin in Resources */ = {isa = PBXBuildFile; fileRef = 843667EF2D9D7173004A7D7F /* widgetTemplates.bin */; }; 843CC7F02C1E757D00BBC475 /* NativeTouchPointer.m in Sources */ = {isa = PBXBuildFile; fileRef = 843CC7EF2C1E757D00BBC475 /* NativeTouchPointer.m */; }; 843CC7F62C1E7A1700BBC475 /* NativeTouchHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 843CC7F52C1E7A1700BBC475 /* NativeTouchHandler.m */; }; 843E93BE2C41528700B1651F /* OrientationHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 843E93BD2C41528700B1651F /* OrientationHelper.swift */; }; @@ -145,6 +146,7 @@ 84351B592C29ADBE00A77989 /* ProfileTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProfileTableViewCell.m; sourceTree = ""; }; 84351B5A2C29ADBE00A77989 /* ProfileTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProfileTableViewCell.h; sourceTree = ""; }; 84351B5B2C29ADBE00A77989 /* ProfileTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ProfileTableViewCell.xib; sourceTree = ""; }; + 843667EF2D9D7173004A7D7F /* widgetTemplates.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = widgetTemplates.bin; path = Limelight/PresetConfigs/widgetTemplates.bin; sourceTree = SOURCE_ROOT; }; 843CC7EE2C1E757D00BBC475 /* NativeTouchPointer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NativeTouchPointer.h; sourceTree = ""; }; 843CC7EF2C1E757D00BBC475 /* NativeTouchPointer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NativeTouchPointer.m; sourceTree = ""; }; 843CC7F42C1E778000BBC475 /* NativeTouchHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NativeTouchHandler.h; sourceTree = ""; }; @@ -453,6 +455,14 @@ path = Cells; sourceTree = ""; }; + 843667ED2D9D70A3004A7D7F /* PresetConfigs */ = { + isa = PBXGroup; + children = ( + 843667EF2D9D7173004A7D7F /* widgetTemplates.bin */, + ); + name = PresetConfigs; + sourceTree = ""; + }; 84FD0B492C312C0B006B5BE5 /* Localization */ = { isa = PBXGroup; children = ( @@ -578,6 +588,7 @@ FB290CFA19B2C406004C83CF /* Supporting Files */ = { isa = PBXGroup; children = ( + 843667ED2D9D70A3004A7D7F /* PresetConfigs */, FB290CFB19B2C406004C83CF /* Limelight-Info.plist */, FB290CFC19B2C406004C83CF /* InfoPlist.strings */, FB290CFF19B2C406004C83CF /* main.m */, @@ -1000,6 +1011,7 @@ FB89463819F6473800339C8A /* Launch Screen.xib in Resources */, 8454AC662C31907F00F0A302 /* iPad.storyboard in Resources */, 8454AC6A2C319BDA00F0A302 /* iPhone.storyboard in Resources */, + 843667F02D9D7173004A7D7F /* widgetTemplates.bin in Resources */, 84FD0B542C3134A6006B5BE5 /* Localizable.xcstrings in Resources */, 84351B5D2C29ADBE00A77989 /* ProfileTableViewCell.xib in Resources */, );