Steven 1 year ago
parent
commit
a55e66dde0

+ 2 - 2
KulexiuForStudent/KulexiuForStudent/Common/MediaMerge/AudioMerge/KSNewAlertView.m

@@ -34,8 +34,8 @@
     tapGesture.delegate = self;
     tapGesture.delegate = self;
     [self addGestureRecognizer:tapGesture];
     [self addGestureRecognizer:tapGesture];
     
     
-    [self.leftButton setTitleColor:CLIENT_THEMECOLOR forState:UIControlStateNormal];
-    self.leftButton.layer.borderColor = CLIENT_THEMECOLOR.CGColor;
+//    [self.leftButton setTitleColor:CLIENT_THEMECOLOR forState:UIControlStateNormal];
+//    self.leftButton.layer.borderColor = CLIENT_THEMECOLOR.CGColor;
     [self.rightButton setBackgroundColor:CLIENT_THEMECOLOR];
     [self.rightButton setBackgroundColor:CLIENT_THEMECOLOR];
 }
 }
 
 

+ 7 - 6
KulexiuForStudent/KulexiuForStudent/Common/MediaMerge/AudioMerge/KSNewAlertView.xib

@@ -15,10 +15,10 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oyS-1q-O1d">
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oyS-1q-O1d">
-                    <rect key="frame" x="39" y="341.33333333333331" width="315" height="169.33333333333331"/>
+                    <rect key="frame" x="44" y="341.33333333333331" width="305" height="169.33333333333331"/>
                     <subviews>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认删除吗?" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Slo-qy-OZT">
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认删除吗?" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Slo-qy-OZT">
-                            <rect key="frame" x="107" y="20" width="101.33333333333331" height="25"/>
+                            <rect key="frame" x="102" y="20" width="101.33333333333331" height="25"/>
                             <constraints>
                             <constraints>
                                 <constraint firstAttribute="height" constant="25" id="va5-wn-xrw"/>
                                 <constraint firstAttribute="height" constant="25" id="va5-wn-xrw"/>
                             </constraints>
                             </constraints>
@@ -27,13 +27,14 @@
                             <nil key="highlightedColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         </label>
                         <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="pLi-4S-pqd">
                         <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="pLi-4S-pqd">
-                            <rect key="frame" x="20" y="65" width="275" height="19.333333333333329"/>
+                            <rect key="frame" x="20" y="65" width="265" height="19.333333333333329"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                             <nil key="highlightedColor"/>
                         </label>
                         </label>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tNV-Mp-5Ya">
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tNV-Mp-5Ya">
-                            <rect key="frame" x="15" y="109.33333333333337" width="135" height="40"/>
+                            <rect key="frame" x="15" y="109.33333333333337" width="130" height="40"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <state key="normal" title="取消">
                             <state key="normal" title="取消">
                                 <color key="titleColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <color key="titleColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -54,7 +55,7 @@
                             </connections>
                             </connections>
                         </button>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hO7-EM-ujs">
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hO7-EM-ujs">
-                            <rect key="frame" x="165" y="109.33333333333337" width="135" height="40"/>
+                            <rect key="frame" x="160" y="109.33333333333337" width="130" height="40"/>
                             <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                             <constraints>
                             <constraints>
                                 <constraint firstAttribute="height" constant="40" id="bbj-dv-61F"/>
                                 <constraint firstAttribute="height" constant="40" id="bbj-dv-61F"/>
@@ -90,7 +91,7 @@
                         <constraint firstItem="tNV-Mp-5Ya" firstAttribute="width" secondItem="hO7-EM-ujs" secondAttribute="width" id="dvY-Af-9Z7"/>
                         <constraint firstItem="tNV-Mp-5Ya" firstAttribute="width" secondItem="hO7-EM-ujs" secondAttribute="width" id="dvY-Af-9Z7"/>
                         <constraint firstAttribute="trailing" secondItem="hO7-EM-ujs" secondAttribute="trailing" constant="15" id="fbo-wZ-TGI"/>
                         <constraint firstAttribute="trailing" secondItem="hO7-EM-ujs" secondAttribute="trailing" constant="15" id="fbo-wZ-TGI"/>
                         <constraint firstItem="tNV-Mp-5Ya" firstAttribute="height" secondItem="hO7-EM-ujs" secondAttribute="height" id="g7z-dP-tRB"/>
                         <constraint firstItem="tNV-Mp-5Ya" firstAttribute="height" secondItem="hO7-EM-ujs" secondAttribute="height" id="g7z-dP-tRB"/>
-                        <constraint firstAttribute="width" constant="315" id="jbM-ff-SUC"/>
+                        <constraint firstAttribute="width" constant="305" id="jbM-ff-SUC"/>
                         <constraint firstItem="tNV-Mp-5Ya" firstAttribute="bottom" secondItem="hO7-EM-ujs" secondAttribute="bottom" id="lM4-4z-Sk1"/>
                         <constraint firstItem="tNV-Mp-5Ya" firstAttribute="bottom" secondItem="hO7-EM-ujs" secondAttribute="bottom" id="lM4-4z-Sk1"/>
                         <constraint firstItem="pLi-4S-pqd" firstAttribute="leading" secondItem="oyS-1q-O1d" secondAttribute="leading" constant="20" id="lRE-nF-14p"/>
                         <constraint firstItem="pLi-4S-pqd" firstAttribute="leading" secondItem="oyS-1q-O1d" secondAttribute="leading" constant="20" id="lRE-nF-14p"/>
                         <constraint firstItem="tNV-Mp-5Ya" firstAttribute="leading" secondItem="oyS-1q-O1d" secondAttribute="leading" constant="15" id="oRp-k5-3AZ"/>
                         <constraint firstItem="tNV-Mp-5Ya" firstAttribute="leading" secondItem="oyS-1q-O1d" secondAttribute="leading" constant="15" id="oRp-k5-3AZ"/>