1.加载按钮

2.loadng样式

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

@@ -30,20 +30,10 @@
                     <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="back_button_white" translatesAutoresizingMaskIntoConstraints="NO" id="ncV-eS-8Yx">
-                    <rect key="frame" x="22" y="17" width="12" height="20"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="20" id="Qhr-as-jBz"/>
-                        <constraint firstAttribute="width" constant="12" id="UtD-bn-wHw"/>
-                    </constraints>
-                </imageView>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1Vl-Vy-gg3">
-                    <rect key="frame" x="0.0" y="5" width="44" height="44"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="44" id="fWC-V7-9dR"/>
-                        <constraint firstAttribute="height" constant="44" id="ffu-19-wOl"/>
-                    </constraints>
+                    <rect key="frame" x="25" y="20" width="32" height="32"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                    <state key="normal" image="delayCheck_back"/>
                     <connections>
                         <action selector="cancleAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="dvV-tf-Ggg"/>
                     </connections>
@@ -88,17 +78,15 @@
             <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="1Vl-Vy-gg3" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="25" id="3Fl-om-V43"/>
                 <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="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 firstItem="1Vl-Vy-gg3" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="btD-zK-yYN"/>
                 <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 firstItem="Bjn-zM-LJW" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="qjV-MX-C2L"/>
                 <constraint firstItem="5FN-Gd-tjU" firstAttribute="top" secondItem="Bjn-zM-LJW" secondAttribute="bottom" constant="20" id="x3G-Gn-okq"/>
             </constraints>
@@ -114,7 +102,7 @@
         </view>
     </objects>
     <resources>
-        <image name="back_button_white" width="12" height="20"/>
         <image name="cloudLoading_bg" width="812" height="375"/>
+        <image name="delayCheck_back" width="32" height="32"/>
     </resources>
 </document>

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

@@ -56,7 +56,7 @@
                     </constraints>
                 </view>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pcl-5K-Deb">
-                    <rect key="frame" x="30" y="20" width="38" height="38"/>
+                    <rect key="frame" x="30" y="20" width="32" height="32"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                     <state key="normal" image="delayCheck_back"/>
                     <connections>
@@ -243,7 +243,7 @@
     <resources>
         <image name="check_failedTips" width="340" height="98"/>
         <image name="check_tips_icon" width="18" height="18"/>
-        <image name="delayCheck_back" width="38" height="38"/>
+        <image name="delayCheck_back" width="32" height="32"/>
         <image name="delayCheck_bg" width="812" height="375"/>
         <image name="delayCheck_ship_prepare" width="298" height="254"/>
         <systemColor name="systemBackgroundColor">

KulexiuForStudent/KulexiuForStudent/Common/Base/LoadingManager/KSCustomLoadingView.h

@@ -13,12 +13,16 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface KSCustomLoadingView : UIView
 
+@property (nonatomic, assign) BOOL hideBgView;
+
 @property (nonatomic, assign) BOOL showCancelButton;
 
 + (instancetype)shareInstance;
 
 @property (nonatomic, strong) NSString *displayText;
 
+@property (nonatomic, strong) NSString *buttonText;
+
 - (void)showLoadingView;
 
 - (void)hideLoadingView;

KulexiuForStudent/KulexiuForStudent/Common/Base/LoadingManager/KSCustomLoadingView.m

@@ -9,13 +9,25 @@
 #import <Lottie/Lottie.h>
 
 @interface KSCustomLoadingView ()
-
+// 带背景的loading
+@property (weak, nonatomic) IBOutlet UIView *bgLoadingView;
+@property (weak, nonatomic) IBOutlet UIView *bgColorView;
 @property (weak, nonatomic) IBOutlet UIButton *cancelButton;
-
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *cancelButtonHeight;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *cancelButtonTop;
 @property (weak, nonatomic) IBOutlet UIView *containerView;
-
 @property (weak, nonatomic) IBOutlet UILabel *text;
 
+
+// 不带背景的loading
+@property (weak, nonatomic) IBOutlet UIView *clearBgView;
+@property (weak, nonatomic) IBOutlet UIView *clearAnimationContainerView;
+@property (weak, nonatomic) IBOutlet UILabel *clearTextLabel;
+@property (weak, nonatomic) IBOutlet UIButton *clearCancelButton;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *clearButtonHeight;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *clearButtonTop;
+
+
 @property (nonatomic, strong) LOTAnimationView *animationView;
 
 @property (nonatomic, copy) KSCustomLoadingCancel cancelBlock;
@@ -23,9 +35,6 @@
 @end
 
 @implementation KSCustomLoadingView
