Screen增加缩放模式处理, 优化缩放模式判断准确性, 设置条件增加缩放模式值.

Author: lixiang1994

AutoInch.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name         = "AutoInch"
-s.version      = "2.1.0"
+s.version      = "2.2.0"
 s.summary      = "优雅的iPhone 等比例/精准 适配工具"
 
 s.homepage     = "https://github.com/lixiang1994/AutoInch"

AutoInch.xcodeproj/project.pbxproj

@@ -287,7 +287,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.2.0;
 				OTHER_CFLAGS = "-fembed-bitcode";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lee.autoinch;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
@@ -319,7 +319,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.0;
+				MARKETING_VERSION = 2.2.0;
 				OTHER_CFLAGS = "-fembed-bitcode";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lee.autoinch;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";

Demo/Demo/ViewController.swift

@@ -30,11 +30,18 @@ class ViewController: UITableViewController {
                 .level(.full, is: "屏幕级别 全面屏")
                 .value
         )
-        0.screen.inch(._3_5, is: 1).inch(._4_0, is: 2).value
+        
+        
+        // 默认值 0 在3.5英寸的屏幕时返回1, 在4.0英寸的屏幕时返回2
+        print(0.screen.inch(._3_5, is: 1).inch(._4_0, is: 2).value)
+        // 默认值 0 在全面屏时返回1, 在6.1英寸的屏幕时返回2
         print(0.screen.level(.full, is: 1).inch(._6_1, is: 2).value)
+        // 默认值 100 在宽度为375级别的屏幕时 正常返回120, 如果为缩放模式则返回110
+        print(100.screen.width(._375, is: 120, zoomed: 110).value)
 
         print("当前屏幕级别: \(Screen.Level.current)")
         print("是否为全面屏: \(Screen.isFull)")
+        print("是否为缩放模式: \(Screen.isZoomedMode)")
     }
 
     override var preferredStatusBarStyle: UIStatusBarStyle {

Demo/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - AutoInch (1.3.2)
+  - AutoInch (2.2.0)
 
 DEPENDENCIES:
   - AutoInch (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  AutoInch: beaafbcef5f075d34b57bddd6b1893cb19d0f0de
+  AutoInch: 1239050818579ea0cb009cfb73c153f83e83f3ce
 
 PODFILE CHECKSUM: ecf7d3b2dbf7db87c4f919501ebdb320458e7aef
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.1

Sources/Screen.swift

@@ -42,39 +42,77 @@ extension ScreenCompatible {
 
 extension ScreenWrapper {
 
-    public func width(_ types: Screen.Width... , is value: Base) -> Self {
+    public func width(_ types: Screen.Width..., is value: Base) -> Self {
+        return width(types, is: value, zoomed: value)
+    }
+    public func width(_ types: Screen.Width..., is value: Base, zoomed: Base) -> Self {
+        return width(types, is: value, zoomed: zoomed)
+    }
+    private func width(_ types: [Screen.Width], is value: Base, zoomed: Base) -> Self {
         for type in types where Screen.Width.current == type {
-            self.value = value
+            self.value = Screen.isZoomedMode ? zoomed : value
         }
         return self
     }
 
     public func height(_ types: Screen.Height..., is value: Base) -> Self {
+        return height(types, is: value, zoomed: value)
+    }
+    public func height(_ types: Screen.Height..., is value: Base, zoomed: Base) -> Self {
+        return height(types, is: value, zoomed: zoomed)
+    }
+    private func height(_ types: [Screen.Height], is value: Base, zoomed: Base) -> Self {
         for type in types where Screen.Height.current == type {
-            self.value = value
+            self.value = Screen.isZoomedMode ? zoomed : value
         }
         return self
     }
 
     public func inch(_ types: Screen.Inch..., is value: Base) -> Self {
+        return inch(types, is: value, zoomed: value)
+    }
+    public func inch(_ types: Screen.Inch..., is value: Base, zoomed: Base) -> Self {
+        return inch(types, is: value, zoomed: zoomed)
+    }
+    private func inch(_ types: [Screen.Inch], is value: Base, zoomed: Base) -> Self {
         for type in types where Screen.Inch.current == type {
-            self.value = value
+            self.value = Screen.isZoomedMode ? zoomed : value
         }
         return self
     }
 
     public func level(_ types: Screen.Level..., is value: Base) -> Self {
+        return level(types, is: value, zoomed: value)
+    }
+    public func level(_ types: Screen.Level..., is value: Base, zoomed: Base) -> Self {
+        return level(types, is: value, zoomed: zoomed)
+    }
+    private func level(_ types: [Screen.Level], is value: Base, zoomed: Base) -> Self {
         for type in types where Screen.Level.current == type {
-            self.value = value
+            self.value = Screen.isZoomedMode ? zoomed : value
         }
         return self
     }
 }
 
 public enum Screen {
 
-    public static var size: CGSize = UIScreen.main.bounds.size
-    public static var scale: CGFloat = UIScreen.main.scale
+    public static var isZoomedMode: Bool {
+        UIScreen.main.scale != UIScreen.main.nativeScale
+    }
+    
+    static var size: CGSize {
+        UIScreen.main.bounds.size
+    }
+    static var nativeSize: CGSize {
+        UIScreen.main.nativeBounds.size
+    }
+    static var scale: CGFloat {
+        UIScreen.main.scale
+    }
+    static var nativeScale: CGFloat {
+        UIScreen.main.nativeScale
+    }
 
     public enum Width: CGFloat {
         case unknown = -1
@@ -85,7 +123,7 @@ public enum Screen {
         case _428 = 428
 
         public static var current: Width {
-            return Width(rawValue: size.width) ?? .unknown
+            return Width(rawValue: nativeSize.width / scale) ?? .unknown
         }
     }
 
@@ -101,7 +139,7 @@ public enum Screen {
         case _926 = 926
 
         public static var current: Height {
-            return Height(rawValue: size.height) ?? .unknown
+            return Height(rawValue: nativeSize.height / scale) ?? .unknown
         }
     }
 
@@ -118,7 +156,7 @@ public enum Screen {
         case _6_7 = 6.7
 
         public static var current: Inch {
-            switch (size.width, size.height, scale) {
+            switch (nativeSize.width / scale, nativeSize.height / scale, scale) {
             case (320, 480, 2):
                 return ._3_5
 
@@ -162,7 +200,7 @@ public enum Screen {
         case full
 
         public static var current: Level {
-            switch (size.width, size.height) {
+            switch (nativeSize.width / scale, nativeSize.height / scale) {
             case (320, 480):
                 return .compact