From 9a5fe717a23cb950735ac0d4f50d1ed3c467ce61 Mon Sep 17 00:00:00 2001
From: kai60 <zhufadong@163.com>
Date: Tue, 22 Mar 2022 21:46:19 +0800
Subject: [PATCH] =?UTF-8?q?xcode13=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseVIewContorller/BaseViewController.m        |  2 ++
 .../ClearNavBaseViewController.m                   |  2 ++
 .../BaseVIewContorller/FatherController.m          |  2 ++
 .../WhiteNavBaseViewController.m                   |  2 ++
 .../XuTo/Xuanduo2fController.xib                   | 14 +++++++++-----
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/Ifish/controllers/BaseVIewContorller/BaseViewController.m b/Ifish/controllers/BaseVIewContorller/BaseViewController.m
index 28e9b18..7621004 100644
--- a/Ifish/controllers/BaseVIewContorller/BaseViewController.m
+++ b/Ifish/controllers/BaseVIewContorller/BaseViewController.m
@@ -17,6 +17,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.edgesForExtendedLayout=UIRectEdgeNone;
+
     // Do any additional setup after loading the view.
     [self initNav];
     [self addTitleView];
diff --git a/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m b/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m
index 3122e7f..e992bf3 100644
--- a/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m
+++ b/Ifish/controllers/BaseVIewContorller/ClearNavBaseViewController.m
@@ -16,6 +16,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.edgesForExtendedLayout=UIRectEdgeNone;
+
     // Do any additional setup after loading the view.
     self.view.backgroundColor = TABLE_BACKGROUD_COLOR;
     [self initNav];
diff --git a/Ifish/controllers/BaseVIewContorller/FatherController.m b/Ifish/controllers/BaseVIewContorller/FatherController.m
index 1e85ca3..31ef2fe 100644
--- a/Ifish/controllers/BaseVIewContorller/FatherController.m
+++ b/Ifish/controllers/BaseVIewContorller/FatherController.m
@@ -16,6 +16,8 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    self.edgesForExtendedLayout=UIRectEdgeNone;
+
     [self setNav];
     
     
diff --git a/Ifish/controllers/BaseVIewContorller/WhiteNavBaseViewController.m b/Ifish/controllers/BaseVIewContorller/WhiteNavBaseViewController.m
index dd5177d..5e705a1 100644
--- a/Ifish/controllers/BaseVIewContorller/WhiteNavBaseViewController.m
+++ b/Ifish/controllers/BaseVIewContorller/WhiteNavBaseViewController.m
@@ -17,7 +17,9 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor whiteColor];
+    self.edgesForExtendedLayout=UIRectEdgeNone;
     [self initNav];
+    
     // Do any additional setup after loading the view.
 }
 
diff --git a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib
index 647df02..62f4e2f 100644
--- a/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib
+++ b/Ifish/controllers/FishTinkController/maincontroller/CenterontrolControllers/XuTo/Xuanduo2fController.xib
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -245,7 +246,7 @@
                                         <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
                                     </userDefinedRuntimeAttributes>
                                 </label>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KcF-jg-Mz2">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KcF-jg-Mz2">
                                     <rect key="frame" x="30" y="18" width="63" height="31"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="31" id="LNl-zb-LQq"/>
@@ -285,7 +286,7 @@
                                         <constraint firstAttribute="width" constant="80" id="r6V-4R-2Wp"/>
                                     </constraints>
                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                    <color key="textColor" systemColor="systemRedColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <color key="textColor" systemColor="systemRedColor"/>
                                     <nil key="highlightedColor"/>
                                     <userDefinedRuntimeAttributes>
                                         <userDefinedRuntimeAttribute type="string" keyPath="layer.cornerRadius" value="5"/>
@@ -398,6 +399,7 @@
                     </constraints>
                 </scrollView>
             </subviews>
+            <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="H1f-gs-HPh" firstAttribute="leading" secondItem="Q5M-cg-NOt" secondAttribute="leading" id="UZV-yH-Ib3"/>
@@ -406,7 +408,6 @@
                 <constraint firstItem="Q5M-cg-NOt" firstAttribute="bottom" secondItem="H1f-gs-HPh" secondAttribute="bottom" id="xoh-oW-kFY"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
-            <viewLayoutGuide key="safeArea" id="Q5M-cg-NOt"/>
             <point key="canvasLocation" x="93.599999999999994" y="154.27286356821591"/>
         </view>
     </objects>
@@ -427,5 +428,8 @@
         <image name="zaolang_selectd" width="52" height="52"/>
         <image name="zengyang_noraml" width="105" height="105"/>
         <image name="zengyang_selected" width="52.5" height="52.5"/>
+        <systemColor name="systemRedColor">
+            <color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>