-- (void)awakeFromNib {
-    [super awakeFromNib];
-}
 
 + (instancetype)shareInstance {
     KSCustomLoadingView *view = [[[NSBundle mainBundle] loadNibNamed:@"KSCustomLoadingView" owner:nil options:nil] firstObject];
@@ -38,11 +47,21 @@
     [self mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.bottom.mas_equalTo(windows);
     }];
-    [self.containerView addSubview:self.animationView];
-    [self.animationView mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.top.bottom.mas_equalTo(self.containerView);
-    }];
-    [self.animationView play];
+    if (self.hideBgView) {
+        [self.clearAnimationContainerView addSubview:self.animationView];
+        [self.animationView mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.top.bottom.mas_equalTo(self.clearAnimationContainerView);
+        }];
+        [self.animationView play];
+    }
+    else {
+        [self.containerView addSubview:self.animationView];
+        [self.animationView mas_remakeConstraints:^(MASConstraintMaker *make) {
+            make.left.right.top.bottom.mas_equalTo(self.containerView);
+        }];
+        [self.animationView play];
+    }
+    
 }
 
 - (void)hideLoadingView {
@@ -75,23 +94,71 @@
     return _animationView;
 }
 
+
 - (void)setDisplayText:(NSString *)displayText {
     _displayText = displayText;
-    self.text.text = displayText;
+    if (self.hideBgView) {
+        self.clearTextLabel.text = displayText;
+    }
+    else {
+        self.text.text = displayText;
+    }
+}
+
+- (void)setButtonText:(NSString *)buttonText {
+    _buttonText = buttonText;
+    if (self.hideBgView) {
+        [self.clearCancelButton setTitle:buttonText forState:UIControlStateNormal];
+    }
+    else {
+        [self.cancelButton setTitle:buttonText forState:UIControlStateNormal];
+    }
 }
 
 - (void)setShowCancelButton:(BOOL)showCancelButton {
     _showCancelButton = showCancelButton;
     if (showCancelButton) {
-        self.cancelButton.hidden = NO;
-        self.cancelButton.userInteractionEnabled = YES;
+        if (self.hideBgView) {
+            self.clearCancelButton.hidden = NO;
+            self.clearCancelButton.userInteractionEnabled = YES;
+            self.clearButtonHeight.constant = 32.0f;
+            self.clearButtonTop.constant = 18.0f;
+        }
+        else {
+            self.cancelButton.hidden = NO;
+            self.cancelButton.userInteractionEnabled = YES;
+            self.cancelButtonHeight.constant = 30.0f;
+            self.cancelButtonTop.constant = 18.0f;
+        }
     }
     else {
-        self.cancelButton.hidden = YES;
-        self.cancelButton.userInteractionEnabled = NO;
+        if (self.hideBgView) {
+            self.clearCancelButton.hidden = YES;
+            self.clearCancelButton.userInteractionEnabled = NO;
+            self.clearButtonHeight.constant = 0.0f;
+            self.clearButtonTop.constant = 0.0f;
+        }
+        else {
+            self.cancelButton.hidden = YES;
+            self.cancelButton.userInteractionEnabled = NO;
+            self.cancelButtonHeight.constant = 0.0f;
+            self.cancelButtonTop.constant = 0.0f;
+        }
+        
     }
 }
 
