소스 검색

loading样式

Steven 4 달 전
부모
커밋
d802607431

+ 4 - 4
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -9467,7 +9467,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.7.7;
+				CURRENT_PROJECT_VERSION = 1.7.7.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -9643,7 +9643,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.7.7;
+				CURRENT_PROJECT_VERSION = 1.7.7.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -9947,7 +9947,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.7.7;
+				CURRENT_PROJECT_VERSION = 1.7.7.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;
@@ -10218,7 +10218,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = KulexiuForTeacher/KulexiuForTeacher.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.7.7;
+				CURRENT_PROJECT_VERSION = 1.7.7.2;
 				DEVELOPMENT_TEAM = B2AP53HHTU;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = YES;

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/LoadingManager/KSCustomLoadingView.m

@@ -86,7 +86,7 @@
 
 - (LOTAnimationView *)animationView {
     if (!_animationView) {
-        _animationView = [LOTAnimationView animationWithFilePath:[[NSBundle mainBundle] pathForResource:@"student_refresh" ofType:@"json"]];
+        _animationView = [LOTAnimationView animationWithFilePath:[[NSBundle mainBundle] pathForResource:@"teacher_refresh" ofType:@"json"]];
         _animationView.contentMode = UIViewContentModeScaleAspectFill;
         _animationView.animationSpeed = 1.0;
         _animationView.loopAnimation = YES;

+ 8 - 9
KulexiuForTeacher/KulexiuForTeacher/Common/LoadingManager/KSCustomLoadingView.xib

@@ -29,10 +29,10 @@
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2VA-sp-63Q">
-                                    <rect key="frame" x="4" y="10" width="91.666666666666671" height="55"/>
+                                    <rect key="frame" x="29.333333333333343" y="10" width="41" height="55"/>
                                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
-                                        <constraint firstAttribute="width" secondItem="2VA-sp-63Q" secondAttribute="height" multiplier="300:180" id="xAs-Tw-7GM"/>
+                                        <constraint firstAttribute="width" secondItem="2VA-sp-63Q" secondAttribute="height" multiplier="150:200" id="xAs-Tw-7GM"/>
                                         <constraint firstAttribute="height" constant="55" id="zdG-5h-LwF"/>
                                     </constraints>
                                 </view>
@@ -90,19 +90,18 @@
                     </constraints>
                 </view>
                 <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dsg-Cn-rR1">
-                    <rect key="frame" x="0.0" y="360" width="393" height="132"/>
+                    <rect key="frame" x="0.0" y="354.33333333333331" width="393" height="143.66666666666669"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LOq-Y5-Uzk">
-                            <rect key="frame" x="150.66666666666666" y="0.0" width="91.666666666666657" height="55"/>
+                            <rect key="frame" x="171.66666666666666" y="0.0" width="50" height="66.666666666666671"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
-                                <constraint firstAttribute="height" constant="55" id="1Hr-zN-QKa"/>
-                                <constraint firstAttribute="width" secondItem="LOq-Y5-Uzk" secondAttribute="height" multiplier="300:180" id="hfX-Sl-eLP"/>
-                                <constraint firstAttribute="width" secondItem="LOq-Y5-Uzk" secondAttribute="height" multiplier="300:180" id="rf9-bS-41k"/>
+                                <constraint firstAttribute="width" constant="50" id="KWD-HN-zmn"/>
+                                <constraint firstAttribute="width" secondItem="LOq-Y5-Uzk" secondAttribute="height" multiplier="150:200" id="hfX-Sl-eLP"/>
                             </constraints>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="资源加载中,请稍等…" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vYt-yp-qCj">
-                            <rect key="frame" x="118.00000000000001" y="60" width="157.33333333333337" height="22"/>
+                            <rect key="frame" x="118.00000000000001" y="71.666666666666686" width="157.33333333333337" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="22" id="KUu-gG-hXi"/>
                             </constraints>
@@ -111,7 +110,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <button hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aNT-C7-r99">
-                            <rect key="frame" x="154.66666666666666" y="100" width="84" height="32"/>
+                            <rect key="frame" x="154.66666666666666" y="111.66666666666669" width="84" height="32"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="32" id="Dhc-da-3Oc"/>
                                 <constraint firstAttribute="width" constant="84" id="qlY-o7-Vdb"/>

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Common/LoadingManager/KSProgressLoadingView.m

@@ -112,7 +112,7 @@
 
 - (LOTAnimationView *)animationView {
     if (!_animationView) {
-        _animationView = [LOTAnimationView animationWithFilePath:[[NSBundle mainBundle] pathForResource:@"student_refresh" ofType:@"json"]];
+        _animationView = [LOTAnimationView animationWithFilePath:[[NSBundle mainBundle] pathForResource:@"teacher_refresh" ofType:@"json"]];
         //2.加载后台给的json(url)
         _animationView.loopAnimation = YES;
         _animationView.contentMode = UIViewContentModeScaleAspectFill;

+ 6 - 6
KulexiuForTeacher/KulexiuForTeacher/Common/LoadingManager/KSProgressLoadingView.xib

@@ -14,18 +14,18 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ITq-85-NI6">
-                    <rect key="frame" x="211" y="112" width="273" height="121"/>
+                    <rect key="frame" x="211" y="114.66666666666666" width="273" height="115.66666666666666"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Be7-Wp-DtC">
-                            <rect key="frame" x="76.666666666666686" y="0.0" width="120" height="72"/>
+                            <rect key="frame" x="111.66666666666669" y="0.0" width="50" height="66.666666666666671"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="120" id="mFY-8f-YJG"/>
-                                <constraint firstAttribute="width" secondItem="Be7-Wp-DtC" secondAttribute="height" multiplier="10:6" id="v6l-z5-lt5"/>
+                                <constraint firstAttribute="width" constant="50" id="mFY-8f-YJG"/>
+                                <constraint firstAttribute="width" secondItem="Be7-Wp-DtC" secondAttribute="height" multiplier="150:200" id="v6l-z5-lt5"/>
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SUI-Ti-MzO">
-                            <rect key="frame" x="0.0" y="78" width="273" height="6"/>
+                            <rect key="frame" x="0.0" y="72.666666666666671" width="273" height="6"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dij-Zh-MfT">
                                     <rect key="frame" x="0.0" y="0.0" width="0.0" height="6"/>
@@ -49,7 +49,7 @@
                             </userDefinedRuntimeAttributes>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rev-2X-b5J">
-                            <rect key="frame" x="136.66666666666669" y="100" width="0.0" height="21"/>
+                            <rect key="frame" x="136.66666666666669" y="94.666666666666671" width="0.0" height="21"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="21" id="heZ-tG-3dI"/>
                             </constraints>