Browse Source

老师我的页面修改

Steven 8 months ago
parent
commit
7bddaa2548

+ 2 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineActionView.h

@@ -44,7 +44,8 @@ typedef NS_ENUM(NSInteger, MINEVIEWTYPE) {
 };
 
 #define FUNCTIONVIEW_WIDTH (80)
-#define FUNCTIONVIEW_HEIGHT (80)
+#define FUNCTIONVIEW_HEIGHT (60)
+#define FUNCTIONVIEW_SPACE (14)
 
 typedef void(^MineViewCallback)(MINEVIEWTYPE type);
 

+ 5 - 5
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineActionView.xib

@@ -10,18 +10,18 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MineActionView">
-            <rect key="frame" x="0.0" y="0.0" width="80" height="80"/>
+            <rect key="frame" x="0.0" y="0.0" width="80" height="60"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="rgU-Ad-ttb">
-                    <rect key="frame" x="20" y="10" width="40" height="40"/>
+                    <rect key="frame" x="20" y="0.0" width="40" height="40"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="40" id="1Mc-H5-fOL"/>
                         <constraint firstAttribute="width" constant="40" id="upq-Bx-Sia"/>
                     </constraints>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="趣纠课设置" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Hm-Gs-bFT">
-                    <rect key="frame" x="4" y="52" width="72" height="18"/>
+                    <rect key="frame" x="4" y="42" width="72" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="X9D-MS-Pox"/>
                     </constraints>
@@ -30,7 +30,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kui-vi-ON1">
-                    <rect key="frame" x="0.0" y="10" width="80" height="60"/>
+                    <rect key="frame" x="0.0" y="0.0" width="80" height="60"/>
                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                     <connections>
                         <action selector="functionAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="LBg-GX-nfb"/>
@@ -43,7 +43,7 @@
                 <constraint firstItem="5Hm-Gs-bFT" firstAttribute="top" secondItem="rgU-Ad-ttb" secondAttribute="bottom" constant="2" id="8JI-tM-Vx7"/>
                 <constraint firstItem="5Hm-Gs-bFT" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="4" id="AL3-eq-PFa"/>
                 <constraint firstAttribute="trailing" secondItem="Kui-vi-ON1" secondAttribute="trailing" id="Hgm-XB-i3N"/>
-                <constraint firstItem="rgU-Ad-ttb" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="U7T-ff-7fV"/>
+                <constraint firstItem="rgU-Ad-ttb" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="U7T-ff-7fV"/>
                 <constraint firstAttribute="trailing" secondItem="5Hm-Gs-bFT" secondAttribute="trailing" constant="4" id="VUb-hi-3pl"/>
                 <constraint firstItem="rgU-Ad-ttb" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="q6X-vg-l7z"/>
                 <constraint firstItem="rgU-Ad-ttb" firstAttribute="top" secondItem="Kui-vi-ON1" secondAttribute="top" id="uOs-Ou-hDh"/>

+ 11 - 5
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineFunctionView.m

@@ -64,7 +64,7 @@
         if (skipTicket) {
             viewIndex -= 1;
         }
-        functionButton.frame = CGRectMake(space + viewIndex % 4 * (space + FUNCTIONVIEW_WIDTH), FUNCTIONVIEW_WIDTH * (viewIndex / 4), FUNCTIONVIEW_WIDTH, FUNCTIONVIEW_HEIGHT);
+        functionButton.frame = CGRectMake(space + viewIndex % 4 * (space + FUNCTIONVIEW_WIDTH), (FUNCTIONVIEW_HEIGHT + FUNCTIONVIEW_SPACE) * (viewIndex / 4), FUNCTIONVIEW_WIDTH, FUNCTIONVIEW_HEIGHT);
         [self.containerView addSubview:functionButton];
     }
 }
@@ -76,12 +76,18 @@
     }
 }
 
