小组

KulexiuForStudent/KulexiuForStudent/Common/Base/CustomNavViewController.m

@@ -92,7 +92,7 @@
 #pragma mark - UINavigationControllerDelegate
 
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated {
-    if ([self respondsToSelector:@selector(interactivePopGestureRecognizer)] && ![viewController isKindOfClass:NSClassFromString(@"KSBaseWKWebViewController")] && [viewController isKindOfClass:NSClassFromString(@"FirstSettingViewController")]) {
+    if ([self respondsToSelector:@selector(interactivePopGestureRecognizer)] && ![viewController isKindOfClass:NSClassFromString(@"KSBaseWKWebViewController")] && ![viewController isKindOfClass:NSClassFromString(@"FirstSettingViewController")] && ![viewController isKindOfClass:NSClassFromString(@"TXLiveRoomViewController")] && ![viewController isKindOfClass:NSClassFromString(@"TXClassroomViewController")]) {
         self.interactivePopGestureRecognizer.enabled = YES;
     }
 }

KulexiuForStudent/KulexiuForStudent/Common/Base/KSBaseWKWebViewController.m

@@ -524,7 +524,8 @@ typedef NS_ENUM(NSInteger, CHOOSETYPE) {
             model.groupID = targetId;
             KSGroupConversationController *ctrl = [[KSGroupConversationController alloc] init];
             ctrl.conversation = model;
-            [self.navigationController pushViewController:ctrl animated:YES];        }
+            [self.navigationController pushViewController:ctrl animated:YES];       
+        }
     }
     else if ([[parm ks_stringValueForKey:@"api"] isEqualToString:@"chooseFile"]) {
         NSDictionary *valueDic = [parm ks_dictionaryValueForKey:@"content"];

KulexiuForStudent/KulexiuForStudent/Common/Define/KSDomain.h

@@ -16,32 +16,33 @@
 
 //#ifdef DEBUG
 
+// 开发环境
+
+//#define hostURL (@"https://dev.colexiu.com")
+//#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
+//#define WEBHOST (@"https://dev.colexiu.com/student")
+//#define TENANT_WEBHOST (@"https://dev.colexiu.com/tenant")
+//#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
+//#define JSPUSH_ENVIRONMENT (NO)
+//#define RCIM_KEY (@"0vnjpoad0jbdz")
+//#define SUBMIT_UUID (NO)
+//#define CONFIG_TXSDKAPPID (1400805079)
+//#define TXOfflinePushCertificateIDForAPNS (39557)
+
+
 // 测试环境
 
-#define hostURL (@"https://dev.colexiu.com")
-#define SEALCLASSHOST (@"https://dev.colexiu.com/api-classroom")
-#define WEBHOST (@"https://dev.colexiu.com/student")
-#define TENANT_WEBHOST (@"https://dev.colexiu.com/tenant")
-#define SOCKET_URL (@"wss://dev.colexiu.com/audioAnalysis")
+#define hostURL (@"https://test.colexiu.com")
+#define SEALCLASSHOST (@"https://test.colexiu.com/api-classroom")
+#define WEBHOST (@"https://test.colexiu.com/student")
+#define TENANT_WEBHOST (@"https://test.colexiu.com/tenant")
+#define SOCKET_URL (@"wss://test.colexiu.com/audioAnalysis")
 #define JSPUSH_ENVIRONMENT (NO)
 #define RCIM_KEY (@"0vnjpoad0jbdz")
 #define SUBMIT_UUID (NO)
 #define CONFIG_TXSDKAPPID (1400805079)
 #define TXOfflinePushCertificateIDForAPNS (39557)
 
-
-// 开发环境
-//#define hostURL (@"https://test.colexiu.com")
-//#define SEALCLASSHOST (@"https://test.colexiu.com/api-classroom")
-//#define WEBHOST (@"https://test.colexiu.com/student")
-//#define TENANT_WEBHOST (@"https://test.colexiu.com/tenant")
-//#define SOCKET_URL (@"wss://test.colexiu.com/audioAnalysis")
-//#define JSPUSH_ENVIRONMENT (NO)
-//#define RCIM_KEY (@"0vnjpoad0jbdz")
-//#define SUBMIT_UUID (NO)
-//#define CONFIG_TXSDKAPPID (1400805079)
-//#define TXOfflinePushCertificateIDForAPNS (39557)
-
 // 预生产
 //#define hostURL (@"https://ponline.colexiu.com")
 //#define SEALCLASSHOST (@"https://ponline.colexiu.com/api-classroom")

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/Controller/TenantNotiferCenterController.m

@@ -234,7 +234,8 @@
         _tableView.dataSource = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         [_tableView registerNib:[UINib nibWithNibName:@"TenantNotiferMessageCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"TenantNotiferMessageCell"];
-        _tableView.rowHeight = 77.0f;
+        _tableView.estimatedRowHeight = 77.0f;
+        _tableView.rowHeight = UITableViewAutomaticDimension;
         UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 15)];
         bottomView.backgroundColor = [UIColor clearColor];
         _tableView.tableFooterView = bottomView;

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/INSSettingBodyView.m

@@ -10,6 +10,7 @@
 
 @interface INSSettingBodyView ()
 
+@property (weak, nonatomic) IBOutlet UILabel *tenantGroupName;
 
 @property (weak, nonatomic) IBOutlet UILabel *userName;
 
@@ -64,6 +65,7 @@
         subjectName = @"请选择乐器";
     }
     self.subjectLabel.text = subjectName;