+- (void)setHideBgView:(BOOL)hideBgView {
+    _hideBgView = hideBgView;
+    if (hideBgView) {
+        self.bgLoadingView.hidden = YES;
+        self.clearBgView.hidden = NO;
+    }
+    else {
+        self.bgLoadingView.hidden = NO;
+        self.clearBgView.hidden = YES;
+    }
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

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

@@ -13,80 +13,165 @@
             <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ftd-2r-orp">
-                    <rect key="frame" x="146.66666666666666" y="376" width="100" height="100"/>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cWK-kg-kuh">
+                    <rect key="frame" x="146.66666666666666" y="352" width="100" height="148"/>
                     <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上传中..." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jQZ-bq-s4l">
-                            <rect key="frame" x="2" y="70" width="96" height="14.333333333333329"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                            <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"/>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ftd-2r-orp">
+                            <rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上传中..." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jQZ-bq-s4l">
+                                    <rect key="frame" x="2" y="70" width="96" height="16"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="16" id="NZb-kw-xhg"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                    <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"/>
+                                    <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="height" constant="55" id="zdG-5h-LwF"/>
+                                    </constraints>
+                                </view>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
-                                <constraint firstAttribute="width" secondItem="2VA-sp-63Q" secondAttribute="height" multiplier="300:180" id="xhO-aA-iaE"/>
-                                <constraint firstAttribute="height" constant="55" id="zdG-5h-LwF"/>
+                                <constraint firstItem="2VA-sp-63Q" firstAttribute="centerX" secondItem="Ftd-2r-orp" secondAttribute="centerX" id="2dh-Xz-2yj"/>
+                                <constraint firstAttribute="height" constant="100" id="7LV-ix-8dR"/>
+                                <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="YpK-FP-G3Q"/>
+                                <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="top" secondItem="2VA-sp-63Q" secondAttribute="bottom" constant="5" id="lLr-cs-u9n"/>
+                                <constraint firstItem="jQZ-bq-s4l" firstAttribute="leading" secondItem="Ftd-2r-orp" secondAttribute="leading" constant="2" id="w6a-hx-sAr"/>
                             </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="10"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
                         </view>
+                        <button hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="04h-R9-rTU">
+                            <rect key="frame" x="8" y="118" width="84" height="30"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="84" id="ajy-Xd-BOZ"/>
+                                <constraint firstAttribute="height" constant="30" id="czm-RI-pPn"/>
+                            </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="取消"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="15"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="cancelAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="AGB-OH-MCM"/>
+                            </connections>
+                        </button>
                     </subviews>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstItem="2VA-sp-63Q" firstAttribute="centerX" secondItem="Ftd-2r-orp" secondAttribute="centerX" id="2dh-Xz-2yj"/>
-                        <constraint firstAttribute="height" constant="100" id="7LV-ix-8dR"/>
-                        <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="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="5" id="lLr-cs-u9n"/>
+                        <constraint firstAttribute="bottom" secondItem="04h-R9-rTU" secondAttribute="bottom" id="Fi2-hQ-V5q"/>
+                        <constraint firstItem="Ftd-2r-orp" firstAttribute="top" secondItem="cWK-kg-kuh" secondAttribute="top" id="Old-g6-TNn"/>
+                        <constraint firstAttribute="trailing" secondItem="Ftd-2r-orp" secondAttribute="trailing" id="VAB-pf-Hkc"/>
+                        <constraint firstItem="Ftd-2r-orp" firstAttribute="leading" secondItem="cWK-kg-kuh" secondAttribute="leading" id="VNL-hz-sKf"/>
+                        <constraint firstItem="04h-R9-rTU" firstAttribute="top" secondItem="Ftd-2r-orp" secondAttribute="bottom" constant="18" id="lF4-cx-r0q"/>
+                        <constraint firstItem="04h-R9-rTU" firstAttribute="centerX" secondItem="cWK-kg-kuh" secondAttribute="centerX" id="pEf-Bd-0gX"/>
                     </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="10"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
                 </view>
-                <button hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aE0-9f-0lL">
-                    <rect key="frame" x="154.66666666666666" y="492" width="84" height="30"/>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dsg-Cn-rR1">
+                    <rect key="frame" x="0.0" y="361" width="393" height="130"/>
+                    <subviews>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LOq-Y5-Uzk">
+                            <rect key="frame" x="150.66666666666666" y="0.0" width="91.666666666666657" height="55"/>
+                            <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"/>
+                            </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"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="22" id="KUu-gG-hXi"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
+                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <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="30"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="30" id="Dhc-da-3Oc"/>
+                                <constraint firstAttribute="width" constant="84" id="qlY-o7-Vdb"/>
+                            </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="取消"/>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="15"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                            <connections>
+                                <action selector="cancelAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="HpS-Gc-xq0"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="30" id="J5I-g3-IsJ"/>
-                        <constraint firstAttribute="width" constant="84" id="xCn-Eg-EvM"/>
+                        <constraint firstItem="aNT-C7-r99" firstAttribute="top" secondItem="vYt-yp-qCj" secondAttribute="bottom" constant="18" id="24z-r6-adW"/>
+                        <constraint firstItem="LOq-Y5-Uzk" firstAttribute="centerX" secondItem="Dsg-Cn-rR1" secondAttribute="centerX" id="4zr-bg-Jot"/>
+                        <constraint firstItem="vYt-yp-qCj" firstAttribute="centerX" secondItem="Dsg-Cn-rR1" secondAttribute="centerX" id="DZz-Rn-NHN"/>
+                        <constraint firstAttribute="bottom" secondItem="aNT-C7-r99" secondAttribute="bottom" id="IEK-Ux-USq"/>
+                        <constraint firstItem="LOq-Y5-Uzk" firstAttribute="top" secondItem="Dsg-Cn-rR1" secondAttribute="top" id="fzd-pP-UIu"/>
+                        <constraint firstItem="vYt-yp-qCj" firstAttribute="top" secondItem="LOq-Y5-Uzk" secondAttribute="bottom" constant="5" id="klk-G6-SoX"/>
+                        <constraint firstItem="aNT-C7-r99" firstAttribute="centerX" secondItem="Dsg-Cn-rR1" secondAttribute="centerX" id="oSf-1B-DXw"/>
                     </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="取消"/>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                            <color key="value" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
-                            <real key="value" value="1"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="15"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
-                    <connections>
-                        <action selector="cancelAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="Hev-5e-L6Y"/>
-                    </connections>
-                </button>
+                </view>
             </subviews>
             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
             <constraints>
-                <constraint firstItem="aE0-9f-0lL" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="L6x-yj-zuC"/>
-                <constraint firstItem="aE0-9f-0lL" firstAttribute="top" secondItem="Ftd-2r-orp" secondAttribute="bottom" constant="16" id="RcN-QA-1bo"/>
-                <constraint firstItem="Ftd-2r-orp" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="TgS-11-bcY"/>
-                <constraint firstItem="Ftd-2r-orp" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="al5-ls-aaQ"/>
+                <constraint firstItem="cWK-kg-kuh" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="1I9-VN-Psf"/>
+                <constraint firstItem="Dsg-Cn-rR1" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="2NB-Gv-kfF"/>
+                <constraint firstItem="Dsg-Cn-rR1" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="6tE-6F-uG1"/>
+                <constraint firstAttribute="trailing" secondItem="Dsg-Cn-rR1" secondAttribute="trailing" id="C1V-Pk-QT7"/>
+                <constraint firstItem="cWK-kg-kuh" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="RAg-AN-3x5"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
-                <outlet property="cancelButton" destination="aE0-9f-0lL" id="R7k-C5-J5c"/>
-                <outlet property="containerView" destination="2VA-sp-63Q" id="NBh-da-mnS"/>
-                <outlet property="text" destination="jQZ-bq-s4l" id="Dnm-NR-TwV"/>
+                <outlet property="bgColorView" destination="Ftd-2r-orp" id="TYZ-xm-CWh"/>
+                <outlet property="bgLoadingView" destination="cWK-kg-kuh" id="mUs-BZ-Zz9"/>
+                <outlet property="cancelButton" destination="04h-R9-rTU" id="Wgi-ab-rgT"/>
+                <outlet property="cancelButtonHeight" destination="czm-RI-pPn" id="KKN-BJ-vmG"/>
+                <outlet property="cancelButtonTop" destination="lF4-cx-r0q" id="ld8-VH-4l5"/>
+                <outlet property="clearAnimationContainerView" destination="LOq-Y5-Uzk" id="yjL-FP-WKK"/>
+                <outlet property="clearBgView" destination="Dsg-Cn-rR1" id="D6x-xE-zjX"/>
+                <outlet property="clearButtonHeight" destination="Dhc-da-3Oc" id="9R9-Ph-4Wo"/>
+                <outlet property="clearButtonTop" destination="24z-r6-adW" id="BbZ-6t-SB6"/>
+                <outlet property="clearCancelButton" destination="aNT-C7-r99" id="Hdc-Gs-CES"/>
+                <outlet property="clearTextLabel" destination="vYt-yp-qCj" id="KiF-9R-Smu"/>
+                <outlet property="containerView" destination="2VA-sp-63Q" id="O7y-CP-erl"/>
+                <outlet property="text" destination="jQZ-bq-s4l" id="LCZ-3C-atY"/>
             </connections>
             <point key="canvasLocation" x="100" y="-12.67605633802817"/>
         </view>

KulexiuForStudent/KulexiuForStudent/Common/Base/LoadingManager/KSHudLoagingManager.h

@@ -30,6 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)showCancelCustomLoading:(NSString *)text cancel:(KSLoadingCancel)cancel;
 
