Steven před 6 měsíci
rodič
revize
2b791600b8

+ 5 - 4
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Group/View/ApplyBottomView.xib

@@ -13,8 +13,8 @@
             <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pnh-C3-tCQ">
-                    <rect key="frame" x="28" y="0.0" width="176" height="42"/>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pnh-C3-tCQ">
+                    <rect key="frame" x="28" y="0.0" width="176" height="44"/>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                     <state key="normal" title="拒绝">
@@ -35,8 +35,8 @@
                         <action selector="refuse:" destination="iN0-l3-epB" eventType="touchUpInside" id="ol4-dk-Dse"/>
                     </connections>
                 </button>
-                <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qCg-d6-8G7">
-                    <rect key="frame" x="210" y="0.0" width="176" height="42"/>
+                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qCg-d6-8G7">
+                    <rect key="frame" x="210" y="0.0" width="176" height="44"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                     <state key="normal" title="通过"/>
@@ -55,6 +55,7 @@
                 <constraint firstItem="pnh-C3-tCQ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="28" id="0Gk-h5-N5E"/>
                 <constraint firstItem="qCg-d6-8G7" firstAttribute="height" secondItem="pnh-C3-tCQ" secondAttribute="height" id="BMn-k0-Ly7"/>
                 <constraint firstAttribute="trailing" secondItem="qCg-d6-8G7" secondAttribute="trailing" constant="28" id="F1Y-7r-2Kh"/>
+                <constraint firstAttribute="bottom" secondItem="pnh-C3-tCQ" secondAttribute="bottom" id="G0M-T9-boO"/>
                 <constraint firstAttribute="bottom" secondItem="qCg-d6-8G7" secondAttribute="bottom" id="TfZ-dT-qS2"/>
                 <constraint firstItem="qCg-d6-8G7" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Yiq-rF-qgd"/>
                 <constraint firstItem="qCg-d6-8G7" firstAttribute="leading" secondItem="pnh-C3-tCQ" secondAttribute="trailing" constant="6" id="fyv-b2-9Nq"/>

+ 10 - 2
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/View/TenantGroupCreate/TenentGroupAddMemberCell.m

@@ -8,6 +8,7 @@
 #import "TenentGroupAddMemberCell.h"
 
 @interface TenentGroupAddMemberCell ()
+@property (weak, nonatomic) IBOutlet UIView *subjectBgView;
 
 @property (weak, nonatomic) IBOutlet UILabel *subjectName;
 
@@ -33,8 +34,15 @@
     self.studentName.text = [NSString returnNoNullStringWithString:model.username];
     NSString *statusImage = model.isChoose ? @"tenant_group_choose" : @"tenant_group_unchoose";
     [self.chooseImge setImage:[UIImage imageNamed:statusImage]];
-    
-    self.subjectName.text = [NSString returnNoNullStringWithString:model.subjectName];
+    if ([NSString isEmptyString:model.subjectName]) {
+        self.subjectName.text = @"";
+        self.subjectBgView.hidden = YES;
+    }
+    else {
+        self.subjectBgView.hidden = NO;
+        self.subjectName.text = [NSString returnNoNullStringWithString:model.subjectName];
+
+    }
     self.tenantGroupName.text = [NSString returnNoNullStringWithString:model.tenantGroupName];
 }
 

+ 1 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/View/TenantGroupCreate/TenentGroupAddMemberCell.xib

@@ -115,6 +115,7 @@
                 <outlet property="chooseImge" destination="MdD-xr-8Fs" id="F2U-2i-DB9"/>
                 <outlet property="studentAvatar" destination="nlI-f2-DdF" id="jed-Ik-PQW"/>
                 <outlet property="studentName" destination="Mvz-r4-out" id="816-Ua-uHs"/>
+                <outlet property="subjectBgView" destination="wYJ-rN-29v" id="N5Z-f4-erq"/>
                 <outlet property="subjectName" destination="4hx-lm-7oc" id="vtG-mX-Gye"/>
                 <outlet property="tenantGroupName" destination="OaN-4i-kZE" id="h9O-Vh-P25"/>
             </connections>