Browse Source

富文本行高

Steven 3 days ago
parent
commit
7a962e3768

+ 31 - 31
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/DeleteAccount/View/DeleteAccountBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" 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="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,13 +21,13 @@
                             <rect key="frame" x="0.0" y="0.0" width="388" height="767"/>
                             <subviews>
                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TEx-cD-ZR6">
-                                    <rect key="frame" x="0.0" y="0.0" width="388" height="447.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="388" height="444"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1nG-sZ-TOw">
-                                            <rect key="frame" x="0.0" y="0.0" width="388" height="447.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="388" height="444"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="将***********所绑定的账号注销" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KTf-hd-DqL">
-                                                    <rect key="frame" x="66.5" y="98" width="255" height="25"/>
+                                                    <rect key="frame" x="69" y="98" width="250.5" height="25"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="25" id="shE-jI-SbL"/>
                                                     </constraints>
@@ -36,7 +36,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5vd-tZ-CWT">
-                                                    <rect key="frame" x="0.0" y="139" width="388" height="308.5"/>
+                                                    <rect key="frame" x="0.0" y="139" width="388" height="305"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c7e-F8-dgF">
                                                             <rect key="frame" x="20" y="0.0" width="348" height="37.5"/>
@@ -52,14 +52,14 @@
                                                             </attributedString>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6u6-Ma-2KR">
-                                                            <rect key="frame" x="34" y="79.5" width="334" height="44"/>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6u6-Ma-2KR">
+                                                            <rect key="frame" x="34" y="79.5" width="334" height="43.5"/>
                                                             <attributedString key="attributedText">
                                                                 <fragment content="1">
                                                                     <attributes>
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                                 <fragment content="、若已注册酷乐秀">
@@ -67,14 +67,14 @@
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
                                                                         <font key="NSOriginalFont" metaFont="system" size="14"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                                 <fragment content="/">
                                                                     <attributes>
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                                 <fragment content="酷乐秀学院,注销后将无法登录、使用酷乐秀">
@@ -82,14 +82,14 @@
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
                                                                         <font key="NSOriginalFont" metaFont="system" size="14"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                                 <fragment content="/">
                                                                     <attributes>
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                                 <fragment content="酷乐秀学院">
@@ -97,14 +97,14 @@
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
                                                                         <font key="NSOriginalFont" metaFont="system" size="14"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                                 <fragment content="APP">
                                                                     <attributes>
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                                 <fragment content="服务。">
@@ -112,40 +112,40 @@
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
                                                                         <font key="NSOriginalFont" metaFont="system" size="14"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                             </attributedString>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="plu-48-YfS">
-                                                            <rect key="frame" x="34" y="143.5" width="334" height="44"/>
+                                                            <rect key="frame" x="34" y="143" width="334" height="43.5"/>
                                                             <attributedString key="attributedText">
                                                                 <fragment content="2、账号下的所有内容、信息、数据、记录及绑定信息将被清空且无法找回。">
                                                                     <attributes>
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                             </attributedString>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="czQ-5I-E7e">
-                                                            <rect key="frame" x="34" y="207.5" width="334" height="44"/>
+                                                            <rect key="frame" x="34" y="206.5" width="334" height="43.5"/>
                                                             <attributedString key="attributedText">
                                                                 <fragment content="3、该账号权益信息将被清除(例如:会员时长、购买单曲、专辑信息)。">
                                                                     <attributes>
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                             </attributedString>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GBy-Z1-n96">
-                                                            <rect key="frame" x="20" y="87.5" width="6" height="6"/>
+                                                            <rect key="frame" x="20" y="86.5" width="6" height="6"/>
                                                             <color key="backgroundColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="6" id="cke-8U-65O"/>
@@ -158,7 +158,7 @@
                                                             </userDefinedRuntimeAttributes>
                                                         </view>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oHG-NB-zvk">
-                                                            <rect key="frame" x="20" y="151.5" width="6" height="6"/>
+                                                            <rect key="frame" x="20" y="150" width="6" height="6"/>
                                                             <color key="backgroundColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="6" id="dA2-vz-Te6"/>