-
 - (CGFloat)getViewHeight {
-    if (self.isMember && self.isSettlement) {
-        return 333.0f;
+   
+    NSInteger buttonCount = self.titleArray.count;
+    if (self.isMember == NO) {
+        buttonCount -= 1;
+    }
+    if (self.isSettlement == NO) {
+        buttonCount -= 1;
     }
-    return 232.0f;
+    NSInteger addRow = buttonCount % 4 == 0 ? 0 : 1;
+    NSInteger totalLine = (buttonCount / 4 + addRow);
+    return totalLine * FUNCTIONVIEW_HEIGHT + (totalLine - 1) * FUNCTIONVIEW_SPACE + 92;
 }
 
 - (NSMutableArray *)imageArray {

+ 7 - 7
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineFunctionView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,25 +18,25 @@
                     <rect key="frame" x="14" y="0.0" width="386" height="311"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="常用工具" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ui4-g9-9PK">
-                            <rect key="frame" x="15" y="15" width="66" height="22"/>
+                            <rect key="frame" x="15" y="15" width="64" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="22" id="IUG-Ha-WdT"/>
                             </constraints>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <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="bvI-Ts-PIq">
-                            <rect key="frame" x="0.0" y="39" width="386" height="270"/>
+                            <rect key="frame" x="0.0" y="52" width="386" height="229"/>
                             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         </view>
                     </subviews>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
-                        <constraint firstItem="bvI-Ts-PIq" firstAttribute="top" secondItem="Ui4-g9-9PK" secondAttribute="bottom" constant="2" id="JLW-8P-MK8"/>
+                        <constraint firstItem="bvI-Ts-PIq" firstAttribute="top" secondItem="Ui4-g9-9PK" secondAttribute="bottom" constant="15" id="JLW-8P-MK8"/>
                         <constraint firstItem="Ui4-g9-9PK" firstAttribute="leading" secondItem="udr-ER-Hx8" secondAttribute="leading" constant="15" id="Uux-HL-mf0"/>
                         <constraint firstItem="bvI-Ts-PIq" firstAttribute="leading" secondItem="udr-ER-Hx8" secondAttribute="leading" id="bc5-6r-wX2"/>
-                        <constraint firstAttribute="bottom" secondItem="bvI-Ts-PIq" secondAttribute="bottom" constant="2" id="jNR-7e-N7R"/>
+                        <constraint firstAttribute="bottom" secondItem="bvI-Ts-PIq" secondAttribute="bottom" constant="30" id="jNR-7e-N7R"/>
                         <constraint firstAttribute="trailing" secondItem="bvI-Ts-PIq" secondAttribute="trailing" id="rCL-8d-7w1"/>
                         <constraint firstItem="Ui4-g9-9PK" firstAttribute="top" secondItem="udr-ER-Hx8" secondAttribute="top" constant="15" id="wkM-TY-7p6"/>
                     </constraints>

+ 28 - 56
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineHeadView.m

@@ -18,14 +18,8 @@
 @property (nonatomic, copy) MineViewCallback callback;
 
 
-@property (weak, nonatomic) IBOutlet KSStarView *starView;
-
 
 @property (weak, nonatomic) IBOutlet UIImageView *viperImage;
-@property (weak, nonatomic) IBOutlet UIImageView *styleImage;
-@property (weak, nonatomic) IBOutlet UIImageView *videoImage;
-@property (weak, nonatomic) IBOutlet UIImageView *liveImage;
-@property (weak, nonatomic) IBOutlet UIImageView *musicImage;
 
 @property (weak, nonatomic) IBOutlet UIImageView *firstImage;
 @property (weak, nonatomic) IBOutlet UIImageView *secondImage;
@@ -46,7 +40,6 @@
 }
 
 - (void)configMessage:(UserInfo *)infoMessage {
-    NSArray *tagArray = [infoMessage.tag componentsSeparatedByString:@","];
     NSString *viperImage = @"";
     NSString *vipType = infoMessage.userVip.vipType;
     if ([vipType isEqualToString:@"PERMANENT_SVIP"] || [vipType isEqualToString:@"SVIP"]) {
@@ -64,60 +57,39 @@
     
     [self.viperImage setImage:[UIImage imageNamed:viperImage]];
     
-    [self.styleImage setImage:[UIImage imageNamed:@"mineStyle_nomal"]];
-    [self.videoImage setImage:[UIImage imageNamed:@"mineVideo_nomal"]];
-    [self.liveImage setImage:[UIImage imageNamed:@"mineLive_nomal"]];
-    [self.musicImage setImage:[UIImage imageNamed:@"mineMusic_nomal"]];
-    
     BOOL hasDegreeAuth = infoMessage.degreeFlag;
     BOOL hasTeacherAuth = infoMessage.teacherFlag;
-    
-    for (NSString *tagString in tagArray) {
-        if ([tagString isEqualToString:@"STYLE"]) {
-            [self.styleImage setImage:[UIImage imageNamed:@"mineStyle_active"]];
-        }
-        else if ([tagString isEqualToString:@"VIDEO"]) {
-            [self.videoImage setImage:[UIImage imageNamed:@"mineVideo_active"]];
-        }
-        else if ([tagString isEqualToString:@"LIVE"]) {
-            [self.liveImage setImage:[UIImage imageNamed:@"mineLive_active"]];
-        }
-        else if ([tagString isEqualToString:@"MUSIC"]) {
-            [self.musicImage setImage:[UIImage imageNamed:@"mineMusic_active"]];
-        }
-    }
-    if (hasDegreeAuth && hasTeacherAuth) {
-        [self.firstImage setImage:[UIImage imageNamed:@"education_icon"]];
-        self.firstImage.hidden = NO;
-        self.firstImageWidth.constant = 39.0f;
-        [self.secondImage setImage:[UIImage imageNamed:@"qualification_icon"]];
-        self.secondImage.hidden = NO;
-        self.secondImageWidth.constant = 39.0f;
-    }
-    else {
-        if (hasDegreeAuth) {
-            [self.firstImage setImage:[UIImage imageNamed:@"education_icon"]];
-            self.firstImage.hidden = NO;
-            self.firstImageWidth.constant = 39.0f;
-            self.secondImage.hidden = YES;
-            self.secondImageWidth.constant = 0.0f;
-        }
-        else if (hasTeacherAuth) {
-            [self.firstImage setImage:[UIImage imageNamed:@"qualification_icon"]];
-            self.firstImage.hidden = NO;
-            self.firstImageWidth.constant = 39.0f;
-            self.secondImage.hidden = YES;
-            self.secondImageWidth.constant = 0.0f;
-        }
-        else {
+    // 学历标识去掉
+//    if (hasDegreeAuth && hasTeacherAuth) {
+//        [self.firstImage setImage:[UIImage imageNamed:@"education_icon"]];
+//        self.firstImage.hidden = NO;
+//        self.firstImageWidth.constant = 39.0f;
+//        [self.secondImage setImage:[UIImage imageNamed:@"qualification_icon"]];
+//        self.secondImage.hidden = NO;
+//        self.secondImageWidth.constant = 39.0f;
+//    }
+//    else {
+//        if (hasDegreeAuth) {
+//            [self.firstImage setImage:[UIImage imageNamed:@"education_icon"]];
+//            self.firstImage.hidden = NO;
+//            self.firstImageWidth.constant = 39.0f;
+//            self.secondImage.hidden = YES;
+//            self.secondImageWidth.constant = 0.0f;
+//        }
+//        else if (hasTeacherAuth) {
+//            [self.firstImage setImage:[UIImage imageNamed:@"qualification_icon"]];
+//            self.firstImage.hidden = NO;
+//            self.firstImageWidth.constant = 39.0f;
+//            self.secondImage.hidden = YES;
+//            self.secondImageWidth.constant = 0.0f;
+//        }
+//        else {
             self.firstImage.hidden = YES;
             self.firstImageWidth.constant = 0.0f;
             self.secondImage.hidden = YES;
             self.secondImageWidth.constant = 0.0f;
-        }
-    }
-    
-    self.starView.rate = infoMessage.starGrade / 5.0f;
+//        }
+//    }
     
     if (![NSString isEmptyString:infoMessage.heardUrl]) {
         [self.userAvatal displayImageWithUrl:[NSURL URLWithString:[infoMessage.heardUrl getUrlEndcodeString]] placeholder:self.preDisplayImage defaultImage:[UIImage imageNamed:TEACHER_AVATAR] callback:^(UIImage * _Nonnull image) {
@@ -157,7 +129,7 @@
 }
 
 - (CGFloat)getViewHeight {
-    return 110 + 13;
+    return 90;
 }
 /*
 // Only override drawRect: if you perform custom drawing.

+ 6 - 97
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineHeadView.xib

@@ -10,13 +10,13 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MineHeadView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="110"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="90"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cjp-6k-puJ">
-                    <rect key="frame" x="0.0" y="0.0" width="414" height="110"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="90"/>
                     <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default_avatal" translatesAutoresizingMaskIntoConstraints="NO" id="Qfc-m1-p6a">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="Qfc-m1-p6a">
                             <rect key="frame" x="15" y="5" width="64" height="64"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="64" id="UVg-YJ-Enj"/>
@@ -40,30 +40,6 @@
                             <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="评分:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bTO-A2-pYt">
-                            <rect key="frame" x="270" y="89" width="30" height="15"/>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
-                            <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fw3-T6-lx2">
-                            <rect key="frame" x="300" y="87" width="95" height="19"/>
-                            <subviews>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Akw-bX-gxM" customClass="KSStarView">
-                                    <rect key="frame" x="0.0" y="0.0" width="95" height="19"/>
-                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                </view>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <constraints>
-                                <constraint firstAttribute="trailing" secondItem="Akw-bX-gxM" secondAttribute="trailing" id="69U-Qp-5Zh"/>
-                                <constraint firstAttribute="height" constant="19" id="9ZC-bv-8Vc"/>
-                                <constraint firstItem="Akw-bX-gxM" firstAttribute="top" secondItem="fw3-T6-lx2" secondAttribute="top" id="Jzn-yt-DzU"/>
-                                <constraint firstAttribute="width" constant="95" id="O02-8k-4zE"/>
-                                <constraint firstAttribute="bottom" secondItem="Akw-bX-gxM" secondAttribute="bottom" id="T2O-dK-Z1U"/>
-                                <constraint firstItem="Akw-bX-gxM" firstAttribute="leading" secondItem="fw3-T6-lx2" secondAttribute="leading" id="g5m-PF-SAV"/>
-                            </constraints>
-                        </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="v0U-gH-2rd">
                             <rect key="frame" x="15" y="5" width="64" height="64"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
@@ -71,56 +47,6 @@
                                 <action selector="toUserCenter:" destination="iN0-l3-epB" eventType="touchUpInside" id="ydh-hD-hMz"/>
                             </connections>
                         </button>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1mz-7i-YiM">
-                            <rect key="frame" x="53" y="84.5" width="84" height="24"/>
-                            <subviews>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineStyle_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="iwC-il-8cq">
-                                    <rect key="frame" x="4" y="4" width="16" height="16"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="16" id="VKS-CT-eP2"/>
-                                        <constraint firstAttribute="height" constant="16" id="kMA-T5-RVA"/>
-                                    </constraints>
-                                </imageView>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineVideo_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="73K-iM-5zb">
-                                    <rect key="frame" x="24" y="4" width="16" height="16"/>
-                                </imageView>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineLive_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="f2I-A5-dax">
-                                    <rect key="frame" x="44" y="4" width="16" height="16"/>
-                                </imageView>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineMusic_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="ZHY-XC-hwf">
-                                    <rect key="frame" x="64" y="4" width="16" height="16"/>
-                                </imageView>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <gestureRecognizers/>
-                            <constraints>
-                                <constraint firstItem="f2I-A5-dax" firstAttribute="leading" secondItem="73K-iM-5zb" secondAttribute="trailing" constant="4" id="5kG-8t-ZJz"/>
-                                <constraint firstAttribute="height" constant="24" id="9kA-G9-yRN"/>
-                                <constraint firstItem="73K-iM-5zb" firstAttribute="width" secondItem="iwC-il-8cq" secondAttribute="width" id="9rs-sa-C5Z"/>
-                                <constraint firstItem="ZHY-XC-hwf" firstAttribute="height" secondItem="iwC-il-8cq" secondAttribute="height" id="StP-W9-kiI"/>
-                                <constraint firstItem="ZHY-XC-hwf" firstAttribute="leading" secondItem="f2I-A5-dax" secondAttribute="trailing" constant="4" id="TOM-Dw-R44"/>
-                                <constraint firstItem="f2I-A5-dax" firstAttribute="centerY" secondItem="iwC-il-8cq" secondAttribute="centerY" id="W1O-8z-tum"/>
-                                <constraint firstAttribute="trailing" secondItem="ZHY-XC-hwf" secondAttribute="trailing" constant="4" id="bLa-T1-W03"/>
-                                <constraint firstItem="f2I-A5-dax" firstAttribute="height" secondItem="iwC-il-8cq" secondAttribute="height" id="d0H-x7-TxV"/>
-                                <constraint firstItem="73K-iM-5zb" firstAttribute="centerY" secondItem="iwC-il-8cq" secondAttribute="centerY" id="g1Z-qG-YS5"/>
-                                <constraint firstItem="ZHY-XC-hwf" firstAttribute="width" secondItem="iwC-il-8cq" secondAttribute="width" id="gZ8-6x-FmP"/>
-                                <constraint firstItem="73K-iM-5zb" firstAttribute="leading" secondItem="iwC-il-8cq" secondAttribute="trailing" constant="4" id="gZD-Hp-q0O"/>
-                                <constraint firstItem="f2I-A5-dax" firstAttribute="width" secondItem="iwC-il-8cq" secondAttribute="width" id="oUi-yP-v42"/>
-                                <constraint firstItem="73K-iM-5zb" firstAttribute="height" secondItem="iwC-il-8cq" secondAttribute="height" id="pd4-SM-mBK"/>
-                                <constraint firstItem="iwC-il-8cq" firstAttribute="centerY" secondItem="1mz-7i-YiM" secondAttribute="centerY" id="u1b-X5-LFk"/>
-                                <constraint firstItem="ZHY-XC-hwf" firstAttribute="centerY" secondItem="iwC-il-8cq" secondAttribute="centerY" id="ui0-SN-KEi"/>
-                                <constraint firstItem="iwC-il-8cq" firstAttribute="leading" secondItem="1mz-7i-YiM" secondAttribute="leading" constant="4" id="zrC-bc-aOA"/>
-                            </constraints>
-                            <connections>
-                                <outletCollection property="gestureRecognizers" destination="Iir-fe-oYc" appends="YES" id="R5q-oq-qVK"/>
-                            </connections>
-                        </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="勋章:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cgZ-9q-1D4">
-                            <rect key="frame" x="23" y="89" width="30" height="15"/>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
-                            <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="HQj-mY-aBN">
                             <rect key="frame" x="136.5" y="29" width="39" height="16"/>
                             <constraints>
@@ -146,20 +72,13 @@
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <gestureRecognizers/>
                     <constraints>
-                        <constraint firstItem="fw3-T6-lx2" firstAttribute="centerY" secondItem="bTO-A2-pYt" secondAttribute="centerY" id="1aL-kd-pqb"/>
-                        <constraint firstItem="cgZ-9q-1D4" firstAttribute="leading" secondItem="Cjp-6k-puJ" secondAttribute="leading" constant="23" id="2yG-gq-B1l"/>
                         <constraint firstItem="W7w-Qv-jgO" firstAttribute="centerX" secondItem="Qfc-m1-p6a" secondAttribute="centerX" id="8zp-MH-1VC"/>
-                        <constraint firstItem="cgZ-9q-1D4" firstAttribute="top" secondItem="W7w-Qv-jgO" secondAttribute="bottom" constant="15" id="AmA-CJ-dyH"/>
-                        <constraint firstItem="bTO-A2-pYt" firstAttribute="centerY" secondItem="1mz-7i-YiM" secondAttribute="centerY" id="Brc-LP-qBn"/>
-                        <constraint firstItem="fw3-T6-lx2" firstAttribute="leading" secondItem="bTO-A2-pYt" secondAttribute="trailing" id="EeU-Bv-QiN"/>
                         <constraint firstItem="QPn-ge-mEt" firstAttribute="leading" secondItem="Qfc-m1-p6a" secondAttribute="trailing" constant="10" id="EnN-ds-Dl3"/>
                         <constraint firstItem="Qfc-m1-p6a" firstAttribute="leading" secondItem="Cjp-6k-puJ" secondAttribute="leading" constant="15" id="FsO-Pm-MXG"/>
                         <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="YBP-tz-Trz" secondAttribute="trailing" constant="10" id="IJb-S6-0Dq"/>
-                        <constraint firstItem="1mz-7i-YiM" firstAttribute="leading" secondItem="cgZ-9q-1D4" secondAttribute="trailing" id="IrQ-V5-x4c"/>
                         <constraint firstItem="v0U-gH-2rd" firstAttribute="trailing" secondItem="Qfc-m1-p6a" secondAttribute="trailing" id="KVZ-uZ-xhf"/>
                         <constraint firstItem="W7w-Qv-jgO" firstAttribute="bottom" secondItem="Qfc-m1-p6a" secondAttribute="bottom" constant="5" id="T73-hP-tAc"/>
                         <constraint firstItem="QPn-ge-mEt" firstAttribute="centerY" secondItem="v0U-gH-2rd" secondAttribute="centerY" id="Zfa-ZF-11e"/>
-                        <constraint firstAttribute="height" constant="110" id="Zrl-wR-XDP"/>
                         <constraint firstItem="Qfc-m1-p6a" firstAttribute="top" secondItem="Cjp-6k-puJ" secondAttribute="top" constant="5" id="aGQ-Aj-LeI"/>
                         <constraint firstItem="v0U-gH-2rd" firstAttribute="top" secondItem="Qfc-m1-p6a" secondAttribute="top" id="aeR-6v-sXE"/>
                         <constraint firstItem="v0U-gH-2rd" firstAttribute="bottom" secondItem="Qfc-m1-p6a" secondAttribute="bottom" id="gSm-Of-Lsh"/>
@@ -167,8 +86,6 @@
                         <constraint firstItem="v0U-gH-2rd" firstAttribute="leading" secondItem="Qfc-m1-p6a" secondAttribute="leading" id="sso-AP-hQ1"/>
                         <constraint firstItem="YBP-tz-Trz" firstAttribute="leading" secondItem="HQj-mY-aBN" secondAttribute="trailing" constant="6" id="vCd-jJ-SSW"/>
                         <constraint firstItem="YBP-tz-Trz" firstAttribute="centerY" secondItem="QPn-ge-mEt" secondAttribute="centerY" id="xAM-gS-SwZ"/>
-                        <constraint firstItem="1mz-7i-YiM" firstAttribute="centerY" secondItem="cgZ-9q-1D4" secondAttribute="centerY" id="xYV-Hj-NIN"/>
-                        <constraint firstAttribute="trailing" secondItem="fw3-T6-lx2" secondAttribute="trailing" constant="19" id="yMT-9h-AWU"/>
                         <constraint firstItem="HQj-mY-aBN" firstAttribute="leading" secondItem="QPn-ge-mEt" secondAttribute="trailing" constant="9" id="zVF-Gh-Jpw"/>
                     </constraints>
                 </view>
@@ -176,6 +93,7 @@
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="Cjp-6k-puJ" secondAttribute="trailing" id="6qD-oi-V6l"/>
+                <constraint firstAttribute="bottom" secondItem="Cjp-6k-puJ" secondAttribute="bottom" id="d0o-4w-93c"/>
                 <constraint firstItem="Cjp-6k-puJ" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="lz7-oV-EzG"/>
                 <constraint firstItem="Cjp-6k-puJ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="vyV-WB-JCZ"/>
             </constraints>
@@ -185,18 +103,13 @@
             <connections>
                 <outlet property="firstImage" destination="HQj-mY-aBN" id="YLi-jF-xQN"/>
                 <outlet property="firstImageWidth" destination="K4K-9C-b5a" id="B3Y-qb-r4d"/>
-                <outlet property="liveImage" destination="f2I-A5-dax" id="k6a-sq-aME"/>
-                <outlet property="musicImage" destination="ZHY-XC-hwf" id="Zh9-EL-xYC"/>
                 <outlet property="secondImage" destination="YBP-tz-Trz" id="Wuv-XK-Q9W"/>
                 <outlet property="secondImageWidth" destination="hbp-cI-NEE" id="2a8-Q6-KMd"/>
-                <outlet property="starView" destination="Akw-bX-gxM" id="ts3-8H-zT3"/>
-                <outlet property="styleImage" destination="iwC-il-8cq" id="gGj-gc-mTv"/>
                 <outlet property="userAvatal" destination="Qfc-m1-p6a" id="HXo-UU-POk"/>
                 <outlet property="userName" destination="QPn-ge-mEt" id="0Ik-q9-R0x"/>
-                <outlet property="videoImage" destination="73K-iM-5zb" id="Qrk-Ei-FId"/>
                 <outlet property="viperImage" destination="W7w-Qv-jgO" id="0Qp-li-sYd"/>
             </connections>
-            <point key="canvasLocation" x="131.8840579710145" y="-69.308035714285708"/>
+            <point key="canvasLocation" x="131.8840579710145" y="-76.674107142857139"/>
         </view>
         <tapGestureRecognizer id="Iir-fe-oYc">
             <connections>
@@ -205,10 +118,6 @@
         </tapGestureRecognizer>
     </objects>
     <resources>
-        <image name="mineLive_nomal" width="24" height="23"/>
-        <image name="mineMusic_nomal" width="24" height="23"/>
-        <image name="mineStyle_nomal" width="23" height="23"/>
-        <image name="mineVideo_nomal" width="23" height="23"/>
-        <image name="user_default_avatal" width="52" height="52"/>
+        <image name="teacher_avatar" width="150" height="150"/>
     </resources>
 </document>

+ 11 - 7
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineTeachToolView.m

@@ -30,11 +30,12 @@
 }
 
 - (void)configView {
+    
     [self.containerView removeAllSubViews];
     CGFloat space = (KPortraitWidth - 28 - 4 * FUNCTIONVIEW_WIDTH) / 5.0f;
     BOOL tagHandle  = NO;
     for (NSInteger index = 0; index < self.imageArray.count; index++) {
-        if (self.isMember == NO && index == 8) {
+        if (self.isMember == NO && index == self.imageArray.count - 1) {
             return;
         }
         if (self.isMember == NO && index == 3) {
@@ -52,10 +53,10 @@
         }];
         CGRect frame = CGRectZero;
         if (tagHandle) {
-            frame = CGRectMake(space + (index - 1) % 4 * (space + FUNCTIONVIEW_WIDTH), FUNCTIONVIEW_WIDTH * ((index-1) / 4), FUNCTIONVIEW_WIDTH, FUNCTIONVIEW_HEIGHT);
+            frame = CGRectMake(space + (index - 1) % 4 * (space + FUNCTIONVIEW_WIDTH), (FUNCTIONVIEW_HEIGHT + FUNCTIONVIEW_SPACE) * ((index-1) / 4), FUNCTIONVIEW_WIDTH, FUNCTIONVIEW_HEIGHT);
         }
         else {
-            frame = CGRectMake(space + index % 4 * (space + FUNCTIONVIEW_WIDTH), FUNCTIONVIEW_WIDTH * (index / 4), FUNCTIONVIEW_WIDTH, FUNCTIONVIEW_HEIGHT);
+            frame = CGRectMake(space + index % 4 * (space + FUNCTIONVIEW_WIDTH), (FUNCTIONVIEW_HEIGHT + FUNCTIONVIEW_SPACE) * (index / 4), FUNCTIONVIEW_WIDTH, FUNCTIONVIEW_HEIGHT);
         }
         functionButton.frame = frame;
         [self.containerView addSubview:functionButton];
@@ -71,27 +72,30 @@
 
 
 - (CGFloat)getViewHeight {
-    return self.isMember ? 333.0f : 232.0f;
+    NSInteger buttonCount = self.isMember ? self.titleArray.count : self.titleArray.count - 2;
+    NSInteger addRow = buttonCount % 4 == 0 ? 0 : 1;
+    NSInteger totalLine = (buttonCount / 4 + addRow);
+    return totalLine * FUNCTIONVIEW_HEIGHT + (totalLine - 1) * FUNCTIONVIEW_SPACE + 92;
 }
 
 
 - (NSMutableArray *)imageArray {
     if (!_imageArray) {
-        _imageArray = [NSMutableArray arrayWithArray:@[@"tool_myLive",@"tool_liveCourse",@"tool_videoCourse",@"tool_musicRoom",@"tool_myAccompany",@"tool_homework",@"tool_evaluate",@"tool_courseware",@"tool_award"]];
+        _imageArray = [NSMutableArray arrayWithArray:@[@"tool_myLive",@"tool_liveCourse",@"tool_videoCourse",@"tool_musicRoom",/*@"tool_myAccompany",*/@"tool_homework",@"tool_evaluate",@"tool_courseware",@"tool_award"]];
     }
     return _imageArray;
 }
 
 - (NSMutableArray *)titleArray {
     if (!_titleArray) {
-        _titleArray = [NSMutableArray arrayWithArray:@[@"我的直播",@"直播课",@"视频课",@"云酷琴房",@"趣纠课设置",@"课后作业",@"课后评价",@"我的课件",@"活动奖品"]];
+        _titleArray = [NSMutableArray arrayWithArray:@[@"我的直播",@"直播课",@"视频课",@"云酷琴房",/*@"趣纠课设置",*/@"课后作业",@"课后评价",@"我的课件",@"活动奖品"]];
     }
     return _titleArray;
 }
 
 - (NSMutableArray *)tagArray {
     if (!_tagArray) {
-        _tagArray = [NSMutableArray arrayWithArray:@[@(MINEVIEWTYPE_STARTBOARDCAST),@(MINEVIEWTYPE_BOARDCASTCOURSE),@(MINEVIEWTYPE_VIDEOCOURSE),@(MINEVIEWTYPE_MUSICROOM),@(MINEVIEWTYPE_ACCOMPANY),@(MINEVIEWTYPE_HOMEWORK),@(MINEVIEWTYPE_EVALUATE),@(MINENAVATYPE_COURSEWARE),@(MINEVIEWTYPE_AWARD)]];
+        _tagArray = [NSMutableArray arrayWithArray:@[@(MINEVIEWTYPE_STARTBOARDCAST),@(MINEVIEWTYPE_BOARDCASTCOURSE),@(MINEVIEWTYPE_VIDEOCOURSE),@(MINEVIEWTYPE_MUSICROOM),/*@(MINEVIEWTYPE_ACCOMPANY),*/@(MINEVIEWTYPE_HOMEWORK),@(MINEVIEWTYPE_EVALUATE),@(MINENAVATYPE_COURSEWARE),@(MINEVIEWTYPE_AWARD)]];
     }
     return _tagArray;
 }

+ 7 - 7
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/MineTeachToolView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,16 +18,16 @@
                     <rect key="frame" x="14" y="0.0" width="386" height="313"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="教学工具" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nZ1-d4-AfB">
-                            <rect key="frame" x="15" y="15" width="66" height="22"/>
+                            <rect key="frame" x="15" y="15" width="64" height="22"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="22" id="EE3-EH-pmW"/>
                             </constraints>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
-                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                            <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="tlw-1g-041">
-                            <rect key="frame" x="0.0" y="39" width="386" height="270"/>
+                            <rect key="frame" x="0.0" y="52" width="386" height="231"/>
                             <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         </view>
                     </subviews>
@@ -37,8 +37,8 @@
                         <constraint firstAttribute="trailing" secondItem="tlw-1g-041" secondAttribute="trailing" id="F69-AE-sxv"/>
                         <constraint firstItem="nZ1-d4-AfB" firstAttribute="leading" secondItem="Cfv-vw-6v1" secondAttribute="leading" constant="15" id="GY2-oA-WeB"/>
                         <constraint firstItem="tlw-1g-041" firstAttribute="leading" secondItem="Cfv-vw-6v1" secondAttribute="leading" id="OWt-vG-AmF"/>
-                        <constraint firstAttribute="bottom" secondItem="tlw-1g-041" secondAttribute="bottom" constant="4" id="XXg-Zi-k3e"/>
-                        <constraint firstItem="tlw-1g-041" firstAttribute="top" secondItem="nZ1-d4-AfB" secondAttribute="bottom" constant="2" id="icF-If-FIX"/>
+                        <constraint firstAttribute="bottom" secondItem="tlw-1g-041" secondAttribute="bottom" constant="30" id="XXg-Zi-k3e"/>
+                        <constraint firstItem="tlw-1g-041" firstAttribute="top" secondItem="nZ1-d4-AfB" secondAttribute="bottom" constant="15" id="icF-If-FIX"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">

+ 31 - 58
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/TenantMineHeadView.m

@@ -19,14 +19,8 @@
 @property (nonatomic, copy) MineViewCallback callback;
 
 
-@property (weak, nonatomic) IBOutlet KSStarView *starView;
-
 
 @property (weak, nonatomic) IBOutlet UIImageView *viperImage;
-@property (weak, nonatomic) IBOutlet UIImageView *styleImage;
-@property (weak, nonatomic) IBOutlet UIImageView *videoImage;
-@property (weak, nonatomic) IBOutlet UIImageView *liveImage;
-@property (weak, nonatomic) IBOutlet UIImageView *musicImage;
 
 @property (weak, nonatomic) IBOutlet UIImageView *firstImage;
 @property (weak, nonatomic) IBOutlet UIImageView *secondImage;
@@ -47,7 +41,6 @@
     
     self.tenantName.text = [NSString returnNoNullStringWithString:infoMessage.tenantName];
 
-    NSArray *tagArray = [infoMessage.tag componentsSeparatedByString:@","];
     NSString *viperImage = @"";
     NSString *vipType = infoMessage.userVip.vipType;
 
@@ -64,61 +57,41 @@
         viperImage = @"";
     }
     [self.viperImage setImage:[UIImage imageNamed:viperImage]];
