Răsfoiți Sursa

3.6.13(3)适配 iPad TSAIListHintBaseVC UI 问题

100Years 1 săptămână în urmă
părinte
comite
f94b26b971

+ 2 - 2
TSLiveWallpaper.xcodeproj/project.pbxproj

@@ -1465,7 +1465,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -1506,7 +1506,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = 65UD255J84;
 				ENABLE_APP_SANDBOX = NO;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

+ 13 - 3
TSLiveWallpaper/Business/TSAIListVC/TSAIAgeImageHintVC/TSAIListHintBaseVC.swift

@@ -176,11 +176,16 @@ class TSAIListHintBaseVC: TSBaseVC {
     
     
     func setUpUI(){
-
+        
+        var iconImageViewTop = 16.0
+        if UIDevice.IPad {
+            iconImageViewTop = 0
+        }
+        
         let iconImageView:UIImageView = UIImageView.createImageView(image: .hint)
         popupContentView.addSubview(iconImageView)
         iconImageView.snp.makeConstraints { make in
-            make.top.equalTo(16)
+            make.top.equalTo(iconImageViewTop)
             make.leading.equalTo(0)
             make.width.height.equalTo(40)
         }
@@ -250,13 +255,18 @@ class TSAIListHintBaseVC: TSBaseVC {
             make.trailing.equalTo(0)
         }
         
+        
+        var submitBtnBottom = -43.0-k_Height_safeAreaInsetsBottom()
+        if UIDevice.IPad {
+            submitBtnBottom = -5
+        }
 
         popupContentView.addSubview(submitBtn)
         submitBtn.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
             make.width.equalTo(248*kDesignScale)
             make.height.equalTo(48)
-            make.bottom.equalTo(-43-k_Height_safeAreaInsetsBottom())
+            make.bottom.equalTo(submitBtnBottom)
         }
     }
 

+ 13 - 1
TSLiveWallpaper/Common/Ex/UIDevice+Extension.swift

@@ -28,7 +28,7 @@ extension UIApplication {
         let window = (UIApplication.shared.delegate as? AppDelegate)?.window
         return window?.rootViewController
     }
-
+    
 }
 
 extension UIViewController {
@@ -44,3 +44,15 @@ extension UIViewController {
         return self
     }
 }
+extension UIDevice {
+    static var IPad: Bool {
+         // iOS 14+ 可以直接使用 model 属性
+         if #available(iOS 14.0, *) {
+             return current.model == "iPad"
+         }
+         // iOS 13 及以下回退到 userInterfaceIdiom
+         else {
+             return current.userInterfaceIdiom == .pad
+         }
+     }
+}