loading修改

KulexiuForStudent/KulexiuForStudent/Common/Base/LoadingManager/KSCustomLoadingView.xib

@@ -23,7 +23,7 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2VA-sp-63Q">
-                            <rect key="frame" x="4" y="5" width="91.666666666666671" height="55"/>
+                            <rect key="frame" x="4" y="10" width="91.666666666666671" 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="xhO-aA-iaE"/>
@@ -38,9 +38,9 @@
                         <constraint firstItem="jQZ-bq-s4l" firstAttribute="centerX" secondItem="Ftd-2r-orp" secondAttribute="centerX" id="BZp-te-gfI"/>
                         <constraint firstAttribute="width" constant="100" id="E8b-Gp-LDR"/>
                         <constraint firstAttribute="trailing" secondItem="jQZ-bq-s4l" secondAttribute="trailing" constant="2" id="IVO-qd-gEr"/>
-                        <constraint firstItem="2VA-sp-63Q" firstAttribute="top" secondItem="Ftd-2r-orp" secondAttribute="top" constant="5" id="aS3-r0-aMu"/>
+                        <constraint firstItem="2VA-sp-63Q" firstAttribute="top" secondItem="Ftd-2r-orp" secondAttribute="top" constant="10" id="aS3-r0-aMu"/>
                         <constraint firstItem="jQZ-bq-s4l" firstAttribute="leading" secondItem="Ftd-2r-orp" secondAttribute="leading" constant="2" id="gOh-qz-IKL"/>
-                        <constraint firstItem="jQZ-bq-s4l" firstAttribute="top" secondItem="2VA-sp-63Q" secondAttribute="bottom" constant="10" id="lLr-cs-u9n"/>
+                        <constraint firstItem="jQZ-bq-s4l" firstAttribute="top" secondItem="2VA-sp-63Q" secondAttribute="bottom" constant="5" id="lLr-cs-u9n"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -56,7 +56,7 @@
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="13"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <state key="normal" title="取消上传"/>
+                    <state key="normal" title="取消"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
                             <color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

KulexiuForStudent/KulexiuForStudent/Common/MediaMerge/AudioMerge/KSMediaMergeView.m

@@ -212,7 +212,7 @@
 }
 
 - (void)prepareSource {
-    [LOADING_MANAGER showCancelCustomLoading:@"资源加载中，请稍等…" cancel:^{
+    [LOADING_MANAGER showCancelCustomLoading:@"资源加载中" cancel:^{
         [self cancelTask];
     }];
 
@@ -309,7 +309,7 @@
 
 
 - (void)downloadFileSource {
-    [LOADING_MANAGER showCancelCustomLoading:@"资源加载中，请稍等…" cancel:^{
+    [LOADING_MANAGER showCancelCustomLoading:@"资源加载中" cancel:^{
         [self cancelTask];
     }];