@@ -171,7 +171,7 @@
                                                             </userDefinedRuntimeAttributes>
                                                         </view>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mjk-vg-mYk">
-                                                            <rect key="frame" x="20" y="215.5" width="6" height="6"/>
+                                                            <rect key="frame" x="20" y="213.5" width="6" height="6"/>
                                                             <color key="backgroundColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="6" id="AsH-zk-onh"/>
@@ -192,21 +192,21 @@
                                                             <color key="textColor" red="0.10588235294117647" green="0.72549019607843135" blue="0.60784313725490191" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gc6-aB-wKk">
-                                                            <rect key="frame" x="34" y="271.5" width="334" height="22"/>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gc6-aB-wKk">
+                                                            <rect key="frame" x="34" y="270" width="334" height="20"/>
                                                             <attributedString key="attributedText">
                                                                 <fragment content="4、相关用户协议和授权协议将终止。">
                                                                     <attributes>
                                                                         <color key="NSColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <font key="NSFont" size="14" name="PingFangSC-Semibold"/>
-                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" minimumLineHeight="22" maximumLineHeight="22" tighteningFactorForTruncation="0.0"/>
+                                                                        <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="4" tighteningFactorForTruncation="0.0"/>
                                                                     </attributes>
                                                                 </fragment>
                                                             </attributedString>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vfY-Jj-XbH">
-                                                            <rect key="frame" x="20" y="279.5" width="6" height="6"/>
+                                                            <rect key="frame" x="20" y="277" width="6" height="6"/>
                                                             <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="6" id="NwL-dp-ISK"/>
@@ -229,10 +229,10 @@
                                                         <constraint firstAttribute="trailing" secondItem="plu-48-YfS" secondAttribute="trailing" constant="20" id="GNq-jw-Z22"/>
                                                         <constraint firstItem="GBy-Z1-n96" firstAttribute="leading" secondItem="5vd-tZ-CWT" secondAttribute="leading" constant="20" id="KbT-VW-j6d"/>
                                                         <constraint firstItem="czQ-5I-E7e" firstAttribute="top" secondItem="plu-48-YfS" secondAttribute="bottom" constant="20" id="Ly9-3m-ZwX"/>
-                                                        <constraint firstItem="Gc6-aB-wKk" firstAttribute="top" secondItem="vfY-Jj-XbH" secondAttribute="top" constant="-8" id="Nmq-gJ-8Hb"/>
+                                                        <constraint firstItem="Gc6-aB-wKk" firstAttribute="top" secondItem="vfY-Jj-XbH" secondAttribute="top" constant="-7" id="Nmq-gJ-8Hb"/>
                                                         <constraint firstItem="6u6-Ma-2KR" firstAttribute="top" secondItem="1D8-dQ-4Em" secondAttribute="bottom" constant="10" id="P9Z-vx-vNA"/>
                                                         <constraint firstAttribute="trailing" secondItem="czQ-5I-E7e" secondAttribute="trailing" constant="20" id="RGt-dD-6zV"/>
-                                                        <constraint firstItem="oHG-NB-zvk" firstAttribute="top" secondItem="plu-48-YfS" secondAttribute="top" constant="8" id="Vit-1L-bCk"/>
+                                                        <constraint firstItem="oHG-NB-zvk" firstAttribute="top" secondItem="plu-48-YfS" secondAttribute="top" constant="7" id="Vit-1L-bCk"/>
                                                         <constraint firstItem="plu-48-YfS" firstAttribute="leading" secondItem="oHG-NB-zvk" secondAttribute="trailing" constant="8" id="WNJ-Eg-TYh"/>
                                                         <constraint firstItem="6u6-Ma-2KR" firstAttribute="leading" secondItem="GBy-Z1-n96" secondAttribute="trailing" constant="8" id="XfW-lU-uJB"/>
                                                         <constraint firstItem="oHG-NB-zvk" firstAttribute="leading" secondItem="5vd-tZ-CWT" secondAttribute="leading" constant="20" id="aee-FV-u0M"/>
