lovelyelfpop commented on issue #128:
URL:
https://github.com/apache/cordova-plugin-screen-orientation/issues/128#issuecomment-4044646830
Solved it!
```
/*
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*/
#import "CDVOrientation.h"
#import <Cordova/CDVViewController.h>
#import <objc/message.h>
@interface CDVOrientation () {}
@end
@implementation CDVOrientation
-(void)handleBelowEqualIos15WithOrientationMask:(NSInteger) orientationMask
viewController: (CDVViewController*) vc result:(NSMutableArray*) result
selector:(SEL) selector
{
NSValue *value;
if (orientationMask != 15) {
if (!_isLocked) {
_lastOrientation = [UIApplication
sharedApplication].statusBarOrientation;
}
UIInterfaceOrientation deviceOrientation = [UIApplication
sharedApplication].statusBarOrientation;
if(orientationMask == 8 || (orientationMask == 12 &&
!UIInterfaceOrientationIsLandscape(deviceOrientation))) {
value = [NSNumber
numberWithInt:UIInterfaceOrientationLandscapeLeft];
} else if (orientationMask == 4){
value = [NSNumber
numberWithInt:UIInterfaceOrientationLandscapeRight];
} else if (orientationMask == 1 || (orientationMask == 3 &&
!UIInterfaceOrientationIsPortrait(deviceOrientation))) {
value = [NSNumber numberWithInt:UIInterfaceOrientationPortrait];
} else if (orientationMask == 2) {
value = [NSNumber
numberWithInt:UIInterfaceOrientationPortraitUpsideDown];
}
} else {
if (_lastOrientation != UIInterfaceOrientationUnknown) {
[[UIDevice currentDevice] setValue:[NSNumber
numberWithInt:_lastOrientation] forKey:@"orientation"];
((void (*)(CDVViewController*, SEL,
NSMutableArray*))objc_msgSend)(vc,selector,result);
[UINavigationController attemptRotationToDeviceOrientation];
}
}
if (value != nil) {
_isLocked = true;
[[UIDevice currentDevice] setValue:value forKey:@"orientation"];
} else {
_isLocked = false;
}
}
#if __IPHONE_OS_VERSION_MAX_ALLOWED >= 160000
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunguarded-availability-new"
// this will stop it complaining about new iOS16 APIs being used.
-(void)handleAboveEqualIos16WithOrientationMask:(NSInteger) orientationMask
viewController: (CDVViewController*) vc result:(NSMutableArray*) result
selector:(SEL) selector
{
NSObject *value;
// oritentationMask 15 is "unlock" the orientation lock.
if (orientationMask != 15) {
if (!_isLocked) {
_lastOrientation = [UIApplication
sharedApplication].statusBarOrientation;
}
UIInterfaceOrientation deviceOrientation = [UIApplication
sharedApplication].statusBarOrientation;
if(orientationMask == 8 || (orientationMask == 12 &&
!UIInterfaceOrientationIsLandscape(deviceOrientation))) {
value = [[UIWindowSceneGeometryPreferencesIOS alloc]
initWithInterfaceOrientations:UIInterfaceOrientationMaskLandscapeLeft];
} else if (orientationMask == 4){
value = [[UIWindowSceneGeometryPreferencesIOS alloc]
initWithInterfaceOrientations:UIInterfaceOrientationMaskLandscapeRight];
} else if (orientationMask == 1 || (orientationMask == 3 &&
!UIInterfaceOrientationIsPortrait(deviceOrientation))) {
value = [[UIWindowSceneGeometryPreferencesIOS alloc]
initWithInterfaceOrientations:UIInterfaceOrientationMaskPortrait];
} else if (orientationMask == 2) {
value = [[UIWindowSceneGeometryPreferencesIOS alloc]
initWithInterfaceOrientations:UIInterfaceOrientationMaskPortraitUpsideDown];
}
} else {
// ===== fix unlock start=====
UIWindowScene *scene =
(UIWindowScene*)[[UIApplication.sharedApplication connectedScenes] anyObject];
if (scene) {
UIInterfaceOrientationMask resetMask;
if (_lastOrientation != UIInterfaceOrientationUnknown) {
resetMask = [self orientationToMask:_lastOrientation];
} else {
resetMask = UIInterfaceOrientationMaskPortrait;
}
UIWindowSceneGeometryPreferencesIOS *preferences =
[[UIWindowSceneGeometryPreferencesIOS alloc]
initWithInterfaceOrientations:resetMask];
[scene requestGeometryUpdateWithPreferences:preferences
errorHandler:^(NSError * _Nonnull error) {
NSLog(@"Failed to reset orientation %@ %@", error, [error
userInfo]);
}];
}
[UINavigationController attemptRotationToDeviceOrientation];
// ===== fix unlock end=====
((void (*)(CDVViewController*, SEL,
NSMutableArray*))objc_msgSend)(vc,selector,result);
}
if (value != nil) {
_isLocked = true;
UIWindowScene *scene =
(UIWindowScene*)[[UIApplication.sharedApplication connectedScenes] anyObject];
[scene
requestGeometryUpdateWithPreferences:(UIWindowSceneGeometryPreferencesIOS*)value
errorHandler:^(NSError * _Nonnull error) {
NSLog(@"Failed to change orientation %@ %@", error, [error
userInfo]);
}];
} else {
_isLocked = false;
}
}
// add this function
-
(UIInterfaceOrientationMask)orientationToMask:(UIInterfaceOrientation)orientation
{
switch (orientation) {
case UIInterfaceOrientationPortrait:
return UIInterfaceOrientationMaskPortrait;
case UIInterfaceOrientationPortraitUpsideDown:
return UIInterfaceOrientationMaskPortraitUpsideDown;
case UIInterfaceOrientationLandscapeLeft:
return UIInterfaceOrientationMaskLandscapeLeft;
case UIInterfaceOrientationLandscapeRight:
return UIInterfaceOrientationMaskLandscapeRight;
default:
return UIInterfaceOrientationMaskPortrait;
}
}
#pragma clang diagnostic pop
-(void)handleWithOrientationMask:(NSInteger) orientationMask viewController:
(CDVViewController*) vc result:(NSMutableArray*) result selector:(SEL) selector
{
if (@available(iOS 16.0, *)) {
[self handleAboveEqualIos16WithOrientationMask:orientationMask
viewController:vc result:result selector:selector];
// always double check the supported interfaces, so we update if
needed
// but do it right at the end here to avoid the "double" rotation
issue reported in
//
https://github.com/apache/cordova-plugin-screen-orientation/pull/107
[self.viewController setNeedsUpdateOfSupportedInterfaceOrientations];
} else {
[self handleBelowEqualIos15WithOrientationMask:orientationMask
viewController:vc result:result selector:selector];
}
}
#else
-(void)handleWithOrientationMask:(NSInteger) orientationMask viewController:
(CDVViewController*) vc result:(NSMutableArray*) result selector:(SEL) selector
{
[self handleBelowEqualIos15WithOrientationMask:orientationMask
viewController:vc result:result selector:selector];
}
#endif
-(void)screenOrientation:(CDVInvokedUrlCommand *)command
{
CDVPluginResult* pluginResult;
NSInteger orientationMask = [[command argumentAtIndex:0] integerValue];
CDVViewController* vc = (CDVViewController*)self.viewController;
NSMutableArray* result = [[NSMutableArray alloc] init];
if(orientationMask & 1) {
[result addObject:[NSNumber
numberWithInt:UIInterfaceOrientationPortrait]];
}
else if(orientationMask & 2) {
[result addObject:[NSNumber
numberWithInt:UIInterfaceOrientationPortraitUpsideDown]];
}
if(orientationMask & 4) {
[result addObject:[NSNumber
numberWithInt:UIInterfaceOrientationLandscapeRight]];
}
else if(orientationMask & 8) {
[result addObject:[NSNumber
numberWithInt:UIInterfaceOrientationLandscapeLeft]];
}
SEL selector = NSSelectorFromString(@"setSupportedOrientations:");
if([vc respondsToSelector:selector]) {
if (orientationMask != 15 || [UIDevice currentDevice] == nil) {
((void (*)(CDVViewController*, SEL,
NSMutableArray*))objc_msgSend)(vc,selector,result);
}
if ([UIDevice currentDevice] != nil){
[self handleWithOrientationMask:orientationMask
viewController:vc result:result selector:selector];
}
pluginResult = [CDVPluginResult
resultWithStatus:CDVCommandStatus_OK];
}
else {
pluginResult = [CDVPluginResult
resultWithStatus:CDVCommandStatus_INVALID_ACTION messageAsString:@"Error
calling to set supported orientations"];
}
[self.commandDelegate sendPluginResult:pluginResult
callbackId:command.callbackId];
}
@end
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