+    self.tenantGroupName.text = [NSString returnNoNullStringWithString:info.tenantGroupName];
 }
 
 - (void)refreshSubject:(NSString *)subjectName {
@@ -89,7 +91,7 @@
 
 - (CGFloat)getViewHeight {
     
-    return 58 * 7 + 12 + 12 + 78;
+    return 58 * 8 + 12 + 12 + 78;
 }
 /*
 // Only override drawRect: if you perform custom drawing.

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/INSSettingBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" 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="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -64,7 +64,7 @@
                     </connections>
                 </view>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="srN-vZ-6qk">
-                    <rect key="frame" x="13" y="102" width="371" height="406"/>
+                    <rect key="frame" x="13" y="102" width="371" height="464"/>
                     <subviews>
                         <view tag="1002" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VWr-of-xFF">
                             <rect key="frame" x="0.0" y="0.0" width="371" height="58"/>
@@ -234,7 +234,7 @@
                             </connections>
                         </view>
                         <view tag="1007" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gof-T9-GOL">
-                            <rect key="frame" x="0.0" y="290" width="371" height="58"/>
+                            <rect key="frame" x="0.0" y="348" width="371" height="58"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="修改密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MEV-wg-EMs">
                                     <rect key="frame" x="12" y="19" width="75" height="20"/>
@@ -344,7 +344,7 @@
                             </connections>
                         </view>
                         <view tag="1008" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ddD-53-eFq">
-                            <rect key="frame" x="0.0" y="348" width="371" height="58"/>
+                            <rect key="frame" x="0.0" y="406" width="371" height="58"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="注销账号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="PdX-Uf-ZDf">
                                     <rect key="frame" x="12" y="19" width="75" height="20"/>
@@ -443,24 +443,70 @@
                                 <outletCollection property="gestureRecognizers" destination="sp8-D1-k2R" appends="YES" id="Oip-og-0iW"/>
                             </connections>
                         </view>
+                        <view tag="1007" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aqA-az-HLB">
+                            <rect key="frame" x="0.0" y="290" width="371" height="58"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小组" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MTs-VR-Pq8">
+                                    <rect key="frame" x="12" y="19" width="75" height="20"/>
+                                    <constraints>
+                                        <constraint firstAttribute="width" constant="75" id="Gci-dt-3qu"/>
+                                    </constraints>
+                                    <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"/>
+                                </label>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="735-we-7Pg">
+                                    <rect key="frame" x="12" y="57" width="347" height="1"/>
+                                    <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="1" id="pGK-jH-4dw"/>
+                                    </constraints>
+                                </view>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DSF-WC-P7q">
+                                    <rect key="frame" x="359" y="18" width="0.0" height="22"/>
+                                    <constraints>
+                                        <constraint firstAttribute="height" constant="22" id="WMZ-Ih-3AE"/>
+                                    </constraints>
+                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                    <color key="textColor" red="0.66666666669999997" green="0.66666666669999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                            <gestureRecognizers/>
+                            <constraints>
+                                <constraint firstItem="DSF-WC-P7q" firstAttribute="centerY" secondItem="aqA-az-HLB" secondAttribute="centerY" id="BuW-9O-cku"/>
+                                <constraint firstItem="MTs-VR-Pq8" firstAttribute="leading" secondItem="aqA-az-HLB" secondAttribute="leading" constant="12" id="GQF-VP-6tw"/>
+                                <constraint firstItem="735-we-7Pg" firstAttribute="leading" secondItem="aqA-az-HLB" secondAttribute="leading" constant="12" id="IVq-sW-wjc"/>
+                                <constraint firstItem="DSF-WC-P7q" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="MTs-VR-Pq8" secondAttribute="trailing" constant="12" id="LtC-Hi-68G"/>
+                                <constraint firstAttribute="trailing" secondItem="735-we-7Pg" secondAttribute="trailing" constant="12" id="XXQ-BB-Wdl"/>
+                                <constraint firstItem="MTs-VR-Pq8" firstAttribute="centerY" secondItem="aqA-az-HLB" secondAttribute="centerY" id="ap2-3x-b8h"/>
+                                <constraint firstAttribute="bottom" secondItem="735-we-7Pg" secondAttribute="bottom" id="d5A-qy-6kt"/>
+                                <constraint firstAttribute="trailing" secondItem="DSF-WC-P7q" secondAttribute="trailing" constant="12" id="hnb-4n-nHt"/>
+                                <constraint firstAttribute="height" constant="58" id="p0l-TO-vbh"/>
+                            </constraints>
+                        </view>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstItem="zZF-SA-MTK" firstAttribute="top" secondItem="VWr-of-xFF" secondAttribute="bottom" id="0Zh-xC-ihP"/>
                         <constraint firstItem="Gof-T9-GOL" firstAttribute="leading" secondItem="srN-vZ-6qk" secondAttribute="leading" id="2GU-iQ-iGE"/>
                         <constraint firstAttribute="trailing" secondItem="Gof-T9-GOL" secondAttribute="trailing" id="85Q-gr-mJ3"/>
+                        <constraint firstAttribute="trailing" secondItem="aqA-az-HLB" secondAttribute="trailing" id="9CH-52-oh3"/>
                         <constraint firstAttribute="trailing" secondItem="VWr-of-xFF" secondAttribute="trailing" id="9On-HV-y7H"/>
                         <constraint firstAttribute="trailing" secondItem="ypf-sm-FDJ" secondAttribute="trailing" id="F6w-d0-3as"/>
                         <constraint firstItem="VWr-of-xFF" firstAttribute="leading" secondItem="srN-vZ-6qk" secondAttribute="leading" id="L4J-VU-Mhh"/>
-                        <constraint firstItem="Gof-T9-GOL" firstAttribute="top" secondItem="8tP-al-fmS" secondAttribute="bottom" id="LZ1-SY-bSd"/>
                         <constraint firstAttribute="bottom" secondItem="ddD-53-eFq" secondAttribute="bottom" id="RhH-vA-hro"/>
+                        <constraint firstItem="Gof-T9-GOL" firstAttribute="top" secondItem="aqA-az-HLB" secondAttribute="bottom" id="SfN-rR-Q6Z"/>
                         <constraint firstItem="VWr-of-xFF" firstAttribute="top" secondItem="srN-vZ-6qk" secondAttribute="top" id="Szi-3z-AFA"/>
                         <constraint firstItem="ddD-53-eFq" firstAttribute="leading" secondItem="srN-vZ-6qk" secondAttribute="leading" id="Tax-67-9xj"/>
                         <constraint firstItem="dDj-nG-TXa" firstAttribute="leading" secondItem="srN-vZ-6qk" secondAttribute="leading" id="U4x-W9-dtS"/>
                         <constraint firstItem="8tP-al-fmS" firstAttribute="leading" secondItem="srN-vZ-6qk" secondAttribute="leading" id="ZiL-4j-hhv"/>
                         <constraint firstItem="ypf-sm-FDJ" firstAttribute="leading" secondItem="srN-vZ-6qk" secondAttribute="leading" id="Zka-FP-bZz"/>
                         <constraint firstAttribute="trailing" secondItem="8tP-al-fmS" secondAttribute="trailing" id="b27-A0-dVl"/>
+                        <constraint firstItem="aqA-az-HLB" firstAttribute="leading" secondItem="srN-vZ-6qk" secondAttribute="leading" id="b9p-i3-bol"/>
                         <constraint firstItem="ypf-sm-FDJ" firstAttribute="top" secondItem="dDj-nG-TXa" secondAttribute="bottom" id="bOr-Cd-zth"/>
+                        <constraint firstItem="aqA-az-HLB" firstAttribute="top" secondItem="8tP-al-fmS" secondAttribute="bottom" id="efs-BG-46A"/>
                         <constraint firstAttribute="trailing" secondItem="dDj-nG-TXa" secondAttribute="trailing" id="eg0-Le-dgb"/>
                         <constraint firstItem="ddD-53-eFq" firstAttribute="top" secondItem="Gof-T9-GOL" secondAttribute="bottom" id="mZk-ZX-CKm"/>
                         <constraint firstItem="zZF-SA-MTK" firstAttribute="leading" secondItem="srN-vZ-6qk" secondAttribute="leading" id="nJQ-Ra-KKZ"/>
@@ -492,6 +538,7 @@
                 <outlet property="birthdayLabel" destination="a8f-sc-JaW" id="3Sr-XC-gUb"/>
                 <outlet property="phoneLabel" destination="oE2-cd-RmM" id="NTX-Bp-9xc"/>
                 <outlet property="subjectLabel" destination="71s-LD-PL3" id="hr1-27-LHc"/>
+                <outlet property="tenantGroupName" destination="DSF-WC-P7q" id="2AX-aI-FJ8"/>
                 <outlet property="uesrAvatar" destination="ufl-yX-uCz" id="KTO-eO-TeH"/>
                 <outlet property="userName" destination="EkB-dg-4QO" id="fy8-vu-492"/>
                 <outlet property="userSex" destination="qTs-K4-6hd" id="BAY-4e-wwE"/>

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineBodyView.m

@@ -9,6 +9,9 @@
 #import "UIImageView+DisplayImage.h"
 
 @interface InstitutionMineBodyView ()
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *userNameTop;
+
 @property (weak, nonatomic) IBOutlet UIImageView *userAvatar;
 @property (weak, nonatomic) IBOutlet UILabel *userName;
 @property (weak, nonatomic) IBOutlet UIImageView *memberImg;
@@ -22,6 +25,7 @@
 
 @property (nonatomic, strong) UIImage *preDisplayImage;
 
+@property (weak, nonatomic) IBOutlet UILabel *tenantName;
 
 @end
 
@@ -66,17 +70,41 @@
     [self.memberImg setImage:[UIImage imageNamed:tagImg]];
     self.memberImg.hidden = NO;
     
-    NSString *memberDesc = @"暂未开通";
-    if (![NSString isEmptyString:sourceModel.membershipEndTime]) {
-        memberDesc = [NSString stringWithFormat:@"至%@",[[sourceModel.membershipEndTime componentsSeparatedByString:@" "] firstObject]];
+    if (sourceModel.membershipDays > 0) {
+        self.memberDesc.text = [NSString stringWithFormat:@"至%@",[[sourceModel.membershipEndTime componentsSeparatedByString:@" "] firstObject]];
+    }
+    else {
+        if (![NSString isEmptyString:sourceModel.membershipEndTime]) {
+            self.memberDesc.text = @"会员已过期";
+        }
+        else {
+            self.memberDesc.text = @"暂未开通";
+        }
     }
-    self.memberDesc.text = memberDesc;
     
-    NSString *toolDesc = @"暂未开通";
-    if (![NSString isEmptyString:sourceModel.tenantAlbumEndTime]) {
-        toolDesc = [NSString stringWithFormat:@"至%@",[[sourceModel.tenantAlbumEndTime componentsSeparatedByString:@" "] firstObject]];
+    
+    if ([sourceModel.tenantAlbumFlag integerValue] > 0) {
+        self.toolDesc.text = [NSString stringWithFormat:@"至%@",[[sourceModel.tenantAlbumEndTime componentsSeparatedByString:@" "] firstObject]];
+    }
+    else {
+        if (![NSString isEmptyString:sourceModel.tenantAlbumEndTime]) {
+            self.toolDesc.text = @"训练工具已过期";
+        }
+        else {
+            self.toolDesc.text = @"暂未开通";
+        }
+    }
+    
+    // 小组名称
+    if ([NSString isEmptyString:sourceModel.tenantGroupName]) {
+        self.userNameTop.constant = 21.0f;
+        self.tenantName.hidden = YES;
+    }
+    else {
+        self.userNameTop.constant = 9.0f;
+        self.tenantName.hidden = NO;
+        self.tenantName.text = sourceModel.tenantGroupName;
     }
-    self.toolDesc.text = toolDesc;
 }
 
 - (IBAction)clickAction:(UITapGestureRecognizer *)sender {

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/InstitutionMineBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" 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="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -174,7 +174,7 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LYR-lA-eEp">
                             <rect key="frame" x="24" y="86" width="72" height="72"/>
                             <subviews>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="X3c-Yi-Xkh">
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="tenant_defalut_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="X3c-Yi-Xkh">
                                     <rect key="frame" x="2" y="2" width="68" height="68"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="68" id="Ipk-01-OFZ"/>
@@ -200,8 +200,8 @@
                                 </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                         </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nlb-bG-jKG">
-                            <rect key="frame" x="108" y="91" width="0.0" height="28"/>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nlb-bG-jKG">
+                            <rect key="frame" x="108" y="95" width="0.0" height="28"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="28" id="KND-9T-wMM"/>
                             </constraints>
@@ -209,8 +209,24 @@
                             <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
                         </label>
+                        <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_mineMember_tag" translatesAutoresizingMaskIntoConstraints="NO" id="j1E-FX-DSh">
+                            <rect key="frame" x="38" y="149.66666666666666" width="44" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="44" id="F0Y-OI-vHn"/>
+                                <constraint firstAttribute="height" constant="17" id="iHY-he-VUA"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="v4r-I2-0Uz">
+                            <rect key="frame" x="108" y="129" width="0.0" height="18"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="18" id="ro3-YV-CrY"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.45000000000000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aWj-xg-N6w">
-                            <rect key="frame" x="108" y="125" width="31" height="19"/>
+                            <rect key="frame" x="114" y="99.666666666666671" width="31" height="19"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_mine_subject" translatesAutoresizingMaskIntoConstraints="NO" id="BCo-k7-x8g">
                                     <rect key="frame" x="7" y="3" width="13" height="13"/>
@@ -219,8 +235,8 @@
                                         <constraint firstAttribute="height" constant="13" id="frl-N1-FNa"/>
                                     </constraints>
                                 </imageView>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k3g-g1-liB">
-                                    <rect key="frame" x="24" y="9.6666666666666572" width="0.0" height="0.0"/>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="k3g-g1-liB">
+                                    <rect key="frame" x="24" y="9.3333333333333286" width="0.0" height="0.0"/>
                                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                     <color key="textColor" red="0.99607843137254903" green="0.14117647058823529" blue="0.31764705882352939" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
@@ -247,41 +263,36 @@
                                 </userDefinedRuntimeAttribute>
                             </userDefinedRuntimeAttributes>
                         </view>
-                        <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_mineMember_tag" translatesAutoresizingMaskIntoConstraints="NO" id="j1E-FX-DSh">
-                            <rect key="frame" x="114" y="96" width="44" height="17"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="44" id="F0Y-OI-vHn"/>
-                                <constraint firstAttribute="height" constant="17" id="iHY-he-VUA"/>
-                            </constraints>
-                        </imageView>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstItem="LYR-lA-eEp" firstAttribute="leading" secondItem="Nbm-ze-ouR" secondAttribute="leading" constant="24" id="0QW-mE-QpS"/>
                         <constraint firstItem="x5p-j7-s1g" firstAttribute="top" secondItem="xUo-7q-bZ9" secondAttribute="top" constant="-4" id="0lP-a5-Wva"/>
                         <constraint firstItem="A30-6f-0Ca" firstAttribute="leading" secondItem="Nbm-ze-ouR" secondAttribute="leading" id="1yA-Tt-Ebf"/>
-                        <constraint firstItem="Nlb-bG-jKG" firstAttribute="top" secondItem="LYR-lA-eEp" secondAttribute="top" constant="5" id="2Do-ed-2h8"/>
+                        <constraint firstItem="Nlb-bG-jKG" firstAttribute="top" secondItem="LYR-lA-eEp" secondAttribute="top" constant="9" id="2Do-ed-2h8"/>
                         <constraint firstItem="x5p-j7-s1g" firstAttribute="trailing" secondItem="xUo-7q-bZ9" secondAttribute="trailing" constant="6" id="3C5-y9-zJO"/>
                         <constraint firstItem="Mxr-u3-Zhb" firstAttribute="top" secondItem="Vt5-8U-7eH" secondAttribute="top" constant="-2" id="5GT-fh-y4e"/>
                         <constraint firstItem="Mxr-u3-Zhb" firstAttribute="leading" secondItem="xUo-7q-bZ9" secondAttribute="trailing" constant="9" id="8zA-Aj-WPH"/>
-                        <constraint firstItem="aWj-xg-N6w" firstAttribute="leading" secondItem="Nlb-bG-jKG" secondAttribute="leading" id="Ac8-Gn-4f7"/>
                         <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="aWj-xg-N6w" secondAttribute="trailing" constant="12" id="CcR-b0-7sw"/>
+                        <constraint firstItem="aWj-xg-N6w" firstAttribute="leading" secondItem="Nlb-bG-jKG" secondAttribute="trailing" constant="6" id="Eov-x6-O1P"/>
+                        <constraint firstItem="v4r-I2-0Uz" firstAttribute="top" secondItem="Nlb-bG-jKG" secondAttribute="bottom" constant="6" id="FZJ-0V-hrE"/>
                         <constraint firstItem="Mxr-u3-Zhb" firstAttribute="trailing" secondItem="Vt5-8U-7eH" secondAttribute="trailing" constant="-1" id="Gtn-8B-Vwg"/>
                         <constraint firstAttribute="bottom" secondItem="xUo-7q-bZ9" secondAttribute="bottom" constant="16" id="HDi-YK-9Xh"/>
+                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="v4r-I2-0Uz" secondAttribute="trailing" constant="12" id="JVN-rf-oYa"/>
                         <constraint firstItem="uzc-nx-nAm" firstAttribute="leading" secondItem="Nbm-ze-ouR" secondAttribute="leading" id="Mx7-Xa-Lf1"/>
                         <constraint firstItem="xUo-7q-bZ9" firstAttribute="top" secondItem="LYR-lA-eEp" secondAttribute="bottom" constant="25" id="QDk-md-kSV"/>
-                        <constraint firstItem="j1E-FX-DSh" firstAttribute="leading" secondItem="Nlb-bG-jKG" secondAttribute="trailing" constant="6" id="Rds-XE-dbL"/>
-                        <constraint firstItem="aWj-xg-N6w" firstAttribute="top" secondItem="Nlb-bG-jKG" secondAttribute="bottom" constant="6" id="Rov-Ud-l0r"/>
+                        <constraint firstItem="aWj-xg-N6w" firstAttribute="centerY" secondItem="Nlb-bG-jKG" secondAttribute="centerY" id="UKj-VU-cvE"/>
                         <constraint firstItem="Nlb-bG-jKG" firstAttribute="leading" secondItem="LYR-lA-eEp" secondAttribute="trailing" constant="12" id="VAJ-XK-Ard"/>
                         <constraint firstItem="98L-RE-L5b" firstAttribute="top" secondItem="Nbm-ze-ouR" secondAttribute="top" id="VdU-Vu-Udt"/>
+                        <constraint firstItem="v4r-I2-0Uz" firstAttribute="leading" secondItem="Nlb-bG-jKG" secondAttribute="leading" id="WLa-py-itB"/>
                         <constraint firstAttribute="trailing" secondItem="98L-RE-L5b" secondAttribute="trailing" id="YOs-Jb-zUi"/>
+                        <constraint firstItem="j1E-FX-DSh" firstAttribute="centerX" secondItem="LYR-lA-eEp" secondAttribute="centerX" id="Yhk-1P-OHs"/>
                         <constraint firstItem="Mxr-u3-Zhb" firstAttribute="width" secondItem="xUo-7q-bZ9" secondAttribute="width" id="Zox-PL-Vig"/>
                         <constraint firstItem="uzc-nx-nAm" firstAttribute="top" secondItem="Nbm-ze-ouR" secondAttribute="top" constant="19" id="Zqj-cL-ErZ"/>
+                        <constraint firstItem="j1E-FX-DSh" firstAttribute="centerY" secondItem="LYR-lA-eEp" secondAttribute="bottom" id="bsG-xq-JaU"/>
                         <constraint firstAttribute="height" constant="275" id="fPk-KI-PIk"/>
                         <constraint firstAttribute="trailing" secondItem="A30-6f-0Ca" secondAttribute="trailing" id="gSQ-A1-hjP"/>
-                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="j1E-FX-DSh" secondAttribute="trailing" constant="12" id="kUX-hN-lvf"/>
                         <constraint firstAttribute="bottom" secondItem="Mxr-u3-Zhb" secondAttribute="bottom" constant="16" id="l7Z-BD-Yt1"/>
-                        <constraint firstItem="j1E-FX-DSh" firstAttribute="top" secondItem="Nlb-bG-jKG" secondAttribute="top" constant="5" id="oxk-oM-jZs"/>
                         <constraint firstItem="A30-6f-0Ca" firstAttribute="top" secondItem="Nbm-ze-ouR" secondAttribute="top" id="pce-4x-814"/>
                         <constraint firstItem="xUo-7q-bZ9" firstAttribute="leading" secondItem="Nbm-ze-ouR" secondAttribute="leading" constant="13" id="rgr-bo-Yk0"/>
                         <constraint firstAttribute="trailing" secondItem="Mxr-u3-Zhb" secondAttribute="trailing" constant="13" id="s7x-po-Vg7"/>
@@ -291,10 +302,10 @@
                     <rect key="frame" x="13" y="287" width="367" height="130"/>
                     <subviews>
                         <view tag="1003" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sny-pb-TWZ">
-                            <rect key="frame" x="0.0" y="51" width="91.666666666666671" height="74"/>
+                            <rect key="frame" x="0.0" y="51" width="73.333333333333329" height="74"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_mine_music" translatesAutoresizingMaskIntoConstraints="NO" id="z6K-YU-QmJ">
-                                    <rect key="frame" x="30" y="2" width="32" height="32"/>
+                                    <rect key="frame" x="20.666666666666664" y="2" width="32" height="32"/>
                                     <gestureRecognizers/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="32" id="3nQ-Bb-ccy"/>
@@ -302,7 +313,7 @@
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的曲库" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="llV-N6-iUM">
-                                    <rect key="frame" x="21.333333333333332" y="38" width="49.333333333333343" height="16"/>
+                                    <rect key="frame" x="12.000000000000004" y="38" width="49.333333333333343" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="16" id="EhM-4l-Q4H"/>
                                     </constraints>
@@ -324,17 +335,17 @@
                             </connections>
                         </view>
                         <view tag="1005" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9n9-51-GnM">
-                            <rect key="frame" x="183.66666666666666" y="51" width="91.666666666666657" height="74"/>
+                            <rect key="frame" x="146.66666666666666" y="51" width="73.666666666666657" height="74"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_mine_order" translatesAutoresizingMaskIntoConstraints="NO" id="Dd1-kz-ACR">
-                                    <rect key="frame" x="29.666666666666686" y="2" width="32" height="32"/>
+                                    <rect key="frame" x="21" y="2" width="32" height="32"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="32" id="QGk-JB-c5l"/>
                                         <constraint firstAttribute="width" constant="32" id="uVK-ef-irC"/>
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CCv-8F-puO">
-                                    <rect key="frame" x="21.000000000000004" y="38" width="49.333333333333343" height="16"/>
+                                    <rect key="frame" x="12.333333333333346" y="38" width="49.333333333333343" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="16" id="teG-Pd-LeH"/>
                                     </constraints>
@@ -355,18 +366,18 @@
                                 <outletCollection property="gestureRecognizers" destination="vKx-8d-UTl" appends="YES" id="cu6-d5-Rgx"/>
                             </connections>
                         </view>
-                        <view hidden="YES" tag="1006" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iBV-4n-9tN">
-                            <rect key="frame" x="275.33333333333331" y="51" width="0.0" height="74"/>
+                        <view tag="1006" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iBV-4n-9tN">
+                            <rect key="frame" x="220.33333333333334" y="51" width="73.333333333333343" height="74"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_mine_rank" translatesAutoresizingMaskIntoConstraints="NO" id="6o5-QV-pgd">
-                                    <rect key="frame" x="-16" y="2" width="32" height="32"/>
+                                    <rect key="frame" x="20.666666666666657" y="2" width="32" height="32"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="32" id="Jek-gw-t3C"/>
                                         <constraint firstAttribute="height" constant="32" id="cg2-2G-gFg"/>
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="排行榜" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dva-Em-ug7">
-                                    <rect key="frame" x="-18.666666666666629" y="38" width="37" height="16"/>
+                                    <rect key="frame" x="18" y="38" width="37" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="16" id="JKR-Wd-nWu"/>
                                     </constraints>
@@ -379,7 +390,6 @@
                             <gestureRecognizers/>
                             <constraints>
                                 <constraint firstItem="Dva-Em-ug7" firstAttribute="centerX" secondItem="6o5-QV-pgd" secondAttribute="centerX" id="1sj-du-pWJ"/>
-                                <constraint firstAttribute="width" id="GrA-mY-P3S"/>
                                 <constraint firstItem="Dva-Em-ug7" firstAttribute="top" secondItem="6o5-QV-pgd" secondAttribute="bottom" constant="4" id="r2Y-yN-XbS"/>
                                 <constraint firstItem="6o5-QV-pgd" firstAttribute="top" secondItem="iBV-4n-9tN" secondAttribute="top" constant="2" id="x34-0c-dua"/>
                                 <constraint firstItem="6o5-QV-pgd" firstAttribute="centerX" secondItem="iBV-4n-9tN" secondAttribute="centerX" id="zwM-Ns-v9R"/>
@@ -398,17 +408,17 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <view tag="1007" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JPB-oG-7OI">
-                            <rect key="frame" x="275.33333333333331" y="51" width="91.666666666666686" height="74"/>
+                            <rect key="frame" x="293.66666666666669" y="51" width="73.333333333333314" height="74"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_mine_code" translatesAutoresizingMaskIntoConstraints="NO" id="fq9-6v-NL0">
-                                    <rect key="frame" x="29.666666666666686" y="2" width="32" height="32"/>
+                                    <rect key="frame" x="20.666666666666629" y="2" width="32" height="32"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="32" id="WSx-ZO-tIf"/>
                                         <constraint firstAttribute="height" constant="32" id="e4d-3b-Gdb"/>
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="激活码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XRm-Fc-bnp">
-                                    <rect key="frame" x="27.333333333333371" y="38" width="37" height="16"/>
+                                    <rect key="frame" x="18" y="38" width="37" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="16" id="mj3-pq-ivj"/>
                                     </constraints>
@@ -430,17 +440,17 @@
                             </connections>
                         </view>
                         <view tag="1004" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XWh-l9-hOS">
-                            <rect key="frame" x="91.666666666666686" y="51" width="92" height="74"/>
+                            <rect key="frame" x="73.333333333333343" y="51" width="73.333333333333343" height="74"/>
                             <subviews>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_mine_eveluate" translatesAutoresizingMaskIntoConstraints="NO" id="EEW-IB-hg7">
-                                    <rect key="frame" x="29.999999999999986" y="2" width="32" height="32"/>
+                                    <rect key="frame" x="20.666666666666671" y="2" width="32" height="32"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="32" id="mbZ-LU-MyN"/>
                                         <constraint firstAttribute="width" constant="32" id="rgr-gt-DRv"/>
                                     </constraints>
                                 </imageView>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="练习统计" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tKv-6K-2Lh">
-                                    <rect key="frame" x="21.333333333333332" y="38" width="49.333333333333343" height="16"/>
+                                    <rect key="frame" x="12.000000000000004" y="38" width="49.333333333333343" height="16"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="16" id="4PT-bu-Tbp"/>
                                     </constraints>
@@ -476,6 +486,7 @@
                         <constraint firstItem="9n9-51-GnM" firstAttribute="width" secondItem="Sny-pb-TWZ" secondAttribute="width" id="NSC-3b-BJN"/>
                         <constraint firstItem="JPB-oG-7OI" firstAttribute="bottom" secondItem="iBV-4n-9tN" secondAttribute="bottom" id="OKn-6P-loW"/>
                         <constraint firstItem="XWh-l9-hOS" firstAttribute="leading" secondItem="Sny-pb-TWZ" secondAttribute="trailing" id="SnR-aA-EIQ"/>
+                        <constraint firstItem="iBV-4n-9tN" firstAttribute="width" secondItem="JPB-oG-7OI" secondAttribute="width" id="WZA-hM-M1t"/>
                         <constraint firstItem="iBV-4n-9tN" firstAttribute="top" secondItem="Sny-pb-TWZ" secondAttribute="top" id="Xl2-uN-x4K"/>
                         <constraint firstItem="JPB-oG-7OI" firstAttribute="top" secondItem="iBV-4n-9tN" secondAttribute="top" id="YJA-mr-LYM"/>
                         <constraint firstAttribute="height" constant="130" id="ZcP-FC-3Pg"/>
@@ -760,9 +771,11 @@
                 <outlet property="memberImg" destination="j1E-FX-DSh" id="Qcd-Se-bsQ"/>
                 <outlet property="subjectLabel" destination="k3g-g1-liB" id="4om-GC-86Z"/>
                 <outlet property="subjectView" destination="aWj-xg-N6w" id="LbY-EU-yem"/>
+                <outlet property="tenantName" destination="v4r-I2-0Uz" id="WSa-2L-Hzv"/>
                 <outlet property="toolDesc" destination="6jm-cm-okg" id="6Cd-Wp-5de"/>
                 <outlet property="userAvatar" destination="X3c-Yi-Xkh" id="cOQ-qB-Uel"/>
                 <outlet property="userName" destination="Nlb-bG-jKG" id="gQI-V1-EYx"/>
+                <outlet property="userNameTop" destination="2Do-ed-2h8" id="scI-hM-fzo"/>
             </connections>
             <point key="canvasLocation" x="336.64122137404581" y="-228.16901408450704"/>
         </view>
@@ -851,7 +864,7 @@
         <image name="institution_mineMember_tag" width="44" height="17"/>
         <image name="institution_mineToolBg" width="71" height="76"/>
         <image name="mine_next" width="8" height="15"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="tenant_defalut_avatar" width="150" height="150"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/TenantNotiferMessageCell.m

@@ -62,13 +62,13 @@
     
     self.descMessageLabel.text = [NSString returnNoNullStringWithString:model.content];
     
-//    NSString *messgage = [NSString returnNoNullStringWithString:self.model.content];
-//    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
-//    [paragraphStyle setLineSpacing:4];//调整行间距
-//    paragraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
-//    
-//    NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:messgage attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:13.0f],NSForegroundColorAttributeName:HexRGB(0x7a7a7a)}];
-//    self.descMessageLabel.attributedText = attrStr;
+    NSString *messgage = [NSString returnNoNullStringWithString:self.model.content];
+    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+    [paragraphStyle setLineSpacing:4];//调整行间距
+    paragraphStyle.lineBreakMode = NSLineBreakByTruncatingTail;
+    
+    NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:messgage attributes:@{NSParagraphStyleAttributeName:paragraphStyle,NSFontAttributeName:[UIFont systemFontOfSize:13.0f],NSForegroundColorAttributeName:HexRGB(0x7a7a7a)}];
+    self.descMessageLabel.attributedText = attrStr;
     
 //    if (![NSString isEmptyString:imgName]) {
 //        [self.messageTypeView setImage:[UIImage imageNamed:imgName]];

KulexiuForStudent/KulexiuForStudent/InstitutionModule/Mine/View/TenantNotiferMessageCell.xib

@@ -33,8 +33,8 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您好，长笛基础教学·李老师的直播课60分钟后…教学·李老师的直播课60分钟后…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VaQ-F3-F4D">
-                                <rect key="frame" x="68" y="40" width="311" height="15.666666666666664"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您好，长笛基础教学·李老师的直播课60分钟后…教学·李老师的直播课60分钟后…" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VaQ-F3-F4D">
+                                <rect key="frame" x="68" y="40" width="311" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
@@ -80,6 +80,7 @@
                             <constraint firstAttribute="trailing" secondItem="yv6-Zy-niG" secondAttribute="trailing" constant="13" id="Ua4-8b-grZ"/>
                             <constraint firstItem="DUl-Lh-1pe" firstAttribute="top" secondItem="enL-C5-C4b" secondAttribute="top" id="a7v-8v-T9t"/>
                             <constraint firstItem="yv6-Zy-niG" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="4hp-bA-Hl4" secondAttribute="trailing" constant="10" id="bB4-7H-0wV"/>
+                            <constraint firstAttribute="bottom" secondItem="VaQ-F3-F4D" secondAttribute="bottom" constant="16" id="biJ-km-wLb"/>
                             <constraint firstItem="DUl-Lh-1pe" firstAttribute="trailing" secondItem="enL-C5-C4b" secondAttribute="trailing" id="eJ9-uX-ODl"/>
                             <constraint firstItem="enL-C5-C4b" firstAttribute="centerY" secondItem="sXQ-qt-Apo" secondAttribute="centerY" id="j56-5l-eTD"/>
                             <constraint firstItem="VaQ-F3-F4D" firstAttribute="top" secondItem="4hp-bA-Hl4" secondAttribute="bottom" constant="2" id="s4z-0X-1DW"/>

KulexiuForStudent/KulexiuForStudent/Module/Chat/Controller/KSChatListViewController.m

@@ -79,7 +79,6 @@
     UIImage *image = [UIImage imageNamed:CLIENT_EMPTY_IMG];
     [self.listVC.tableViewForAll.tipsView mas_remakeConstraints:^(MASConstraintMaker *make) {
         make.centerX.mas_equalTo(self.listVC.tableViewForAll);
-//        make.centerY.mas_equalTo(self.listVC.tableViewForAll.mas_centerY).offset(-68);
         make.top.mas_equalTo(self.listVC.tableViewForAll.mas_top).offset(80);
         make.width.mas_equalTo(image.size.width);
         make.height.mas_equalTo(image.size.height);

KulexiuForStudent/KulexiuForStudent/Module/Login/Model/UserInfo.h

@@ -54,6 +54,8 @@
 @property (nonatomic, strong) NSString *idCardNo;
 @property (nonatomic, assign) double lockFlag;
 
+@property (nonatomic, strong) NSString *tenantGroupName;
+
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;
 - (NSDictionary *)dictionaryRepresentation;

KulexiuForStudent/KulexiuForStudent/Module/Login/Model/UserInfo.m

@@ -50,6 +50,7 @@ NSString *const kUserInfoPhone = @"phone";
 NSString *const kUserInfoIsReal = @"isReal";
 NSString *const kUserInfoIdCardNo = @"idCardNo";
 NSString *const kUserInfoLockFlag = @"lockFlag";
+NSString *const kUserInfoTenantGroupName = @"tenantGroupName";
 
 
 @interface UserInfo ()
@@ -102,7 +103,7 @@ NSString *const kUserInfoLockFlag = @"lockFlag";
 @synthesize isReal = _isReal;
 @synthesize idCardNo = _idCardNo;
 @synthesize lockFlag = _lockFlag;
-
+@synthesize tenantGroupName = _tenantGroupName;
 
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict
 {
@@ -158,7 +159,7 @@ NSString *const kUserInfoLockFlag = @"lockFlag";
             self.isReal = [[self objectOrNilForKey:kUserInfoIsReal fromDictionary:dict] doubleValue];
             self.idCardNo = [self objectOrNilForKey:kUserInfoIdCardNo fromDictionary:dict];
             self.lockFlag = [[self objectOrNilForKey:kUserInfoLockFlag fromDictionary:dict] doubleValue];
-
+        self.tenantGroupName = [self objectOrNilForKey:kUserInfoTenantGroupName fromDictionary:dict];
     }
     
     return self;
@@ -210,7 +211,7 @@ NSString *const kUserInfoLockFlag = @"lockFlag";
     [mutableDict setValue:[NSNumber numberWithDouble:self.isReal] forKey:kUserInfoIsReal];
     [mutableDict setValue:self.idCardNo forKey:kUserInfoIdCardNo];
     [mutableDict setValue:[NSNumber numberWithDouble:self.lockFlag] forKey:kUserInfoLockFlag];
-
+    [mutableDict setValue:self.tenantGroupName forKey:kUserInfoTenantGroupName];
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
 
@@ -279,6 +280,7 @@ NSString *const kUserInfoLockFlag = @"lockFlag";
     self.isReal = [aDecoder decodeDoubleForKey:kUserInfoIsReal];
     self.idCardNo = [aDecoder decodeObjectForKey:kUserInfoIdCardNo];
     self.lockFlag = [aDecoder decodeDoubleForKey:kUserInfoLockFlag];
+    self.tenantGroupName = [aDecoder decodeObjectForKey:kUserInfoTenantGroupName];
     return self;
 }
 
@@ -327,6 +329,7 @@ NSString *const kUserInfoLockFlag = @"lockFlag";
     [aCoder encodeDouble:_isReal forKey:kUserInfoIsReal];
     [aCoder encodeObject:_idCardNo forKey:kUserInfoIdCardNo];
     [aCoder encodeDouble:_lockFlag forKey:kUserInfoLockFlag];
+    [aCoder encodeObject:_tenantGroupName forKey:kUserInfoTenantGroupName];
 }
 
 - (id)copyWithZone:(NSZone *)zone
@@ -377,6 +380,7 @@ NSString *const kUserInfoLockFlag = @"lockFlag";
         copy.isReal = self.isReal;
         copy.idCardNo = [self.idCardNo copyWithZone:zone];
         copy.lockFlag = self.lockFlag;
+        copy.tenantGroupName = [self.tenantGroupName copyWithZone:zone];
     }
     
     return copy;

KulexiuForStudent/KulexiuForStudent/Module/Mine/View/MineBodyView.m

@@ -89,7 +89,19 @@
     }
     self.userName.text = userName;
     self.userIdLabel.text = [NSString stringWithFormat:@"学号：%.0f",sourceModel.userId];
-    self.memberCountLabel.text = [NSString stringWithFormat:@"会员有效期剩余%.0f天",sourceModel.membershipDays];
+    
+    if (sourceModel.membershipDays > 0) {
+        self.memberCountLabel.text = [NSString stringWithFormat:@"会员有效期剩余%.0f天",sourceModel.membershipDays];
+    }
+    else {
+        if (![NSString isEmptyString:sourceModel.membershipEndTime]) {
+            self.memberCountLabel.text = @"会员已过期";
+        }
+        else {
+            self.memberCountLabel.text = @"暂未开通";
+        }
+    }
+    
     
     if (![NSString isEmptyString:sourceModel.heardUrl]) {
         [self.userAvatar displayImageWithUrl:[NSURL URLWithString:[sourceModel.heardUrl getUrlEndcodeString]] placeholder:self.preDisplayImage defaultImage:[UIImage imageNamed:USERDEFAULT_LOGO] callback:^(UIImage * _Nonnull image) {