@@ -241,8 +241,8 @@
                                                         <constraint firstItem="1D8-dQ-4Em" firstAttribute="leading" secondItem="5vd-tZ-CWT" secondAttribute="leading" constant="20" id="g7Z-bS-nt6"/>
                                                         <constraint firstItem="plu-48-YfS" firstAttribute="top" secondItem="6u6-Ma-2KR" secondAttribute="bottom" constant="20" id="hzW-RT-JQz"/>
                                                         <constraint firstAttribute="trailing" secondItem="1D8-dQ-4Em" secondAttribute="trailing" constant="20" id="jla-H3-bfX"/>
-                                                        <constraint firstItem="czQ-5I-E7e" firstAttribute="top" secondItem="mjk-vg-mYk" secondAttribute="top" constant="-8" id="k8V-jQ-GSL"/>
-                                                        <constraint firstItem="GBy-Z1-n96" firstAttribute="top" secondItem="6u6-Ma-2KR" secondAttribute="top" constant="8" id="pis-9p-XXq"/>
+                                                        <constraint firstItem="czQ-5I-E7e" firstAttribute="top" secondItem="mjk-vg-mYk" secondAttribute="top" constant="-7" id="k8V-jQ-GSL"/>
+                                                        <constraint firstItem="GBy-Z1-n96" firstAttribute="top" secondItem="6u6-Ma-2KR" secondAttribute="top" constant="7" id="pis-9p-XXq"/>
                                                         <constraint firstItem="c7e-F8-dgF" firstAttribute="leading" secondItem="5vd-tZ-CWT" secondAttribute="leading" constant="20" id="rBH-eL-pS0"/>
                                                         <constraint firstAttribute="bottom" secondItem="Gc6-aB-wKk" secondAttribute="bottom" constant="15" id="rEG-mF-t4o"/>
                                                         <constraint firstItem="vfY-Jj-XbH" firstAttribute="leading" secondItem="5vd-tZ-CWT" secondAttribute="leading" constant="20" id="tNp-hM-Sgy"/>

+ 20 - 15
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/DeleteAccount/View/KSDeleteFailedAlertView.m

@@ -7,7 +7,10 @@
 
 #import "KSDeleteFailedAlertView.h"
 
+#define DEL_LINE_HEIGHT (24)
+
 @interface KSDeleteFailedAlertView ()
+
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *tipsContainerHeight;
 
 @property (weak, nonatomic) IBOutlet UIView *tipsContainer;
@@ -60,7 +63,7 @@
                     make.top.mas_equalTo(self.layoutView.mas_bottom).offset(8);
                 }
                 make.left.right.mas_equalTo(self.tipsContainer);
-                make.height.mas_equalTo(24);
+                make.height.mas_equalTo(DEL_LINE_HEIGHT);
             }];
             self.layoutView = clientStuTitle;
             
@@ -79,19 +82,19 @@
             }
             NSString *newString = [NSString returnNoNullStringWithString:[array componentsJoinedByString:@"\n"]];
             NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-            paragraphStyle.maximumLineHeight = 24;
-            paragraphStyle.minimumLineHeight = 24;
-            NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:newString attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:14.0f],NSForegroundColorAttributeName:HexRGB(0x666666)}];
+            paragraphStyle.maximumLineHeight = DEL_LINE_HEIGHT;
+            paragraphStyle.minimumLineHeight = DEL_LINE_HEIGHT;
+            UIFont *font = [UIFont systemFontOfSize:14.0f];
+            CGFloat baseLineOffset = (DEL_LINE_HEIGHT - font.lineHeight) / 4;
+            NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:newString attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:font,NSForegroundColorAttributeName:HexRGB(0x666666), NSBaselineOffsetAttributeName:@(baseLineOffset)}];
             
             UILabel *errorTipsLabel = [[UILabel alloc] initWithFrame:CGRectZero];
             errorTipsLabel.numberOfLines = 0;
             [self.scrollView addSubview:errorTipsLabel];
             errorTipsLabel.attributedText = attr;