+- (void)showCancelCustomLoading:(NSString *)text hideBgColor:(BOOL)hideBgColorView cancel:(KSLoadingCancel)cancel;
+
 - (void)removeCustomLoading;
 
 - (void)showHUD;

KulexiuForStudent/KulexiuForStudent/Common/Base/LoadingManager/KSHudLoagingManager.m

@@ -12,6 +12,7 @@
 
 @interface KSHudLoagingManager ()
 
+
 @end
 
 @implementation KSHudLoagingManager
@@ -26,8 +27,15 @@
     return manager;
 }
 
+- (void)clearLoadingView {
+    [self removeLoadingView];
+    [self removeCustomLoading];
+}
+
 - (void)showCustomLoading:(NSString *)text {
     dispatch_main_async_safe(^{
+        [self removeLoadingView];
+        self.loadingView.hideBgView = NO;
         self.loadingView.showCancelButton = NO;
         self.loadingView.displayText = text;
         [self.loadingView showLoadingView];
@@ -36,6 +44,23 @@
 
 - (void)showCancelCustomLoading:(NSString *)text cancel:(KSLoadingCancel)cancel {
     dispatch_main_async_safe(^{
+        [self clearLoadingView];
+        self.loadingView.hideBgView = NO;
+        self.loadingView.showCancelButton = YES;
+        self.loadingView.displayText = text;
+        [self.loadingView showLoadingView];
+        [self.loadingView cancelActionCallback:^{
+            if (cancel) {
+                cancel();
+            }
+        }];
+    });
+}
+
+- (void)showCancelCustomLoading:(NSString *)text hideBgColor:(BOOL)hideBgColorView cancel:(KSLoadingCancel)cancel {
+    dispatch_main_async_safe(^{
+        [self clearLoadingView];
+        self.loadingView.hideBgView = hideBgColorView;
         self.loadingView.showCancelButton = YES;
         self.loadingView.displayText = text;
         [self.loadingView showLoadingView];
@@ -47,6 +72,7 @@
     });
 }
 
+
 - (void)removeCustomLoading {
     dispatch_main_async_safe(^{
         if (self->_loadingView) {
@@ -59,7 +85,7 @@
 
 - (void)showHUD {
     dispatch_main_async_safe(^{
-        [self removeLoadingView];
+        [self clearLoadingView];
         UIWindow *window = [NSObject getKeyWindow];
         self.HUD = [window addHUDActivityViewToView:nil
                                                        HintsText:@"加载中..."
@@ -98,7 +124,7 @@
 
 - (void)showHud:(NSString *)str inView:(UIView *)displayView autoHide:(BOOL)autoHide {
     dispatch_main_async_safe(^{
-        [self removeLoadingView];
+        [self clearLoadingView];
         self.HUD = [MBProgressHUD showHUDAddedTo:displayView animated:YES];
         self.HUD.removeFromSuperViewOnHide =YES;
         self.HUD.mode = MBProgressHUDModeText;
@@ -133,7 +159,7 @@
 
 
 - (MBProgressHUD *)MBPShowLoadingHubWithText:(NSString *)text {
-    [self removeLoadingView];
+    [self clearLoadingView];
     self.HUD = [MBProgressHUD showHUDAddedTo:[NSObject getKeyWindow] animated:YES];
     self.HUD.mode = MBProgressHUDModeDeterminateHorizontalBar;
     self.HUD.label.attributedText = [self getAttrStringWithText:text];
@@ -151,7 +177,7 @@
 }
 
 - (void)KSShowMsg:(NSString *)message inView:(UIView *)displayView promptCompletion:(void (^)(void))promptCompletion {
-    [self removeLoadingView];
+    [self clearLoadingView];
     MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:displayView animated:YES];
     hud.removeFromSuperViewOnHide = YES;
     hud.mode = MBProgressHUDModeText;
@@ -228,7 +254,6 @@
 
 - (void)removeProgressLoadingNoDelay {
     [self.progressLoading hideLoadingView];
-
 }
 
 // 进度loading后续操作
@@ -239,7 +264,6 @@
         [self removeProgressLoadingNoDelay];
         promptCompletion();
     });
-
 }
 
 - (NSMutableAttributedString *)getAttrStringWithText:(NSString *)text {

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

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

KulexiuForStudent/KulexiuForStudent/Module/Mine/Works/Controller/KSVideoCropViewController.m

@@ -82,10 +82,10 @@
 }
 
 - (void)downloadUrl {
-    [LOADING_MANAGER showCustomLoading:@"视频下载中..."];
+    [LOADING_MANAGER showCustomLoading:@"下载中..."];
     [KSNetworkingManager downloadFileRequestWithFileUrl:self.remoteUrl progress:^(int64_t bytesRead, int64_t totalBytes) {
         NSInteger progress = (NSInteger)(bytesRead*1.0 / totalBytes) * 100;
-        NSString *tipsString = [NSString stringWithFormat:@"文件下载中\n%zd%%",progress];
+        NSString *tipsString = [NSString stringWithFormat:@"下载中 %zd%%",progress];
         dispatch_main_async_safe(^{
             [LOADING_MANAGER showCustomLoading:tipsString];
         });