-    
-    [self.styleImage setImage:[UIImage imageNamed:@"mineStyle_nomal"]];
-    [self.videoImage setImage:[UIImage imageNamed:@"mineVideo_nomal"]];
-    [self.liveImage setImage:[UIImage imageNamed:@"mineLive_nomal"]];
-    [self.musicImage setImage:[UIImage imageNamed:@"mineMusic_nomal"]];
-    
-    BOOL hasDegreeAuth = infoMessage.degreeFlag;
-    BOOL hasTeacherAuth = infoMessage.teacherFlag;
-    
-    for (NSString *tagString in tagArray) {
-        if ([tagString isEqualToString:@"STYLE"]) {
-            [self.styleImage setImage:[UIImage imageNamed:@"mineStyle_active"]];
-        }
-        else if ([tagString isEqualToString:@"VIDEO"]) {
-            [self.videoImage setImage:[UIImage imageNamed:@"mineVideo_active"]];
-        }
-        else if ([tagString isEqualToString:@"LIVE"]) {
-            [self.liveImage setImage:[UIImage imageNamed:@"mineLive_active"]];
-        }
-        else if ([tagString isEqualToString:@"MUSIC"]) {
-            [self.musicImage setImage:[UIImage imageNamed:@"mineMusic_active"]];
-        }
-    }
-    if (hasDegreeAuth && hasTeacherAuth) {
-        [self.firstImage setImage:[UIImage imageNamed:@"education_icon"]];
-        self.firstImage.hidden = NO;
-        self.firstImageWidth.constant = 39.0f;
-        [self.secondImage setImage:[UIImage imageNamed:@"qualification_icon"]];
-        self.secondImage.hidden = NO;
-        self.secondImageWidth.constant = 39.0f;
-    }
-    else {
-        if (hasDegreeAuth) {
-            [self.firstImage setImage:[UIImage imageNamed:@"education_icon"]];
-            self.firstImage.hidden = NO;
-            self.firstImageWidth.constant = 39.0f;
-            self.secondImage.hidden = YES;
-            self.secondImageWidth.constant = 0.0f;
-        }
-        else if (hasTeacherAuth) {
-            [self.firstImage setImage:[UIImage imageNamed:@"qualification_icon"]];
-            self.firstImage.hidden = NO;
-            self.firstImageWidth.constant = 39.0f;
-            self.secondImage.hidden = YES;
-            self.secondImageWidth.constant = 0.0f;
-        }
-        else {
+    // 学历标识去掉
+//    BOOL hasDegreeAuth = infoMessage.degreeFlag;
+//    BOOL hasTeacherAuth = infoMessage.teacherFlag;
+//    
+//    if (hasDegreeAuth && hasTeacherAuth) {
+//        [self.firstImage setImage:[UIImage imageNamed:@"education_icon"]];
+//        self.firstImage.hidden = NO;
+//        self.firstImageWidth.constant = 39.0f;
+//        [self.secondImage setImage:[UIImage imageNamed:@"qualification_icon"]];
+//        self.secondImage.hidden = NO;
+//        self.secondImageWidth.constant = 39.0f;
+//    }
+//    else {
+//        if (hasDegreeAuth) {
+//            [self.firstImage setImage:[UIImage imageNamed:@"education_icon"]];
+//            self.firstImage.hidden = NO;
+//            self.firstImageWidth.constant = 39.0f;
+//            self.secondImage.hidden = YES;
+//            self.secondImageWidth.constant = 0.0f;
+//        }
+//        else if (hasTeacherAuth) {
+//            [self.firstImage setImage:[UIImage imageNamed:@"qualification_icon"]];
+//            self.firstImage.hidden = NO;
+//            self.firstImageWidth.constant = 39.0f;
+//            self.secondImage.hidden = YES;
+//            self.secondImageWidth.constant = 0.0f;
+//        }
+//        else {
             self.firstImage.hidden = YES;
             self.firstImageWidth.constant = 0.0f;
             self.secondImage.hidden = YES;
             self.secondImageWidth.constant = 0.0f;
-        }
-    }
+//        }
+//    }
     
