动效pad适配

KulexiuForTeacher/KulexiuForTeacher/Common/Base/AccompanyWebView/AccompanyLoadingView.m

@@ -15,6 +15,8 @@
     NSInteger _timeCount;
     CGFloat _count;
 }
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *animationWidth;
+
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *loadWidth;
 
 @property (weak, nonatomic) IBOutlet UIView *loadContainer;
@@ -32,6 +34,9 @@
 - (void)awakeFromNib {
     [super awakeFromNib];
     self.jsonString = @"cloud_animation";
+    if (IS_IPAD) {
+        self.animationWidth.constant = 300 * 1.5;
+    }
 }
 
 - (void)loadingCallback:(AccompanyLoadingCallback)callback {
@@ -46,6 +51,7 @@
 }
 
 - (void)showLoading {
+    
     self.layer.opacity = 1.0f;
     [self resetTimeCount];
     [self startTimer];
@@ -83,7 +89,6 @@
     if (self.animationView.isAnimationPlaying) {
         [self.animationView stop];
     }
-    
     if (self.callback) {
         self.callback();
     }
@@ -148,7 +153,6 @@
         _timer = nil;
     }
 }
-
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Common/Base/AccompanyWebView/AccompanyLoadingView.xib

@@ -20,12 +20,12 @@
                     <rect key="frame" x="199.5" y="50" width="300" height="200"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="300" id="m5J-oC-fe8"/>
+                        <constraint firstAttribute="width" constant="300" id="PRt-J4-ryA"/>
                         <constraint firstAttribute="width" secondItem="Gn9-HQ-HPj" secondAttribute="height" multiplier="3:2" id="nMf-gF-jkz"/>
                     </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="260" y="276" width="179" 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"/>
@@ -48,14 +48,14 @@
                         <action selector="cancleAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="dvV-tf-Ggg"/>
                     </connections>
                 </button>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ppE-Yx-0QI">
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5FN-Gd-tjU">
                     <rect key="frame" x="199.5" y="308" width="300" height="12"/>
                     <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b8q-89-oSh">
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1OP-rv-oYu">
                             <rect key="frame" x="0.0" y="0.0" width="0.0" height="12"/>
                             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
-                                <constraint firstAttribute="width" id="ikU-UU-nkd"/>
+                                <constraint firstAttribute="width" id="kYR-E7-B2J"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -66,11 +66,11 @@
                     </subviews>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="bottom" secondItem="b8q-89-oSh" secondAttribute="bottom" id="3cD-8n-2eD"/>
-                        <constraint firstItem="b8q-89-oSh" firstAttribute="top" secondItem="ppE-Yx-0QI" secondAttribute="top" id="8Oo-da-H3u"/>
-                        <constraint firstAttribute="width" constant="300" id="A08-6W-XJ9"/>
-                        <constraint firstItem="b8q-89-oSh" firstAttribute="leading" secondItem="ppE-Yx-0QI" secondAttribute="leading" id="EFd-q6-f3W"/>
-                        <constraint firstAttribute="height" constant="12" id="mO8-Zr-x5x"/>
+                        <constraint firstAttribute="width" constant="300" id="CqR-Gh-p9l"/>
+                        <constraint firstAttribute="height" constant="12" id="YaA-Um-8Nh"/>
+                        <constraint firstItem="1OP-rv-oYu" firstAttribute="leading" secondItem="5FN-Gd-tjU" secondAttribute="leading" id="kqM-2d-QSN"/>
+                        <constraint firstItem="1OP-rv-oYu" firstAttribute="top" secondItem="5FN-Gd-tjU" secondAttribute="top" id="lkc-Rn-U9k"/>
+                        <constraint firstAttribute="bottom" secondItem="1OP-rv-oYu" secondAttribute="bottom" id="ruV-0W-bwY"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -87,27 +87,28 @@
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
+                <constraint firstAttribute="bottom" secondItem="5FN-Gd-tjU" secondAttribute="bottom" constant="20" id="2eU-L3-gpy"/>
                 <constraint firstItem="ZV3-qJ-uxE" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="3r2-vl-mBg"/>
                 <constraint firstAttribute="trailing" secondItem="ZV3-qJ-uxE" secondAttribute="trailing" id="QY7-u1-n6M"/>
                 <constraint firstItem="Gn9-HQ-HPj" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" constant="-20" id="QuP-sd-KI7"/>
                 <constraint firstItem="1Vl-Vy-gg3" firstAttribute="centerY" secondItem="ncV-eS-8Yx" secondAttribute="centerY" id="TSR-47-coa"/>
-                <constraint firstItem="ppE-Yx-0QI" firstAttribute="top" secondItem="Bjn-zM-LJW" secondAttribute="bottom" constant="15" id="VVr-Rx-bmf"/>
+                <constraint firstItem="5FN-Gd-tjU" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="VyD-QO-Rb8"/>
                 <constraint firstItem="1Vl-Vy-gg3" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Z4M-rM-8kS"/>
                 <constraint firstItem="ZV3-qJ-uxE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="beT-6f-OTP"/>
                 <constraint firstAttribute="bottom" secondItem="ZV3-qJ-uxE" secondAttribute="bottom" id="hv4-uE-orY"/>
                 <constraint firstItem="ncV-eS-8Yx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="22" id="ioX-pe-BBS"/>
                 <constraint firstItem="Gn9-HQ-HPj" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="jNQ-KE-15G"/>
                 <constraint firstItem="ncV-eS-8Yx" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="17" id="lw2-0g-sel"/>
-                <constraint firstAttribute="bottom" secondItem="ppE-Yx-0QI" secondAttribute="bottom" constant="20" id="pZZ-RI-WNY"/>
                 <constraint firstItem="Bjn-zM-LJW" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="qjV-MX-C2L"/>
-                <constraint firstItem="ppE-Yx-0QI" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="zAA-jE-2jV"/>
+                <constraint firstItem="5FN-Gd-tjU" firstAttribute="top" secondItem="Bjn-zM-LJW" secondAttribute="bottom" constant="20" id="x3G-Gn-okq"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <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="ikU-UU-nkd" id="2eb-Ni-qnj"/>
+                <outlet property="loadWidth" destination="kYR-E7-B2J" id="3O0-7L-OzU"/>
             </connections>
             <point key="canvasLocation" x="338.40579710144931" y="-19.419642857142858"/>
         </view>

KulexiuForTeacher/KulexiuForTeacher/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;
     
 }

KulexiuForTeacher/KulexiuForTeacher/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>