动效pad适配

KulexiuForStudent/KulexiuForStudent/Common/Base/AccompanyWebView/AccompanyLoadingView.m

@@ -15,6 +15,7 @@
     NSInteger _timeCount;
     CGFloat _count;
 }
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *animationWidth;
 
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *loadWidth;
 
@@ -33,6 +34,9 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     self.jsonString = @"cloud_animation";
+    if (IS_IPAD) {
+        self.animationWidth.constant = 300 * 1.5;
+    }
 }
 
 - (void)loadingCallback:(AccompanyLoadingCallback)callback {

KulexiuForStudent/KulexiuForStudent/Common/Base/AccompanyWebView/AccompanyLoadingView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -11,7 +11,7 @@
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="AccompanyLoadingView">
             <rect key="frame" x="0.0" y="0.0" width="699" height="340"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="cloudLoading_bg" translatesAutoresizingMaskIntoConstraints="NO" id="ZV3-qJ-uxE">
                     <rect key="frame" x="0.0" y="0.0" width="699" height="340"/>
@@ -25,7 +25,7 @@
                     </constraints>
                 </view>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小酷正在努力加载，请稍等..." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bjn-zM-LJW">
-                    <rect key="frame" x="258" y="271" width="183.5" height="17"/>
+                    <rect key="frame" x="260" y="271" width="179" height="17"/>
                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <nil key="highlightedColor"/>
@@ -106,6 +106,7 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="animationWidth" destination="PRt-J4-ryA" id="2hG-0F-tkf"/>
                 <outlet property="loadContainer" destination="Gn9-HQ-HPj" id="Rdq-mO-hMY"/>
                 <outlet property="loadWidth" destination="kYR-E7-B2J" id="3O0-7L-OzU"/>
             </connections>

KulexiuForStudent/KulexiuForStudent/Common/Base/DelayCheck/KSDelayCheckView.m

@@ -12,6 +12,8 @@
 
 @interface KSDelayCheckView ()
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *shipTopSpace;
+
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *shipboardWidth;
 
 @property (weak, nonatomic) IBOutlet UIImageView *shipView;
@@ -56,6 +58,10 @@
 @property (weak, nonatomic) IBOutlet UIView *bubbleBgView;
 @property (nonatomic, strong) LOTAnimationView *bubbleAniView;
 
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tipsBottomSpace;
+
+
 @end
 
 @implementation KSDelayCheckView
@@ -67,10 +73,13 @@
     self.backButtonLeft.constant = 25;
     self.systemVolume = [self getCurrentVolume];
     if (IS_IPAD) {
-        self.shipboardWidth.constant = 298 * 1.2;
+        CGFloat shipWidth = 298 * 1.5;
+        self.shipboardWidth.constant = shipWidth;
         self.tipsWidth.constant = 340 * 1.2;
-//        self.tipsBottomSpace.constant = 40.0f;
+        self.tipsBottomSpace.constant = 80.0f;
+        self.shipTopSpace.constant = (KLandscapeHeight - shipWidth / 298 * 254) / 2.0f - 50;
     }
+    
     self.retryButtonRight.constant = self.tipsWidth.constant / 340 * 54;
     
 }

KulexiuForStudent/KulexiuForStudent/Common/Base/DelayCheck/KSDelayCheckView.xib

@@ -207,11 +207,11 @@
                 <constraint firstAttribute="trailing" secondItem="BHM-q7-D86" secondAttribute="trailing" id="Q7J-FN-pKD"/>
                 <constraint firstItem="pcl-5K-Deb" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="Yo1-C7-F1f"/>
                 <constraint firstItem="13a-eT-FQo" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="bKZ-Tx-uIh"/>
+                <constraint firstItem="FYc-te-vMr" firstAttribute="top" secondItem="1N3-2i-t6U" secondAttribute="top" constant="35" id="bpd-Vm-zwQ"/>
                 <constraint firstAttribute="bottom" secondItem="13a-eT-FQo" secondAttribute="bottom" id="diT-dc-3Di"/>
                 <constraint firstItem="FYc-te-vMr" firstAttribute="leading" secondItem="1N3-2i-t6U" secondAttribute="trailing" constant="11" id="ePR-fT-lQJ"/>
                 <constraint firstItem="1aI-Fq-ro5" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="fZU-xW-xJ0"/>
                 <constraint firstItem="pg3-Ih-STu" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="hAp-vt-VbP"/>
-                <constraint firstItem="FYc-te-vMr" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="41" id="jh7-kQ-a86"/>
                 <constraint firstItem="1N3-2i-t6U" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="6" id="lL6-0H-fjE"/>
                 <constraint firstItem="9H1-aj-D94" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="tXf-ar-C6b"/>
                 <constraint firstItem="pcl-5K-Deb" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="30" id="z0b-B2-XKR"/>
@@ -230,8 +230,10 @@
                 <outlet property="sandbeachAniBgView" destination="u3c-a0-cG0" id="9S9-m6-gVa"/>
                 <outlet property="seaGrassLeft" destination="1aI-Fq-ro5" id="f1u-GJ-hVo"/>
                 <outlet property="seaGrassRight" destination="37c-b2-LZq" id="mby-9q-vL2"/>
+                <outlet property="shipTopSpace" destination="lL6-0H-fjE" id="wUh-8M-IUW"/>
                 <outlet property="shipView" destination="DOi-v9-ZzR" id="T99-Mq-ZQx"/>
                 <outlet property="shipboardWidth" destination="8xk-yi-a4d" id="nww-Ue-UQK"/>
+                <outlet property="tipsBottomSpace" destination="JsQ-fC-Os1" id="X3S-V5-SDG"/>
                 <outlet property="tipsImage" destination="RzA-6Z-Vaf" id="BFH-sX-6TB"/>
                 <outlet property="tipsWidth" destination="zTz-gE-YK1" id="P6j-U4-cba"/>
             </connections>