新增 Device.IsIPad 以及 Device.IsIPhoneNotchScreen

Author: Aaron8052

Plugins/CS/Device.cs

@@ -8,6 +8,12 @@ namespace iOSNativePlugin
 {
     public static class Device
     {
+        [DllImport("__Internal")]
+        static extern bool Device_IsIPhoneNotchScreen();
+
+        [DllImport("__Internal")]
+        static extern bool Device_IsIPad();
+
         [DllImport("__Internal")]
         static extern int Device_GetDeviceOrientation();
 
@@ -29,6 +35,15 @@ public static class Device
         [DllImport("__Internal")]
         static extern string Device_GetCountryCode();
 
+        /// <summary>
+        /// 是否是 iPhone 刘海屏
+        /// </summary>
+        /// <returns></returns>
+        public static bool IsIPhoneNotchScreen() => Device_IsIPhoneNotchScreen();
+
+        // 是否在 iPad 运行
+        public static bool IsIPad() => Device_IsIPad();
+
         /// <summary>
         /// 获取当前设备的物理朝向
         /// </summary>
@@ -45,14 +60,14 @@ public static bool IsBluetoothHeadphonesConnected()
             => Audio_IsBluetoothHeadphonesConnected();
 
         /// <summary>
-        /// 判断当前app是否运行在Mac Catalyst环境下
+        /// 判断当前app是否运行在 Mac Catalyst 环境下
         /// </summary>
         /// <returns></returns>
         [Obsolete("Use IsRunningOnMac instead.")]
         public static bool IsMacCatalyst() => Device_IsMacCatalyst();
 
         /// <summary>
-        /// 判断当前app是否运行在Mac环境下
+        /// 判断当前 app 是否运行在 Mac 环境下
         /// </summary>
         /// <returns></returns>
         public static bool IsRunningOnMac()

Plugins/Native/Headers/Device.h

@@ -1,7 +1,8 @@
 #import "../Utils.mm"
 
 @interface Device : NSObject
-
++(BOOL)IsIPhoneNotchScreen;
++(BOOL)IsIPad;
 +(NSInteger)GetDeviceOrientation;
 +(BOOL)IsMacCatalyst;
 +(BOOL)IsSuperuser;
@@ -12,6 +13,14 @@
 
 extern "C"
 {
+    bool Device_IsIPhoneNotchScreen()
+    {
+        return [Device IsIPhoneNotchScreen];
+    }
+    bool Device_IsIPad()
+    {
+        return [Device IsIPad];
+    }
     int Device_GetDeviceOrientation(){
         return (int)[Device GetDeviceOrientation];
     }

Plugins/Native/Implementations/Device.mm

@@ -1,13 +1,30 @@
 #import <UIKit/UIFeedbackGenerator.h>
 #import "../Headers/Device.h"
+#import <UIKit/UIDevice.h>
 
 @implementation Device
 
-+(NSInteger)GetDeviceOrientation{
++(BOOL)IsIPhoneNotchScreen
+{
+    if([Device IsIPad])
+       return NO;
+    
+    UIWindow *mainWindow = [[[UIApplication sharedApplication] delegate] window];
+    return mainWindow.safeAreaInsets.bottom > 0.0;
+}
+
++(BOOL)IsIPad
+{
+    return [[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad;
+}
+
++(NSInteger)GetDeviceOrientation
+{
     return [[UIDevice currentDevice]orientation];
 }
 
-+(BOOL)IsMacCatalyst{
++(BOOL)IsMacCatalyst
+{
 #if TARGET_OS_MACCATALYST
     return YES;
 #else

Plugins/Native/Implementations/NativeUI.mm

@@ -134,16 +134,22 @@ +(void)SetStatusBarOrientation:(NSInteger)orientation{
 }
 +(BOOL)IsStatusBarHidden {
     return [UIApplication sharedApplication].isStatusBarHidden;
+    //return [UnityGetGLViewController() prefersStatusBarHidden];
 }
 
 
 +(void)SetStatusBarHidden:(BOOL)hidden
             withAnimation:(NSInteger)withAnimation {
-    if([NativeUI IsStatusBarHidden] == hidden)
-        return;
+    /* if([NativeUI IsStatusBarHidden] == hidden)
+        return; */
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        [[UIApplication sharedApplication] setStatusBarHidden:hidden withAnimation:(UIStatusBarAnimation)withAnimation];
+        [[UIApplication sharedApplication] setStatusBarHidden:hidden
+                                                withAnimation:(UIStatusBarAnimation)withAnimation];
+        [UnityGetGLViewController() setNeedsStatusBarAppearanceUpdate];
+        UIWindow * keyWindow = [UIApplication sharedApplication].keyWindow;
+        [keyWindow setNeedsLayout];
+        [keyWindow layoutIfNeeded];
     });
 }
 
@@ -153,6 +159,10 @@ +(void)SetStatusBarStyle:(NSInteger)style animated:(BOOL)animated{
 
     dispatch_async(dispatch_get_main_queue(), ^{
         [[UIApplication sharedApplication] setStatusBarStyle:statusBarStyle animated:animated];
+        [UnityGetGLViewController() setNeedsStatusBarAppearanceUpdate];
+        UIWindow * keyWindow = [UIApplication sharedApplication].keyWindow;
+        [keyWindow setNeedsLayout];
+        [keyWindow layoutIfNeeded];
     });
 
 }