-    self.starView.rate = infoMessage.starGrade / 5.0f;
     
     if (![NSString isEmptyString:infoMessage.heardUrl]) {
         [self.userAvatal sd_setImageWithURL:[NSURL URLWithString:[infoMessage.heardUrl getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
@@ -155,7 +128,7 @@
 }
 
 - (CGFloat)getViewHeight {
-    return 110 + 13;
+    return 90.0;
 }
 /*
 // Only override drawRect: if you perform custom drawing.

+ 18 - 106
KulexiuForTeacher/KulexiuForTeacher/Module/Mine/View/TenantMineHeadView.xib

@@ -10,21 +10,21 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="TenantMineHeadView">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="110"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="90"/>
+            <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6w5-En-SDh">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="110"/>
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="90"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="MUG-JJ-qQX">
-                            <rect key="frame" x="15" y="5" width="60" height="60"/>
+                            <rect key="frame" x="15" y="5" width="64" height="64"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="60" id="MEV-vM-Vrt"/>
-                                <constraint firstAttribute="height" constant="60" id="bCj-YP-ZjB"/>
+                                <constraint firstAttribute="width" constant="64" id="MEV-vM-Vrt"/>
+                                <constraint firstAttribute="height" constant="64" id="bCj-YP-ZjB"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                    <real key="value" value="30"/>
+                                    <real key="value" value="32"/>
                                 </userDefinedRuntimeAttribute>
                                 <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                                     <real key="value" value="2"/>
@@ -35,7 +35,7 @@
                             </userDefinedRuntimeAttributes>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vFq-5f-Squ">
-                            <rect key="frame" x="83" y="21" width="10" height="18"/>
+                            <rect key="frame" x="87" y="40" width="10" height="18"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Fa1-iw-aks">
                                     <rect key="frame" x="5" y="0.0" width="0.0" height="18"/>
@@ -65,108 +65,37 @@
                             </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="J7V-BY-Z3E">
-                            <rect key="frame" x="85" y="11" width="0.0" height="0.0"/>
+                            <rect key="frame" x="89" y="13" width="0.0" height="17"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="17" id="N8P-XB-sBW"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="20"/>
                             <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="评分:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rk5-S8-fb2">
-                            <rect key="frame" x="231" y="86" width="30" height="15"/>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
-                            <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wdE-hK-zbq">
-                            <rect key="frame" x="261" y="84" width="95" height="19"/>
-                            <subviews>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Vee-Pj-USj" customClass="KSStarView">
-                                    <rect key="frame" x="0.0" y="0.0" width="95" height="19"/>
-                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                </view>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="19" id="Tqe-8I-THu"/>
-                                <constraint firstItem="Vee-Pj-USj" firstAttribute="leading" secondItem="wdE-hK-zbq" secondAttribute="leading" id="eR4-gZ-T5G"/>
-                                <constraint firstItem="Vee-Pj-USj" firstAttribute="top" secondItem="wdE-hK-zbq" secondAttribute="top" id="fOx-GY-Klj"/>
-                                <constraint firstAttribute="bottom" secondItem="Vee-Pj-USj" secondAttribute="bottom" id="pMz-4P-9nE"/>
-                                <constraint firstAttribute="trailing" secondItem="Vee-Pj-USj" secondAttribute="trailing" id="psY-yM-fHt"/>
-                                <constraint firstAttribute="width" constant="95" id="xGD-iA-mSc"/>
-                            </constraints>
-                        </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7ie-6w-nwS">
-                            <rect key="frame" x="15" y="5" width="60" height="60"/>
+                            <rect key="frame" x="15" y="5" width="64" height="64"/>
                             <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                             <connections>
                                 <action selector="toUserCenter:" destination="iN0-l3-epB" eventType="touchUpInside" id="O7D-ND-ABn"/>
                             </connections>
                         </button>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OIG-vb-9aR">
-                            <rect key="frame" x="53" y="81.666666666666671" width="84" height="24"/>
-                            <subviews>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineStyle_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="y0K-rg-5qe">
-                                    <rect key="frame" x="4" y="4" width="16" height="16"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="16" id="WPf-0e-AZg"/>
-                                        <constraint firstAttribute="height" constant="16" id="zDJ-rd-0WC"/>
-                                    </constraints>
-                                </imageView>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineVideo_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="SFp-8t-ODB">
-                                    <rect key="frame" x="24" y="4" width="16" height="16"/>
-                                </imageView>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineLive_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="6cX-rV-icN">
-                                    <rect key="frame" x="44" y="4" width="16" height="16"/>
-                                </imageView>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineMusic_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="6qb-vS-dZU">
-                                    <rect key="frame" x="64" y="4" width="16" height="16"/>
-                                </imageView>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <gestureRecognizers/>
-                            <constraints>
-                                <constraint firstAttribute="height" constant="24" id="3Ak-uB-Efm"/>
-                                <constraint firstItem="6qb-vS-dZU" firstAttribute="width" secondItem="y0K-rg-5qe" secondAttribute="width" id="4wc-QI-yVa"/>
-                                <constraint firstItem="6cX-rV-icN" firstAttribute="leading" secondItem="SFp-8t-ODB" secondAttribute="trailing" constant="4" id="9Rl-ab-6pM"/>
-                                <constraint firstItem="y0K-rg-5qe" firstAttribute="centerY" secondItem="OIG-vb-9aR" secondAttribute="centerY" id="KId-fY-KI8"/>
-                                <constraint firstItem="SFp-8t-ODB" firstAttribute="width" secondItem="y0K-rg-5qe" secondAttribute="width" id="Qy7-lB-yma"/>
-                                <constraint firstItem="6cX-rV-icN" firstAttribute="height" secondItem="y0K-rg-5qe" secondAttribute="height" id="dGC-2o-I5R"/>
-                                <constraint firstItem="6qb-vS-dZU" firstAttribute="leading" secondItem="6cX-rV-icN" secondAttribute="trailing" constant="4" id="elM-8M-Iyq"/>
-                                <constraint firstItem="6qb-vS-dZU" firstAttribute="height" secondItem="y0K-rg-5qe" secondAttribute="height" id="faj-uQ-WVe"/>
-                                <constraint firstItem="SFp-8t-ODB" firstAttribute="height" secondItem="y0K-rg-5qe" secondAttribute="height" id="haw-zU-nkP"/>
-                                <constraint firstItem="y0K-rg-5qe" firstAttribute="leading" secondItem="OIG-vb-9aR" secondAttribute="leading" constant="4" id="io5-it-ODt"/>
-                                <constraint firstAttribute="trailing" secondItem="6qb-vS-dZU" secondAttribute="trailing" constant="4" id="ppM-Un-44N"/>
-                                <constraint firstItem="SFp-8t-ODB" firstAttribute="leading" secondItem="y0K-rg-5qe" secondAttribute="trailing" constant="4" id="rVk-Yl-vfY"/>
-                                <constraint firstItem="6qb-vS-dZU" firstAttribute="centerY" secondItem="y0K-rg-5qe" secondAttribute="centerY" id="sPw-1f-8eZ"/>
-                                <constraint firstItem="SFp-8t-ODB" firstAttribute="centerY" secondItem="y0K-rg-5qe" secondAttribute="centerY" id="x23-PF-dZQ"/>
-                                <constraint firstItem="6cX-rV-icN" firstAttribute="width" secondItem="y0K-rg-5qe" secondAttribute="width" id="z7H-t2-n4L"/>
-                                <constraint firstItem="6cX-rV-icN" firstAttribute="centerY" secondItem="y0K-rg-5qe" secondAttribute="centerY" id="zPg-KS-TVt"/>
-                            </constraints>
-                            <connections>
-                                <outletCollection property="gestureRecognizers" destination="hOy-H9-kj9" appends="YES" id="iz5-UE-iVC"/>
-                            </connections>
-                        </view>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="勋章:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pug-lS-V28">
-                            <rect key="frame" x="23" y="86" width="30" height="15"/>
-                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
-                            <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                            <nil key="highlightedColor"/>
-                        </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="QHb-w1-1yi">
-                            <rect key="frame" x="94" y="3" width="39" height="16"/>
+                            <rect key="frame" x="98" y="13.666666666666664" width="39" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="39" id="dmt-FK-O3O"/>
                                 <constraint firstAttribute="height" constant="16" id="oKJ-9H-jHo"/>
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Pf0-fO-g6q">
-                            <rect key="frame" x="139" y="3" width="39" height="16"/>
+                            <rect key="frame" x="143" y="13.666666666666664" width="39" height="16"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="39" id="0jU-Yr-iab"/>
                                 <constraint firstAttribute="height" constant="16" id="WMh-DL-Rcf"/>
                             </constraints>
                         </imageView>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sLr-9M-73V">
-                            <rect key="frame" x="25.666666666666671" y="52" width="39" height="18"/>
+                            <rect key="frame" x="27.666666666666671" y="56" width="39" height="18"/>
                             <constraints>
                                 <constraint firstAttribute="width" secondItem="sLr-9M-73V" secondAttribute="height" multiplier="39:18" id="Dcp-Jv-4fE"/>
                                 <constraint firstAttribute="height" constant="18" id="Xik-sy-tnm"/>
@@ -177,30 +106,21 @@
                     <gestureRecognizers/>
                     <constraints>
                         <constraint firstItem="MUG-JJ-qQX" firstAttribute="leading" secondItem="6w5-En-SDh" secondAttribute="leading" constant="15" id="1SG-mb-u5B"/>
-                        <constraint firstItem="wdE-hK-zbq" firstAttribute="centerY" secondItem="rk5-S8-fb2" secondAttribute="centerY" id="39e-iZ-mdg"/>
-                        <constraint firstItem="pug-lS-V28" firstAttribute="top" secondItem="sLr-9M-73V" secondAttribute="bottom" constant="16" id="4lf-2M-dzr"/>
-                        <constraint firstItem="J7V-BY-Z3E" firstAttribute="top" secondItem="MUG-JJ-qQX" secondAttribute="top" constant="6" id="8dW-9H-ZGe"/>
+                        <constraint firstItem="J7V-BY-Z3E" firstAttribute="top" secondItem="MUG-JJ-qQX" secondAttribute="top" constant="8" id="8dW-9H-ZGe"/>
                         <constraint firstItem="Pf0-fO-g6q" firstAttribute="centerY" secondItem="J7V-BY-Z3E" secondAttribute="centerY" id="EEO-69-wM2"/>
-                        <constraint firstItem="pug-lS-V28" firstAttribute="leading" secondItem="6w5-En-SDh" secondAttribute="leading" constant="23" id="FqR-j6-UDO"/>
                         <constraint firstItem="7ie-6w-nwS" firstAttribute="top" secondItem="MUG-JJ-qQX" secondAttribute="top" id="IdQ-33-FFt"/>
                         <constraint firstItem="vFq-5f-Squ" firstAttribute="top" secondItem="J7V-BY-Z3E" secondAttribute="bottom" constant="10" id="JBn-7m-3Mk"/>
                         <constraint firstItem="sLr-9M-73V" firstAttribute="centerX" secondItem="MUG-JJ-qQX" secondAttribute="centerX" id="NZY-1n-rgQ"/>
-                        <constraint firstItem="wdE-hK-zbq" firstAttribute="leading" secondItem="rk5-S8-fb2" secondAttribute="trailing" id="P29-Uc-H8t"/>
                         <constraint firstItem="sLr-9M-73V" firstAttribute="bottom" secondItem="MUG-JJ-qQX" secondAttribute="bottom" constant="5" id="Qsm-SJ-vkk"/>
                         <constraint firstItem="Pf0-fO-g6q" firstAttribute="leading" secondItem="QHb-w1-1yi" secondAttribute="trailing" constant="6" id="Vxa-rb-qgx"/>
                         <constraint firstItem="7ie-6w-nwS" firstAttribute="leading" secondItem="MUG-JJ-qQX" secondAttribute="leading" id="Vy8-3K-WaH"/>
-                        <constraint firstAttribute="trailing" secondItem="wdE-hK-zbq" secondAttribute="trailing" constant="19" id="Xf0-A0-CjC"/>
                         <constraint firstItem="7ie-6w-nwS" firstAttribute="trailing" secondItem="MUG-JJ-qQX" secondAttribute="trailing" id="aza-jf-emx"/>
                         <constraint firstItem="vFq-5f-Squ" firstAttribute="leading" secondItem="J7V-BY-Z3E" secondAttribute="leading" constant="-2" id="c5L-71-tmn"/>
                         <constraint firstItem="QHb-w1-1yi" firstAttribute="leading" secondItem="J7V-BY-Z3E" secondAttribute="trailing" constant="9" id="djv-LZ-Zp8"/>
                         <constraint firstItem="7ie-6w-nwS" firstAttribute="bottom" secondItem="MUG-JJ-qQX" secondAttribute="bottom" id="fn3-ed-5ex"/>
-                        <constraint firstItem="OIG-vb-9aR" firstAttribute="leading" secondItem="pug-lS-V28" secondAttribute="trailing" id="gR3-wc-390"/>
                         <constraint firstItem="J7V-BY-Z3E" firstAttribute="leading" secondItem="MUG-JJ-qQX" secondAttribute="trailing" constant="10" id="i0C-Zc-4H6"/>
                         <constraint firstItem="QHb-w1-1yi" firstAttribute="centerY" secondItem="J7V-BY-Z3E" secondAttribute="centerY" id="lsV-MG-QuC"/>
-                        <constraint firstItem="rk5-S8-fb2" firstAttribute="centerY" secondItem="OIG-vb-9aR" secondAttribute="centerY" id="mic-Lj-TDD"/>
-                        <constraint firstAttribute="height" constant="110" id="ord-Ho-HeA"/>
                         <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Pf0-fO-g6q" secondAttribute="trailing" constant="10" id="pOA-Yw-5eC"/>
-                        <constraint firstItem="OIG-vb-9aR" firstAttribute="centerY" secondItem="pug-lS-V28" secondAttribute="centerY" id="qbQ-DQ-K6d"/>
                         <constraint firstItem="MUG-JJ-qQX" firstAttribute="top" secondItem="6w5-En-SDh" secondAttribute="top" constant="5" id="tD0-v0-dqs"/>
                         <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="vFq-5f-Squ" secondAttribute="trailing" constant="10" id="zq6-t4-Oao"/>
                     </constraints>
@@ -211,6 +131,7 @@
                 <constraint firstAttribute="trailing" secondItem="6w5-En-SDh" secondAttribute="trailing" id="KRS-Lm-GZT"/>
                 <constraint firstItem="6w5-En-SDh" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="OBv-4b-NoP"/>
                 <constraint firstItem="6w5-En-SDh" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="WTE-hM-vMx"/>
+                <constraint firstAttribute="bottom" secondItem="6w5-En-SDh" secondAttribute="bottom" id="p0A-fh-bQk"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
@@ -218,16 +139,11 @@
             <connections>
                 <outlet property="firstImage" destination="QHb-w1-1yi" id="xFZ-D3-L0A"/>
                 <outlet property="firstImageWidth" destination="dmt-FK-O3O" id="Sev-4v-Mgd"/>
-                <outlet property="liveImage" destination="6cX-rV-icN" id="uMO-0U-97O"/>
-                <outlet property="musicImage" destination="6qb-vS-dZU" id="Q0N-X6-Mnr"/>
                 <outlet property="secondImage" destination="Pf0-fO-g6q" id="LoJ-cJ-Yr7"/>
                 <outlet property="secondImageWidth" destination="0jU-Yr-iab" id="pCT-gY-xn0"/>
-                <outlet property="starView" destination="Vee-Pj-USj" id="Ctj-dB-b48"/>
-                <outlet property="styleImage" destination="y0K-rg-5qe" id="Udc-S2-lzT"/>
                 <outlet property="tenantName" destination="Fa1-iw-aks" id="qTf-rU-7Bz"/>
                 <outlet property="userAvatal" destination="MUG-JJ-qQX" id="DMc-LE-rW8"/>
                 <outlet property="userName" destination="J7V-BY-Z3E" id="C0T-35-Zuk"/>
-                <outlet property="videoImage" destination="SFp-8t-ODB" id="rOw-D5-6Zi"/>
                 <outlet property="viperImage" destination="sLr-9M-73V" id="e35-a7-ZOe"/>
             </connections>
             <point key="canvasLocation" x="38.931297709923662" y="-207.74647887323945"/>
@@ -239,10 +155,6 @@
         </tapGestureRecognizer>
     </objects>
     <resources>
-        <image name="mineLive_nomal" width="24" height="23"/>
-        <image name="mineMusic_nomal" width="24" height="23"/>
-        <image name="mineStyle_nomal" width="23" height="23"/>
-        <image name="mineVideo_nomal" width="23" height="23"/>
         <image name="teacher_avatar" width="150" height="150"/>
     </resources>
 </document>