Steven 3 days ago
parent
commit
61d8fc6510

+ 14 - 4
KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeCell.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" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="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="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -34,7 +34,7 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="陈老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2c3-yX-YxS">
-                                <rect key="frame" x="70" y="14" width="207.5" height="22"/>
+                                <rect key="frame" x="70" y="14" width="48" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="dMw-tJ-YFP"/>
                                 </constraints>
@@ -105,10 +105,16 @@
                                 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="group_role_teacher" translatesAutoresizingMaskIntoConstraints="NO" id="lnx-3a-AYJ">
+                                <rect key="frame" x="122" y="15" width="41" height="20"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="20" id="LS9-D1-dIt"/>
+                                    <constraint firstAttribute="width" constant="41" id="u7D-DB-Zky"/>
+                                </constraints>
+                            </imageView>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstItem="Gv9-px-E4j" firstAttribute="leading" secondItem="2c3-yX-YxS" secondAttribute="trailing" constant="12" id="0d1-2V-f0c"/>
                             <constraint firstItem="vad-UL-yLE" firstAttribute="top" secondItem="2c3-yX-YxS" secondAttribute="bottom" constant="4" id="1f7-zg-Ca8"/>
                             <constraint firstItem="Gkn-L8-UCb" firstAttribute="leading" secondItem="Jdh-Fo-Wpn" secondAttribute="leading" constant="12" id="3ZI-Dn-gaU"/>
                             <constraint firstItem="vad-UL-yLE" firstAttribute="leading" secondItem="2c3-yX-YxS" secondAttribute="leading" id="42C-LT-gAz"/>
@@ -126,7 +132,10 @@
                             <constraint firstItem="FWq-QF-ONl" firstAttribute="leading" secondItem="Jdh-Fo-Wpn" secondAttribute="leading" constant="12" id="dK1-ff-rKg"/>
                             <constraint firstItem="47L-aP-812" firstAttribute="leading" secondItem="Jdh-Fo-Wpn" secondAttribute="leading" constant="12" id="eRE-Hj-7oe"/>
                             <constraint firstAttribute="bottom" secondItem="FWq-QF-ONl" secondAttribute="bottom" constant="16" id="gKg-yF-TE1"/>
+                            <constraint firstItem="lnx-3a-AYJ" firstAttribute="leading" secondItem="2c3-yX-YxS" secondAttribute="trailing" constant="4" id="iaH-6i-ylI"/>
                             <constraint firstItem="47L-aP-812" firstAttribute="top" secondItem="Gkn-L8-UCb" secondAttribute="bottom" constant="12" id="oji-Pv-sfT"/>
+                            <constraint firstItem="lnx-3a-AYJ" firstAttribute="centerY" secondItem="2c3-yX-YxS" secondAttribute="centerY" id="skA-JK-9je"/>
+                            <constraint firstItem="Gv9-px-E4j" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="lnx-3a-AYJ" secondAttribute="trailing" constant="10" id="tCt-TQ-XmP"/>
                             <constraint firstAttribute="trailing" secondItem="Gv9-px-E4j" secondAttribute="trailing" constant="3.5" id="upH-rK-Lrc"/>
                             <constraint firstItem="2c3-yX-YxS" firstAttribute="leading" secondItem="Gkn-L8-UCb" secondAttribute="trailing" constant="10" id="xyi-iI-XSB"/>
                         </constraints>
@@ -159,6 +168,7 @@
         </tableViewCell>
     </objects>
     <resources>
+        <image name="group_role_teacher" width="41" height="20"/>
         <image name="notice_action" width="24" height="25"/>
         <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">

+ 15 - 5
KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeDetailBodyView.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" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="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="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -31,7 +31,7 @@
                             </userDefinedRuntimeAttributes>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="70t-nX-m7j">
