群公告位置

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/KSChatConversationViewController.m

@@ -70,7 +70,7 @@
             BOOL isDelUser = [userDic ks_boolValueForKey:@"delFlag"];
             if (isDelUser) {
                 MJWeakSelf;
-                self.alertView = [KSPublicAlertView shareInstanceWithTitle:@"提示" descMessage:@"该用户已注销,是否删除会话?" leftTitle:@"否" rightTitle:@"是" cancelAction:^{
+                self.alertView = [KSPublicAlertView shareInstanceWithTitle:@"提示" descMessage:@"该用户已注销,是否删除会话?" leftTitle:@"取消" rightTitle:@"确认" cancelAction:^{
 
                 } sureAction:^{
                     [weakSelf removeCurrentConversation];

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Group/View/GroupSettingBodyView.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>
@@ -11,7 +11,7 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="GroupSettingBodyView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="802"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="989"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AOx-4a-71e">
@@ -73,7 +73,7 @@
                             <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="v6l-tz-OXe">
-                            <rect key="frame" x="287" y="14" width="100" height="20"/>
+                            <rect key="frame" x="289.5" y="14" width="97.5" height="20"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="20" id="0re-nB-uf4"/>
                             </constraints>
@@ -117,7 +117,7 @@
                     </connections>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UZO-j7-eJs">
-                    <rect key="frame" x="0.0" y="374" width="414" height="50"/>
+                    <rect key="frame" x="0.0" y="429" width="414" height="50"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="查找聊天内容" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bcd-XL-l1B">
                             <rect key="frame" x="13" y="15.5" width="145" height="19.5"/>
@@ -211,7 +211,7 @@
                     </connections>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aOO-cS-gdV">
-                    <rect key="frame" x="0.0" y="546" width="414" height="55"/>
+                    <rect key="frame" x="0.0" y="601" width="414" height="55"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fl2-Rm-1E9">
                             <rect key="frame" x="354" y="7.5" width="47" height="40"/>
@@ -225,7 +225,7 @@
                             </connections>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" layoutMarginsFollowReadableWidth="YES" text="群消息接收但不提醒" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k5R-Vy-hE4">
-                            <rect key="frame" x="13" y="18" width="147" height="19.5"/>
+                            <rect key="frame" x="13" y="18" width="143" height="19.5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
@@ -240,46 +240,6 @@
                         <constraint firstAttribute="trailing" secondItem="fl2-Rm-1E9" secondAttribute="trailing" constant="13" id="p2H-Bc-RbE"/>
                     </constraints>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0hZ-Dj-wqy">
-                    <rect key="frame" x="0.0" y="613" width="414" height="55"/>
-                    <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_next" translatesAutoresizingMaskIntoConstraints="NO" id="jgL-fA-2h0">
-                            <rect key="frame" x="397" y="20.5" width="7" height="14"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="7" id="Vsh-oH-cIl"/>
-                                <constraint firstAttribute="height" constant="14" id="pBM-IT-X3h"/>
-                            </constraints>
-                        </imageView>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" layoutMarginsFollowReadableWidth="YES" text="群公告" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wGu-Ji-Izg">
-                            <rect key="frame" x="13" y="18" width="49" height="19.5"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                            <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K7k-ff-Bs3">
-                            <rect key="frame" x="16" y="54" width="398" height="1"/>
-                            <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="1" id="CiA-Yu-WAS"/>
-                            </constraints>
-                        </view>
-                    </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                    <gestureRecognizers/>
-                    <constraints>
-                        <constraint firstAttribute="trailing" secondItem="K7k-ff-Bs3" secondAttribute="trailing" id="7K2-hG-pph"/>
-                        <constraint firstItem="wGu-Ji-Izg" firstAttribute="leading" secondItem="0hZ-Dj-wqy" secondAttribute="leading" constant="13" id="FXk-Ra-yOH"/>
-                        <constraint firstItem="wGu-Ji-Izg" firstAttribute="centerY" secondItem="0hZ-Dj-wqy" secondAttribute="centerY" id="Ncj-TG-giW"/>
-                        <constraint firstAttribute="height" constant="55" id="OJA-EE-coh"/>
-                        <constraint firstItem="jgL-fA-2h0" firstAttribute="centerY" secondItem="0hZ-Dj-wqy" secondAttribute="centerY" id="QO5-DD-RdR"/>
-                        <constraint firstAttribute="trailing" secondItem="jgL-fA-2h0" secondAttribute="trailing" constant="10" id="b39-Pk-DXM"/>
-                        <constraint firstItem="K7k-ff-Bs3" firstAttribute="leading" secondItem="0hZ-Dj-wqy" secondAttribute="leading" constant="16" id="bXz-DV-Cag"/>
-                        <constraint firstAttribute="bottom" secondItem="K7k-ff-Bs3" secondAttribute="bottom" id="uhf-3G-fgK"/>
-                    </constraints>
-                    <connections>
-                        <outletCollection property="gestureRecognizers" destination="bpJ-RX-zB4" appends="YES" id="dVS-cS-Bxl"/>
-                    </connections>
-                </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DCz-5K-rHE">
                     <rect key="frame" x="0.0" y="264" width="414" height="55"/>
                     <subviews>
@@ -343,7 +303,7 @@
                             </constraints>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" layoutMarginsFollowReadableWidth="YES" text="投诉" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RaV-yo-qZk">
-                            <rect key="frame" x="13" y="18" width="33" height="19.5"/>
+                            <rect key="frame" x="13" y="18" width="32" height="19.5"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
@@ -379,7 +339,7 @@
                     </connections>
                 </button>
                 <view autoresizesSubviews="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fy6-IY-oQY">
-                    <rect key="frame" x="0.0" y="424" width="414" height="55"/>
+                    <rect key="frame" x="0.0" y="479" width="414" height="55"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O4h-2N-H8x">
                             <rect key="frame" x="13" y="0.0" width="388" height="1"/>
@@ -389,7 +349,7 @@
                             </constraints>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" layoutMarginsFollowReadableWidth="YES" text="学生禁言" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QbV-a9-wg4">
-                            <rect key="frame" x="13" y="17.5" width="65.5" height="20"/>
+                            <rect key="frame" x="13" y="17.5" width="64" height="20"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
@@ -420,7 +380,7 @@
                     </constraints>
                 </view>
                 <view tag="1012" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="351-sB-JCZ">
-                    <rect key="frame" x="0.0" y="479" width="414" height="55"/>
+                    <rect key="frame" x="0.0" y="534" width="414" height="55"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_next" translatesAutoresizingMaskIntoConstraints="NO" id="sGO-wF-f08">
                             <rect key="frame" x="397" y="20.5" width="7" height="14"/>
@@ -430,7 +390,7 @@
                             </constraints>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" layoutMarginsFollowReadableWidth="YES" text="禁言名单" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VVt-xF-zQW">
-                            <rect key="frame" x="13" y="17.5" width="65.5" height="20"/>
+                            <rect key="frame" x="13" y="17.5" width="64" height="20"/>
                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
@@ -459,6 +419,46 @@
                         <outletCollection property="gestureRecognizers" destination="9gG-Rf-jod" appends="YES" id="kGP-tY-O8e"/>
                     </connections>
                 </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0hZ-Dj-wqy">
+                    <rect key="frame" x="0.0" y="374" width="414" height="55"/>
+                    <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_next" translatesAutoresizingMaskIntoConstraints="NO" id="jgL-fA-2h0">
+                            <rect key="frame" x="397" y="20.5" width="7" height="14"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="7" id="Vsh-oH-cIl"/>
+                                <constraint firstAttribute="height" constant="14" id="pBM-IT-X3h"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" layoutMarginsFollowReadableWidth="YES" text="群公告" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wGu-Ji-Izg">
+                            <rect key="frame" x="13" y="18" width="48" height="19.5"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                            <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K7k-ff-Bs3">
+                            <rect key="frame" x="16" y="0.0" width="398" height="1"/>
+                            <color key="backgroundColor" red="0.94117647059999998" green="0.94117647059999998" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="1" id="CiA-Yu-WAS"/>
+                            </constraints>
+                        </view>
+                    </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <gestureRecognizers/>
+                    <constraints>
+                        <constraint firstAttribute="trailing" secondItem="K7k-ff-Bs3" secondAttribute="trailing" id="7K2-hG-pph"/>
+                        <constraint firstItem="K7k-ff-Bs3" firstAttribute="top" secondItem="0hZ-Dj-wqy" secondAttribute="top" id="DLW-W9-0r5"/>
+                        <constraint firstItem="wGu-Ji-Izg" firstAttribute="leading" secondItem="0hZ-Dj-wqy" secondAttribute="leading" constant="13" id="FXk-Ra-yOH"/>
+                        <constraint firstItem="wGu-Ji-Izg" firstAttribute="centerY" secondItem="0hZ-Dj-wqy" secondAttribute="centerY" id="Ncj-TG-giW"/>
+                        <constraint firstAttribute="height" constant="55" id="OJA-EE-coh"/>
+                        <constraint firstItem="jgL-fA-2h0" firstAttribute="centerY" secondItem="0hZ-Dj-wqy" secondAttribute="centerY" id="QO5-DD-RdR"/>
+                        <constraint firstAttribute="trailing" secondItem="jgL-fA-2h0" secondAttribute="trailing" constant="10" id="b39-Pk-DXM"/>
+                        <constraint firstItem="K7k-ff-Bs3" firstAttribute="leading" secondItem="0hZ-Dj-wqy" secondAttribute="leading" constant="16" id="bXz-DV-Cag"/>
+                    </constraints>
+                    <connections>
+                        <outletCollection property="gestureRecognizers" destination="bpJ-RX-zB4" appends="YES" id="dVS-cS-Bxl"/>
+                    </connections>
+                </view>
             </subviews>
             <color key="backgroundColor" red="0.96470588235294119" green="0.97254901960784312" blue="0.97647058823529409" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
@@ -469,7 +469,7 @@
                 <constraint firstItem="AOx-4a-71e" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="6sx-4K-fmr"/>
                 <constraint firstAttribute="trailing" secondItem="0hZ-Dj-wqy" secondAttribute="trailing" id="7J3-AE-4RE"/>
                 <constraint firstItem="aOO-cS-gdV" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="7Ml-qH-PPT"/>
-                <constraint firstItem="UZO-j7-eJs" firstAttribute="top" secondItem="hNX-kx-Qhp" secondAttribute="bottom" id="AOg-Wz-KYC"/>
+                <constraint firstItem="H5y-Vp-Aux" firstAttribute="top" secondItem="aOO-cS-gdV" secondAttribute="bottom" constant="12" id="7dy-Ff-zSg"/>
                 <constraint firstItem="0hZ-Dj-wqy" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="AoA-pe-YVq"/>
                 <constraint firstAttribute="trailing" secondItem="H5y-Vp-Aux" secondAttribute="trailing" id="DZc-LC-mJn"/>
                 <constraint firstItem="fRV-DB-sBs" firstAttribute="top" secondItem="AOx-4a-71e" secondAttribute="bottom" constant="12" id="E1k-Ju-fB8"/>
@@ -477,7 +477,6 @@
                 <constraint firstItem="AOx-4a-71e" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="JaT-tL-Lg5"/>
                 <constraint firstItem="fRV-DB-sBs" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="KfE-Ms-nB3"/>
                 <constraint firstItem="hNX-kx-Qhp" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Ki4-NK-uXf"/>
-                <constraint firstItem="0hZ-Dj-wqy" firstAttribute="top" secondItem="aOO-cS-gdV" secondAttribute="bottom" constant="12" id="MIH-E6-hx0"/>
                 <constraint firstItem="9Zk-Ss-xf8" firstAttribute="top" secondItem="H5y-Vp-Aux" secondAttribute="bottom" constant="30" id="N1t-gx-92V"/>
                 <constraint firstAttribute="trailing" secondItem="351-sB-JCZ" secondAttribute="trailing" id="RVK-hp-Anr"/>
                 <constraint firstItem="DCz-5K-rHE" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Utq-mZ-4EV"/>
@@ -491,8 +490,9 @@
                 <constraint firstAttribute="trailing" secondItem="9Zk-Ss-xf8" secondAttribute="trailing" constant="28" id="jPR-6G-jho"/>
                 <constraint firstAttribute="trailing" secondItem="DCz-5K-rHE" secondAttribute="trailing" id="ksy-CG-efB"/>
                 <constraint firstItem="351-sB-JCZ" firstAttribute="top" secondItem="fy6-IY-oQY" secondAttribute="bottom" id="lwb-rj-bpN"/>
+                <constraint firstItem="UZO-j7-eJs" firstAttribute="top" secondItem="0hZ-Dj-wqy" secondAttribute="bottom" id="qQh-1L-7mE"/>
+                <constraint firstItem="0hZ-Dj-wqy" firstAttribute="top" secondItem="hNX-kx-Qhp" secondAttribute="bottom" id="vWc-li-LcJ"/>
                 <constraint firstItem="351-sB-JCZ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="vhT-9a-u5w"/>
-                <constraint firstItem="H5y-Vp-Aux" firstAttribute="top" secondItem="0hZ-Dj-wqy" secondAttribute="bottom" id="vyf-Ns-eUM"/>
                 <constraint firstItem="aOO-cS-gdV" firstAttribute="top" secondItem="351-sB-JCZ" secondAttribute="bottom" constant="12" id="x1A-la-Wpa"/>
                 <constraint firstAttribute="trailing" secondItem="UZO-j7-eJs" secondAttribute="trailing" id="xBL-hk-DiD"/>
             </constraints>
@@ -516,7 +516,7 @@
                 <outlet property="muteButton" destination="3mj-vH-cZt" id="jaq-9l-IXB"/>
                 <outlet property="switchButton" destination="fl2-Rm-1E9" id="xTR-c2-UCT"/>
             </connections>
-            <point key="canvasLocation" x="136.23188405797103" y="-51.227678571428569"/>
+            <point key="canvasLocation" x="136.23188405797103" y="11.049107142857142"/>
         </view>
         <tapGestureRecognizer id="hZ3-TO-Qmd">
             <connections>

KulexiuForTeacher/Pods/TUIChat/TXGroupNoticeMessageCell.m

@@ -29,8 +29,8 @@
 - (void)configUI {
     [self.container addSubview:self.noticeContentView];
     [self.noticeContentView mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_equalTo(self.avatarView.mas_right).offset(10);
-        make.top.mas_equalTo(self.avatarView.mas_top);
+        make.left.mas_equalTo(self.container.mas_left);
+        make.top.mas_equalTo(self.container.mas_top);
         make.width.mas_equalTo(245);
         make.bottom.mas_equalTo(self.container.mas_bottom).offset(-10);
     }];
@@ -42,16 +42,16 @@
     CGFloat height = [self getContentViewHeight:data];
     if (data.direction == MsgDirectionIncoming) {
         [self.noticeContentView mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.left.mas_equalTo(self.avatarView.mas_right).offset(10);
-            make.top.mas_equalTo(self.avatarView.mas_top);
+            make.left.mas_equalTo(self.container.mas_left);
+            make.top.mas_equalTo(self.container.mas_top);
             make.width.mas_equalTo(245);
             make.height.mas_equalTo(height);
         }];
     }
     else {
         [self.noticeContentView mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.right.mas_equalTo(self.avatarView.mas_left).offset(-10);
-            make.top.mas_equalTo(self.avatarView.mas_top);
+            make.right.mas_equalTo(self.container.mas_right);
+            make.top.mas_equalTo(self.container.mas_top);
             make.width.mas_equalTo(245);
             make.height.mas_equalTo(height);
         }];