-            CGFloat height = [self getLabelHeight:newString];
             [errorTipsLabel mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.left.right.mas_equalTo(self.tipsContainer);
                 make.top.mas_equalTo(self.layoutView.mas_bottom);
-                make.height.mas_equalTo(height);
                 if (isLast) {
                     make.bottom.mas_equalTo(self.scrollView.mas_bottom);
                 }
@@ -112,7 +115,7 @@
                 else {
                     make.top.mas_equalTo(self.layoutView.mas_bottom).offset(8);
                 }
-                make.height.mas_equalTo(24);
+                make.height.mas_equalTo(DEL_LINE_HEIGHT);
             }];
             self.layoutView = clientTeaTitle;
             
@@ -131,20 +134,20 @@
             }
             NSString *newString = [NSString returnNoNullStringWithString:[array componentsJoinedByString:@"\n"]];
             NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-            paragraphStyle.maximumLineHeight = 24;
-            paragraphStyle.minimumLineHeight = 24;
-            NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:newString attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:14.0f],NSForegroundColorAttributeName:HexRGB(0x666666)}];
+            paragraphStyle.maximumLineHeight = DEL_LINE_HEIGHT;
+            paragraphStyle.minimumLineHeight = DEL_LINE_HEIGHT;
+            UIFont *font = [UIFont systemFontOfSize:14.0f];
+            CGFloat baseLineOffset = (DEL_LINE_HEIGHT - font.lineHeight) / 4;
+            NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] initWithString:newString attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:font,NSForegroundColorAttributeName:HexRGB(0x666666), NSBaselineOffsetAttributeName:@(baseLineOffset)}];
             
             UILabel *errorTipsLabel = [[UILabel alloc] initWithFrame:CGRectZero];
             errorTipsLabel.numberOfLines = 0;
             [self.scrollView addSubview:errorTipsLabel];
             errorTipsLabel.attributedText = attr;
-            CGFloat height = [self getLabelHeight:newString];
 
             [errorTipsLabel mas_makeConstraints:^(MASConstraintMaker *make) {
                 make.left.right.mas_equalTo(self.tipsContainer);
                 make.top.mas_equalTo(self.layoutView.mas_bottom);
-                make.height.mas_equalTo(height);
                 if (isLast) {
                     make.bottom.mas_equalTo(self.scrollView.mas_bottom);
                 }
@@ -157,9 +160,11 @@
 
 - (CGFloat)getLabelHeight:(NSString *)desc {
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-    paragraphStyle.maximumLineHeight = 24;
-    paragraphStyle.minimumLineHeight = 24;
-    return [desc boundingRectWithSize:CGSizeMake(265, CGFLOAT_MAX) options:(NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading) attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:14.0f],NSForegroundColorAttributeName:HexRGB(0x666666)} context:nil].size.height + 1;
+    paragraphStyle.maximumLineHeight = DEL_LINE_HEIGHT;
+    paragraphStyle.minimumLineHeight = DEL_LINE_HEIGHT;
+    UIFont *font = [UIFont systemFontOfSize:14.0f];
+    CGFloat baseLineOffset = (DEL_LINE_HEIGHT - font.lineHeight) / 4;
+    return [desc boundingRectWithSize:CGSizeMake(265, CGFLOAT_MAX) options:(NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading) attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:font,NSForegroundColorAttributeName:HexRGB(0x666666), NSBaselineOffsetAttributeName:@(baseLineOffset)} context:nil].size.height + 1;
 }
 
 - (void)layoutSubviews {

+ 4 - 4
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/Setting/DeleteAccount/View/KSDeleteFailedAlertView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,7 +18,7 @@
                     <rect key="frame" x="44" y="189" width="305" height="474"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="注销失败" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PVB-qM-x6a">
-                            <rect key="frame" x="115.66666666666666" y="20" width="73.666666666666657" height="25"/>
+                            <rect key="frame" x="116.66666666666666" y="20" width="71.666666666666657" height="25"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="25" id="5Ls-7e-acn"/>
                             </constraints>
@@ -26,7 +26,7 @@
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="该账户需处理以下事项后再进行注销:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8w7-2y-inS">
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="该账户需处理以下事项后再进行注销:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8w7-2y-inS">
                             <rect key="frame" x="20" y="65" width="265" height="24"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="24" id="YDH-Mj-MAN"/>