-                            <rect key="frame" x="69.999999999999986" y="14" width="243.66666666666663" height="22"/>
+                            <rect key="frame" x="70" y="14" width="0.0" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="22" id="Oto-pk-Eo6"/>
                             </constraints>
@@ -102,6 +102,13 @@
                             <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="group_role_teacher" translatesAutoresizingMaskIntoConstraints="NO" id="bp0-nx-k5c">
+                            <rect key="frame" x="74" y="15" width="41" height="20"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="20" id="1Pk-oJ-d68"/>
+                                <constraint firstAttribute="width" constant="41" id="C3j-Th-VaG"/>
+                            </constraints>
+                        </imageView>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
@@ -115,11 +122,13 @@
                         <constraint firstItem="RUn-oI-u4C" firstAttribute="top" secondItem="6Xh-iI-Zl8" secondAttribute="bottom" constant="5" id="QlV-bU-NDL"/>
                         <constraint firstItem="g5H-XJ-LiA" firstAttribute="centerY" secondItem="I5b-RG-0dE" secondAttribute="centerY" id="WAK-Jv-OBg"/>
                         <constraint firstItem="6Xh-iI-Zl8" firstAttribute="top" secondItem="NH8-Zj-ieK" secondAttribute="bottom" constant="12" id="Wfw-w5-jaS"/>
+                        <constraint firstItem="bp0-nx-k5c" firstAttribute="leading" secondItem="70t-nX-m7j" secondAttribute="trailing" constant="4" id="XXn-EU-tFZ"/>
                         <constraint firstAttribute="trailing" secondItem="RUn-oI-u4C" secondAttribute="trailing" constant="23" id="ZZY-7F-NSz"/>
                         <constraint firstAttribute="bottom" secondItem="RUn-oI-u4C" secondAttribute="bottom" constant="16" id="ewD-oI-JY8"/>
+                        <constraint firstItem="bp0-nx-k5c" firstAttribute="centerY" secondItem="70t-nX-m7j" secondAttribute="centerY" id="g0G-sg-gC5"/>
+                        <constraint firstItem="r31-Oy-hyD" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="bp0-nx-k5c" secondAttribute="trailing" constant="10" id="iHv-un-4kf"/>
                         <constraint firstItem="g5H-XJ-LiA" firstAttribute="leading" secondItem="I5b-RG-0dE" secondAttribute="trailing" constant="6" id="jIe-U3-gnt"/>
                         <constraint firstItem="70t-nX-m7j" firstAttribute="leading" secondItem="62c-65-fwx" secondAttribute="trailing" constant="10" id="lhs-RK-8UB"/>
-                        <constraint firstItem="r31-Oy-hyD" firstAttribute="leading" secondItem="70t-nX-m7j" secondAttribute="trailing" constant="10" id="lke-VY-HYi"/>
                         <constraint firstItem="NH8-Zj-ieK" firstAttribute="top" secondItem="62c-65-fwx" secondAttribute="bottom" constant="12" id="oEx-Li-k9L"/>
                         <constraint firstItem="62c-65-fwx" firstAttribute="leading" secondItem="U45-g3-TEP" secondAttribute="leading" constant="12" id="rCc-3u-NH1"/>
                         <constraint firstItem="6Xh-iI-Zl8" firstAttribute="leading" secondItem="U45-g3-TEP" secondAttribute="leading" constant="12" id="ro4-MV-ZGq"/>
@@ -153,10 +162,11 @@
                 <outlet property="userLogo" destination="62c-65-fwx" id="pNk-fp-hlD"/>
                 <outlet property="userName" destination="70t-nX-m7j" id="e4Z-yA-lxV"/>
             </connections>
-            <point key="canvasLocation" x="65" y="20"/>
+            <point key="canvasLocation" x="64.885496183206101" y="19.718309859154932"/>
         </view>
     </objects>
     <resources>
+        <image name="group_role_teacher" width="41" height="20"/>
         <image name="notice_action" width="24" height="25"/>
         <image name="teacher_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">