机构我的页面

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -5422,13 +5422,13 @@
 		BC31BEEE2B21925700F7D538 /* WMGaugeView */ = {
 			isa = PBXGroup;
 			children = (
-				BC31BEEF2B21925700F7D538 /* WMGaugeViewStyle3D.h */,
-				BC31BEF02B21925700F7D538 /* WMGaugeViewStyle.h */,
-				BC31BEF12B21925700F7D538 /* WMGaugeViewStyleFlatThin.m */,
 				BC31BEF22B21925700F7D538 /* WMGaugeView.h */,
-				BC31BEF32B21925700F7D538 /* WMGaugeViewStyle3D.m */,
 				BC31BEF42B21925700F7D538 /* WMGaugeView.m */,
+				BC31BEF02B21925700F7D538 /* WMGaugeViewStyle.h */,
+				BC31BEEF2B21925700F7D538 /* WMGaugeViewStyle3D.h */,
+				BC31BEF32B21925700F7D538 /* WMGaugeViewStyle3D.m */,
 				BC31BEF52B21925700F7D538 /* WMGaugeViewStyleFlatThin.h */,
+				BC31BEF12B21925700F7D538 /* WMGaugeViewStyleFlatThin.m */,
 			);
 			path = WMGaugeView;
 			sourceTree = "<group>";

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_MemberLabelPad.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "institution_MemberLabelPad@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "institution_MemberLabelPad@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/Institution/Mine/institution_ToolTitlePad.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "institution_ToolTitlePad@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "institution_ToolTitlePad@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

@@ -13,6 +13,20 @@
 #define MAX_FUNCROWCOUNT (IS_IPAD ? 6 : 4)
 
 @interface InstitutionMineBodyView ()<UIScrollViewDelegate>
+@property (weak, nonatomic) IBOutlet UIImageView *memberTitle;
+@property (weak, nonatomic) IBOutlet UIImageView *toolTitle;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *memberTitleHeight;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *descTitleHeight;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *memberDetailWidth;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *toolDetailWidth;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *toolDescTop;
+
+@property (weak, nonatomic) IBOutlet UIImageView *memberBgView;
+@property (weak, nonatomic) IBOutlet UIImageView *toolBgView;
+
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *memberDescTop;
+@property (weak, nonatomic) IBOutlet UIView *memberDetailView;
+@property (weak, nonatomic) IBOutlet UIView *toolDetailView;
 
 @property (weak, nonatomic) IBOutlet UIImageView *bgImageView;
 
@@ -63,14 +77,28 @@
     
     if (IS_IPAD) {
         self.functionScrollView.contentSize = CGSizeMake((KPortraitWidth - 26), 74);
+        [self.memberTitle setImage:[UIImage imageNamed:@"institution_MemberLabelPad"]];
+        [self.toolTitle setImage:[UIImage imageNamed:@"institution_ToolTitlePad"]];
+        [self.memberDesc setFont:[UIFont systemFontOfSize:15.0f]];
+        [self.toolDesc setFont:[UIFont systemFontOfSize:15.0f]];
+        self.memberTitleHeight.constant = 20.0f;
+        self.descTitleHeight.constant = 20.0f;
+        self.memberDetailWidth.constant = 17.0f;
+        self.toolDetailWidth.constant = 17.0f;
+        self.memberDetailView.layer.cornerRadius = 8.5;
+        self.toolDetailView.layer.cornerRadius = 8.5;
+        self.toolDescTop.constant = 14.0f;
+        self.memberDescTop.constant = 14.0f;
     }
     else {
         self.functionScrollView.contentSize = CGSizeMake((KPortraitWidth - 26)*2, 74);
         [self.functionView addSubview:self.pageControl];
         self.pageControl.currentPage = 0;
     }
-    
-    
+    self.memberBgView.layer.maskedCorners = kCALayerMaxXMinYCorner | kCALayerMaxXMaxYCorner;
+    self.memberBgView.layer.cornerRadius = 10;
+    self.toolBgView.layer.maskedCorners = kCALayerMaxXMinYCorner | kCALayerMaxXMaxYCorner;
+    self.toolBgView.layer.cornerRadius = 10;
     [self.functionView addSubview:self.functionScrollView];
     [self.functionScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.bottom.mas_equalTo(self.functionView);

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

@@ -36,55 +36,63 @@
                                         <constraint firstAttribute="width" secondItem="eMm-hR-8Jd" secondAttribute="height" multiplier="71:76" id="jbS-f1-v2j"/>
                                     </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="wqN-QT-Cza">
-                                    <rect key="frame" x="10" y="41" width="0.0" height="17"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="17" id="iU7-Lx-WNZ"/>
-                                    </constraints>
-                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_MemberLabel" translatesAutoresizingMaskIntoConstraints="NO" id="ulF-FE-zms">
-                                    <rect key="frame" x="10" y="18" width="60" height="15"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="15" id="LJB-Wy-aXz"/>
-                                        <constraint firstAttribute="width" constant="60" id="le1-LY-y63"/>
-                                    </constraints>
-                                </imageView>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gzv-B6-KMx">
-                                    <rect key="frame" x="75" y="18.666666666666657" width="14" height="14"/>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7LQ-Oe-FFW">
+                                    <rect key="frame" x="10" y="18" width="179.66666666666666" height="40"/>
                                     <subviews>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_detail" translatesAutoresizingMaskIntoConstraints="NO" id="gPw-Ft-Q1L">
-                                            <rect key="frame" x="2" y="1" width="11" height="11"/>
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_MemberLabel" translatesAutoresizingMaskIntoConstraints="NO" id="ulF-FE-zms">
+                                            <rect key="frame" x="0.0" y="0.0" width="60" height="15"/>
                                         </imageView>
+                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wqN-QT-Cza">
+                                            <rect key="frame" x="0.0" y="23" width="0.0" height="17"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="17" id="iU7-Lx-WNZ"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gzv-B6-KMx">
+                                            <rect key="frame" x="66" y="0.66666666666665719" width="14" height="14"/>
+                                            <subviews>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_detail" translatesAutoresizingMaskIntoConstraints="NO" id="gPw-Ft-Q1L">
+                                                    <rect key="frame" x="1.6666666666666714" y="1.3333333333333428" width="11" height="11"/>
+                                                </imageView>
+                                            </subviews>
+                                            <color key="backgroundColor" red="0.93333333333333335" green="0.61568627450980395" blue="0.61568627450980395" alpha="1" colorSpace="calibratedRGB"/>
+                                            <constraints>
+                                                <constraint firstItem="gPw-Ft-Q1L" firstAttribute="centerX" secondItem="gzv-B6-KMx" secondAttribute="centerX" id="Bzn-RF-Wfz"/>
+                                                <constraint firstAttribute="width" constant="14" id="hor-fD-nS1"/>
+                                                <constraint firstItem="gPw-Ft-Q1L" firstAttribute="centerY" secondItem="gzv-B6-KMx" secondAttribute="centerY" id="nyb-dj-aK2"/>
+                                                <constraint firstAttribute="width" secondItem="gzv-B6-KMx" secondAttribute="height" multiplier="1:1" id="wCI-uh-53a"/>
+                                            </constraints>
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                    <real key="value" value="7"/>
+                                                </userDefinedRuntimeAttribute>
+                                            </userDefinedRuntimeAttributes>
+                                        </view>
                                     </subviews>
-                                    <color key="backgroundColor" red="0.93333333333333335" green="0.61568627450980395" blue="0.61568627450980395" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
-                                        <constraint firstItem="gPw-Ft-Q1L" firstAttribute="top" secondItem="gzv-B6-KMx" secondAttribute="top" constant="1" id="6ZJ-S5-5KK"/>
-                                        <constraint firstItem="gPw-Ft-Q1L" firstAttribute="leading" secondItem="gzv-B6-KMx" secondAttribute="leading" constant="2" id="6nD-Wn-hdC"/>
-                                        <constraint firstAttribute="width" constant="14" id="hor-fD-nS1"/>
-                                        <constraint firstAttribute="height" constant="14" id="sLW-HG-5Gk"/>
+                                        <constraint firstItem="ulF-FE-zms" firstAttribute="top" secondItem="7LQ-Oe-FFW" secondAttribute="top" id="BEH-WW-nWY"/>
+                                        <constraint firstItem="gzv-B6-KMx" firstAttribute="centerY" secondItem="ulF-FE-zms" secondAttribute="centerY" id="FX8-za-4T3"/>
+                                        <constraint firstItem="gzv-B6-KMx" firstAttribute="leading" secondItem="ulF-FE-zms" secondAttribute="trailing" constant="6" id="QFU-oS-whg"/>
+                                        <constraint firstItem="ulF-FE-zms" firstAttribute="leading" secondItem="7LQ-Oe-FFW" secondAttribute="leading" id="SHm-Zb-mnY"/>
+                                        <constraint firstItem="wqN-QT-Cza" firstAttribute="leading" secondItem="7LQ-Oe-FFW" secondAttribute="leading" id="Uso-48-H85"/>
+                                        <constraint firstItem="wqN-QT-Cza" firstAttribute="top" secondItem="ulF-FE-zms" secondAttribute="bottom" constant="8" id="ZG8-bi-Ei9"/>
+                                        <constraint firstAttribute="bottom" secondItem="wqN-QT-Cza" secondAttribute="bottom" id="tn8-hg-1GW"/>
                                     </constraints>
-                                    <userDefinedRuntimeAttributes>
-                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                            <real key="value" value="7"/>
-                                        </userDefinedRuntimeAttribute>
-                                    </userDefinedRuntimeAttributes>
                                 </view>
                             </subviews>
                             <color key="backgroundColor" red="1" green="0.92549019607843142" blue="0.92549019607843142" alpha="1" colorSpace="calibratedRGB"/>
                             <gestureRecognizers/>
                             <constraints>
-                                <constraint firstItem="ulF-FE-zms" firstAttribute="leading" secondItem="xUo-7q-bZ9" secondAttribute="leading" constant="10" id="1qw-mA-PfF"/>
-                                <constraint firstItem="wqN-QT-Cza" firstAttribute="top" secondItem="ulF-FE-zms" secondAttribute="bottom" constant="8" id="95h-25-bem"/>
+                                <constraint firstAttribute="trailing" secondItem="7LQ-Oe-FFW" secondAttribute="trailing" id="7bt-I1-HKE"/>
                                 <constraint firstAttribute="height" constant="76" id="JXQ-rr-Pif"/>
-                                <constraint firstItem="gzv-B6-KMx" firstAttribute="leading" secondItem="ulF-FE-zms" secondAttribute="trailing" constant="5" id="MhK-Gc-Hgs"/>
                                 <constraint firstAttribute="bottom" secondItem="eMm-hR-8Jd" secondAttribute="bottom" id="RIX-Mx-KX8"/>
                                 <constraint firstItem="eMm-hR-8Jd" firstAttribute="top" secondItem="xUo-7q-bZ9" secondAttribute="top" id="UQA-LY-oIg"/>
-                                <constraint firstItem="wqN-QT-Cza" firstAttribute="leading" secondItem="ulF-FE-zms" secondAttribute="leading" id="Yt0-KZ-osA"/>
-                                <constraint firstItem="ulF-FE-zms" firstAttribute="centerY" secondItem="xUo-7q-bZ9" secondAttribute="centerY" constant="-12.5" id="ePQ-Ho-rqZ"/>
-                                <constraint firstItem="gzv-B6-KMx" firstAttribute="centerY" secondItem="ulF-FE-zms" secondAttribute="centerY" id="fkg-g9-ZoY"/>
+                                <constraint firstItem="7LQ-Oe-FFW" firstAttribute="leading" secondItem="xUo-7q-bZ9" secondAttribute="leading" constant="10" id="dZX-7d-P3Y"/>
+                                <constraint firstItem="7LQ-Oe-FFW" firstAttribute="centerY" secondItem="xUo-7q-bZ9" secondAttribute="centerY" id="ep9-2J-et0"/>
                                 <constraint firstAttribute="trailing" secondItem="eMm-hR-8Jd" secondAttribute="trailing" id="vfg-r9-fen"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
@@ -107,55 +115,63 @@
                                         <constraint firstAttribute="height" constant="76" id="u7D-m9-NQa"/>
                                     </constraints>
                                 </imageView>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_ToolTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2tE-BT-KvU">
-                                    <rect key="frame" x="10" y="18" width="60" height="15"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="60" id="oCm-Do-F6Q"/>
-                                        <constraint firstAttribute="height" constant="15" id="vTb-dr-nak"/>
-                                    </constraints>
-                                </imageView>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="J15-HR-2eh">
-                                    <rect key="frame" x="75.000000000000028" y="18.666666666666657" width="14" height="14"/>
+                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TZJ-G9-fyg">
+                                    <rect key="frame" x="10" y="18" width="179.33333333333334" height="40"/>
                                     <subviews>
-                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_detail" translatesAutoresizingMaskIntoConstraints="NO" id="Ac9-PU-LTL">
-                                            <rect key="frame" x="2" y="1" width="11" height="11"/>
+                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_ToolTitle" translatesAutoresizingMaskIntoConstraints="NO" id="2tE-BT-KvU">
+                                            <rect key="frame" x="0.0" y="0.0" width="60" height="15"/>
                                         </imageView>
+                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="J15-HR-2eh">
+                                            <rect key="frame" x="66.000000000000028" y="0.66666666666665719" width="14" height="14"/>
+                                            <subviews>
+                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_detail" translatesAutoresizingMaskIntoConstraints="NO" id="Ac9-PU-LTL">
+                                                    <rect key="frame" x="1.3333333333333144" y="1.3333333333333428" width="11" height="11"/>
+                                                </imageView>
+                                            </subviews>
+                                            <color key="backgroundColor" red="0.94509803921568625" green="0.77647058823529413" blue="0.5490196078431373" alpha="1" colorSpace="calibratedRGB"/>
+                                            <constraints>
+                                                <constraint firstAttribute="width" secondItem="J15-HR-2eh" secondAttribute="height" multiplier="1:1" id="094-aj-xEk"/>
+                                                <constraint firstAttribute="width" constant="14" id="4Tm-NG-jfK"/>
+                                                <constraint firstItem="Ac9-PU-LTL" firstAttribute="centerX" secondItem="J15-HR-2eh" secondAttribute="centerX" id="iOm-ea-lrQ"/>
+                                                <constraint firstItem="Ac9-PU-LTL" firstAttribute="centerY" secondItem="J15-HR-2eh" secondAttribute="centerY" id="wMh-bx-0jr"/>
+                                            </constraints>
+                                            <userDefinedRuntimeAttributes>
+                                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                    <real key="value" value="7"/>
+                                                </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="6jm-cm-okg">
+                                            <rect key="frame" x="0.0" y="23" width="0.0" height="17"/>
+                                            <constraints>
+                                                <constraint firstAttribute="height" constant="17" id="rEb-rX-P4l"/>
+                                            </constraints>
+                                            <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                            <nil key="highlightedColor"/>
+                                        </label>
                                     </subviews>
-                                    <color key="backgroundColor" red="0.94509803921568625" green="0.77647058823529413" blue="0.5490196078431373" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                     <constraints>
-                                        <constraint firstAttribute="width" constant="14" id="4Tm-NG-jfK"/>
-                                        <constraint firstItem="Ac9-PU-LTL" firstAttribute="leading" secondItem="J15-HR-2eh" secondAttribute="leading" constant="2" id="9oE-qw-yzs"/>
-                                        <constraint firstAttribute="height" constant="14" id="GQ2-QL-Jfh"/>
-                                        <constraint firstItem="Ac9-PU-LTL" firstAttribute="top" secondItem="J15-HR-2eh" secondAttribute="top" constant="1" id="pk2-sl-Ile"/>
+                                        <constraint firstItem="J15-HR-2eh" firstAttribute="centerY" secondItem="2tE-BT-KvU" secondAttribute="centerY" id="6To-BR-eHh"/>
+                                        <constraint firstItem="6jm-cm-okg" firstAttribute="top" secondItem="2tE-BT-KvU" secondAttribute="bottom" constant="8" id="D3I-jD-BGx"/>
+                                        <constraint firstItem="2tE-BT-KvU" firstAttribute="top" secondItem="TZJ-G9-fyg" secondAttribute="top" id="IHk-tp-kXb"/>
+                                        <constraint firstItem="J15-HR-2eh" firstAttribute="leading" secondItem="2tE-BT-KvU" secondAttribute="trailing" constant="6" id="bev-fQ-ud0"/>
+                                        <constraint firstItem="6jm-cm-okg" firstAttribute="leading" secondItem="TZJ-G9-fyg" secondAttribute="leading" id="eg1-sO-s9v"/>
+                                        <constraint firstItem="2tE-BT-KvU" firstAttribute="leading" secondItem="TZJ-G9-fyg" secondAttribute="leading" id="gh7-GZ-bqt"/>
+                                        <constraint firstAttribute="bottom" secondItem="6jm-cm-okg" secondAttribute="bottom" id="p15-Mr-pYH"/>
                                     </constraints>
-                                    <userDefinedRuntimeAttributes>
-                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                            <real key="value" value="7"/>
-                                        </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="6jm-cm-okg">
-                                    <rect key="frame" x="10" y="41" width="0.0" height="17"/>
-                                    <constraints>
-                                        <constraint firstAttribute="height" constant="17" id="rEb-rX-P4l"/>
-                                    </constraints>
-                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
                             </subviews>
                             <color key="backgroundColor" red="1" green="0.94901960784313721" blue="0.88627450980392153" alpha="1" colorSpace="calibratedRGB"/>
                             <gestureRecognizers/>
                             <constraints>
-                                <constraint firstItem="2tE-BT-KvU" firstAttribute="leading" secondItem="Mxr-u3-Zhb" secondAttribute="leading" constant="10" id="BZH-3x-xH4"/>
                                 <constraint firstAttribute="trailing" secondItem="gzb-kF-p1c" secondAttribute="trailing" id="ESk-qr-fYg"/>
-                                <constraint firstItem="6jm-cm-okg" firstAttribute="top" secondItem="2tE-BT-KvU" secondAttribute="bottom" constant="8" id="IR0-uQ-34a"/>
-                                <constraint firstItem="J15-HR-2eh" firstAttribute="centerY" secondItem="2tE-BT-KvU" secondAttribute="centerY" id="IYN-vi-0W1"/>
-                                <constraint firstItem="6jm-cm-okg" firstAttribute="leading" secondItem="2tE-BT-KvU" secondAttribute="leading" id="MAC-Qx-y6j"/>
-                                <constraint firstItem="2tE-BT-KvU" firstAttribute="centerY" secondItem="Mxr-u3-Zhb" secondAttribute="centerY" constant="-12.5" id="P97-gC-SHb"/>
+                                <constraint firstItem="TZJ-G9-fyg" firstAttribute="centerY" secondItem="Mxr-u3-Zhb" secondAttribute="centerY" id="ecf-VJ-1h4"/>
                                 <constraint firstItem="gzb-kF-p1c" firstAttribute="top" secondItem="Mxr-u3-Zhb" secondAttribute="top" id="eym-Nu-zMb"/>
-                                <constraint firstItem="J15-HR-2eh" firstAttribute="leading" secondItem="2tE-BT-KvU" secondAttribute="trailing" constant="5" id="mvC-7N-cR4"/>
+                                <constraint firstAttribute="trailing" secondItem="TZJ-G9-fyg" secondAttribute="trailing" id="gXr-A0-3c7"/>
                                 <constraint firstAttribute="bottom" secondItem="gzb-kF-p1c" secondAttribute="bottom" id="oe7-sm-PW4"/>
+                                <constraint firstItem="TZJ-G9-fyg" firstAttribute="leading" secondItem="Mxr-u3-Zhb" secondAttribute="leading" constant="10" id="xPc-HU-W01"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -167,15 +183,15 @@
                             </connections>
                         </view>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_MemberImage" translatesAutoresizingMaskIntoConstraints="NO" id="x5p-j7-s1g">
-                            <rect key="frame" x="131.66666666666666" y="179" width="77" height="66"/>
+                            <rect key="frame" x="131.66666666666666" y="180" width="77" height="82"/>
                             <constraints>
-                                <constraint firstAttribute="width" secondItem="x5p-j7-s1g" secondAttribute="height" multiplier="7:6" id="vu0-su-xVB"/>
+                                <constraint firstAttribute="width" secondItem="x5p-j7-s1g" secondAttribute="height" multiplier="77:82" id="rFE-XH-yyk"/>
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="institution_ToolImage" translatesAutoresizingMaskIntoConstraints="NO" id="Vt5-8U-7eH">
-                            <rect key="frame" x="329" y="181" width="73" height="66"/>
+                            <rect key="frame" x="327" y="180" width="77" height="82"/>
                             <constraints>
-                                <constraint firstAttribute="width" secondItem="Vt5-8U-7eH" secondAttribute="height" multiplier="143:129" id="nRl-ov-rVf"/>
+                                <constraint firstAttribute="width" secondItem="Vt5-8U-7eH" secondAttribute="height" multiplier="77:82" id="3zQ-TD-y7H"/>
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="insititution_mine_topLayer" translatesAutoresizingMaskIntoConstraints="NO" id="98L-RE-L5b">
@@ -276,37 +292,37 @@
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
+                        <constraint firstItem="xUo-7q-bZ9" firstAttribute="top" secondItem="x5p-j7-s1g" secondAttribute="top" constant="3" id="02Y-qP-6kp"/>
                         <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="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="height" secondItem="xUo-7q-bZ9" secondAttribute="height" id="5DA-7K-Qq8"/>
                         <constraint firstItem="Mxr-u3-Zhb" firstAttribute="leading" secondItem="xUo-7q-bZ9" secondAttribute="trailing" constant="9" id="8zA-Aj-WPH"/>
                         <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="Mxr-u3-Zhb" firstAttribute="centerY" secondItem="x5p-j7-s1g" secondAttribute="centerY" id="KWG-ZR-X2b"/>
                         <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="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 firstItem="Vt5-8U-7eH" firstAttribute="trailing" secondItem="Mxr-u3-Zhb" secondAttribute="trailing" constant="3" id="X4F-SV-XOG"/>
                         <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="Vt5-8U-7eH" firstAttribute="top" secondItem="Mxr-u3-Zhb" secondAttribute="top" constant="-2" id="acD-1j-GfW"/>
+                        <constraint firstItem="Vt5-8U-7eH" firstAttribute="top" secondItem="Mxr-u3-Zhb" secondAttribute="top" constant="-3" id="aom-8J-O58"/>
                         <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 firstItem="xUo-7q-bZ9" firstAttribute="trailing" secondItem="x5p-j7-s1g" secondAttribute="trailing" constant="-6" id="gAs-nb-RSc"/>
                         <constraint firstAttribute="trailing" secondItem="A30-6f-0Ca" secondAttribute="trailing" id="gSQ-A1-hjP"/>
-                        <constraint firstItem="x5p-j7-s1g" firstAttribute="bottom" secondItem="xUo-7q-bZ9" secondAttribute="bottom" constant="-14" id="jq3-eD-J5D"/>
                         <constraint firstAttribute="bottom" secondItem="Mxr-u3-Zhb" secondAttribute="bottom" constant="16" id="l7Z-BD-Yt1"/>
                         <constraint firstItem="A30-6f-0Ca" firstAttribute="top" secondItem="Nbm-ze-ouR" secondAttribute="top" id="pce-4x-814"/>
-                        <constraint firstItem="Vt5-8U-7eH" firstAttribute="bottom" secondItem="Mxr-u3-Zhb" secondAttribute="bottom" constant="-12" id="qMY-gb-AD0"/>
+                        <constraint firstItem="Vt5-8U-7eH" firstAttribute="centerY" secondItem="Mxr-u3-Zhb" secondAttribute="centerY" id="qX1-Hz-vFn"/>
                         <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"/>
                     </constraints>
@@ -610,16 +626,28 @@
                 <outlet property="bgImageHeight" destination="NsE-ha-gB2" id="tgE-6b-AmN"/>
                 <outlet property="bgImageView" destination="A30-6f-0Ca" id="AA9-Qa-ipk"/>
                 <outlet property="bgImageWidth" destination="HAe-7J-lwa" id="CWe-6R-yNH"/>
-                <outlet property="firstTitleLeft" destination="1qw-mA-PfF" id="fDH-Cr-PrS"/>
+                <outlet property="descTitleHeight" destination="rEb-rX-P4l" id="lqK-Rq-HY5"/>
+                <outlet property="firstTitleLeft" destination="dZX-7d-P3Y" id="303-09-SDz"/>
                 <outlet property="functionView" destination="Akl-gJ-5NJ" id="aPS-KN-edW"/>
+                <outlet property="memberBgView" destination="eMm-hR-8Jd" id="pvH-wh-LTw"/>
                 <outlet property="memberDesc" destination="wqN-QT-Cza" id="V4p-qw-nCy"/>
+                <outlet property="memberDescTop" destination="ZG8-bi-Ei9" id="FSk-Vk-hiZ"/>
+                <outlet property="memberDetailView" destination="gzv-B6-KMx" id="W7H-pB-Vq1"/>
+                <outlet property="memberDetailWidth" destination="hor-fD-nS1" id="Bio-y2-e9I"/>
                 <outlet property="memberHeight" destination="JXQ-rr-Pif" id="XtP-tC-1Cw"/>
                 <outlet property="memberImg" destination="j1E-FX-DSh" id="Qcd-Se-bsQ"/>
-                <outlet property="secondTitleLeft" destination="BZH-3x-xH4" id="EM4-kk-oz9"/>
+                <outlet property="memberTitle" destination="ulF-FE-zms" id="Tax-Qd-QXd"/>
+                <outlet property="memberTitleHeight" destination="iU7-Lx-WNZ" id="AS3-zv-9sG"/>
+                <outlet property="secondTitleLeft" destination="xPc-HU-W01" id="Gj1-lx-Xck"/>
                 <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="toolBgView" destination="gzb-kF-p1c" id="Taf-oG-VOe"/>
                 <outlet property="toolDesc" destination="6jm-cm-okg" id="6Cd-Wp-5de"/>
+                <outlet property="toolDescTop" destination="D3I-jD-BGx" id="KRW-EW-VJG"/>
+                <outlet property="toolDetailView" destination="J15-HR-2eh" id="tzc-YJ-jhT"/>
+                <outlet property="toolDetailWidth" destination="4Tm-NG-jfK" id="O27-Iz-Ibb"/>
+                <outlet property="toolTitle" destination="2tE-BT-KvU" id="a8i-Xh-ceh"/>
                 <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"/>
@@ -697,9 +725,9 @@
         <image name="insititution_mine_topLayer" width="129" height="114"/>
         <image name="insititution_privacy" width="22" height="22"/>
         <image name="insititution_userAgreement" width="22" height="22"/>
-        <image name="institution_MemberImage" width="154" height="132"/>
+        <image name="institution_MemberImage" width="154" height="164"/>
         <image name="institution_MemberLabel" width="60" height="15"/>
-        <image name="institution_ToolImage" width="143" height="129"/>
+        <image name="institution_ToolImage" width="154" height="164"/>
         <image name="institution_ToolTitle" width="60" height="15"/>
         <image name="institution_detail" width="11" height="11"/>
         <image name="institution_mineMemberBg" width="71" height="76"/>

KulexiuForStudent/KulexiuForStudent/Module/Chat/GroupNotice/View/GroupNoticeCell.xib

@@ -33,8 +33,8 @@
                                     </userDefinedRuntimeAttribute>
                                 </userDefinedRuntimeAttributes>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="8A8A8A" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vad-UL-yLE">
-                                <rect key="frame" x="86" y="47" width="54" height="20"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vad-UL-yLE">
+                                <rect key="frame" x="86" y="47" width="0.0" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="G1H-uK-NYV"/>
                                 </constraints>
@@ -43,7 +43,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="置顶" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fse-Bd-Rui">
-                                <rect key="frame" x="146" y="47" width="40" height="20"/>
+                                <rect key="frame" x="92" y="47" width="40" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="eAd-Zt-CN7"/>
                                     <constraint firstAttribute="width" constant="40" id="gtu-Jt-duR"/>
@@ -89,11 +89,11 @@
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FWq-QF-ONl">
                                 <rect key="frame" x="16" y="156" width="301" height="0.0"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="sfsfasf" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2c3-yX-YxS">
+                            <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="86" y="20" width="187" height="25"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="25" id="dMw-tJ-YFP"/>

KulexiuForStudent/KulexiuForStudent/Module/Course/AccompanyCourse/View/AccompanyRemarkCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" 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="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
         <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"/>
@@ -45,7 +45,7 @@
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W9z-ye-Ww2">
                                         <rect key="frame" x="0.0" y="0.0" width="327" height="159"/>
                                         <subviews>
-                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="homework_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="44c-14-lXI">
+                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="homework_eva" translatesAutoresizingMaskIntoConstraints="NO" id="44c-14-lXI">
                                                 <rect key="frame" x="33" y="40.5" width="79" height="78"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="78" id="3IW-Vv-GOP"/>
@@ -131,7 +131,7 @@
     </objects>
     <resources>
         <image name="accell_left" width="4" height="18"/>
-        <image name="homework_placeholder" width="79" height="78"/>
+        <image name="homework_eva" width="79" height="78"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>