Steven 8 mesiacov pred
rodič
commit
828265b5f4

BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MyCourse/group_addPlan.imageset/group_addPlan@2x.png


BIN
KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/MyCourse/group_addPlan.imageset/group_addPlan@3x.png


+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/CreateFansGroupViewController.m

@@ -25,7 +25,7 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    [self allocTitle:@"创建粉丝群"];
+    [self allocTitle:@"创建群"];
     [self configUI];
 }
 

+ 5 - 7
KulexiuForTeacher/KulexiuForTeacher/Module/Course/View/CourseGroupView/CourseGroupPlanAddView.xib

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="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_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -33,7 +32,7 @@
                     <rect key="frame" x="12" y="12" width="369" height="36"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="group_addPlan" translatesAutoresizingMaskIntoConstraints="NO" id="zZL-6i-GRC">
-                            <rect key="frame" x="127.66666666666666" y="8" width="22" height="20"/>
+                            <rect key="frame" x="128.66666666666666" y="8" width="21" height="20"/>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="添加课程规划" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wvq-0R-j6d">
                             <rect key="frame" x="151.66666666666666" y="9" width="90" height="18"/>
@@ -62,16 +61,15 @@
                     </constraints>
                 </view>
             </subviews>
-            <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstItem="8Aa-kp-bYI" firstAttribute="bottom" secondItem="hTw-6B-RQf" secondAttribute="bottom" id="35i-G3-qUh"/>
                 <constraint firstItem="hTw-6B-RQf" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="12" id="4hF-Ht-R4Y"/>
                 <constraint firstItem="8Aa-kp-bYI" firstAttribute="trailing" secondItem="hTw-6B-RQf" secondAttribute="trailing" id="Nph-aE-9YU"/>
-                <constraint firstItem="hTw-6B-RQf" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="12" id="cC9-8l-Qeq"/>
+                <constraint firstItem="hTw-6B-RQf" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="12" id="cC9-8l-Qeq"/>
                 <constraint firstItem="8Aa-kp-bYI" firstAttribute="leading" secondItem="hTw-6B-RQf" secondAttribute="leading" id="hGh-n2-ygv"/>
                 <constraint firstAttribute="bottom" secondItem="hTw-6B-RQf" secondAttribute="bottom" constant="12" id="j6u-AX-i9J"/>
-                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="hTw-6B-RQf" secondAttribute="trailing" constant="12" id="pUv-Te-Kkt"/>
+                <constraint firstAttribute="trailing" secondItem="hTw-6B-RQf" secondAttribute="trailing" constant="12" id="pUv-Te-Kkt"/>
                 <constraint firstItem="8Aa-kp-bYI" firstAttribute="top" secondItem="hTw-6B-RQf" secondAttribute="top" id="zCo-UK-6DO"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
@@ -84,6 +82,6 @@
         </view>
     </objects>
     <resources>
-        <image name="group_addPlan" width="22" height="20"/>
+        <image name="group_addPlan" width="21" height="20"/>
     </resources>
 </document>

+ 0 - 41
KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeNewHeadView.m

@@ -14,11 +14,6 @@
 
 @property (weak, nonatomic) IBOutlet UIView *dotView;
 
-@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 UILabel *badgeCountLabel;
 
 @property (weak, nonatomic) IBOutlet UILabel *failDescLabel;
 @property (weak, nonatomic) IBOutlet UIView *failedView;
@@ -29,10 +24,6 @@
 
 @property (nonatomic, assign) BOOL hasAuth;
 
-@property (weak, nonatomic) IBOutlet UILabel *gradeTitleLabel;
-
-@property (weak, nonatomic) IBOutlet KSStarView *starView;
-
 
 @end
 
@@ -54,9 +45,6 @@
     _failedView.layer.masksToBounds = YES;
     [_failedView bringSubviewToFront:self.failDescLabel];
     _failedView.hidden = YES;
-    
-    self.starView.allowMark = NO;
-
 }
 
 + (instancetype)shareInstance {
@@ -66,38 +54,9 @@
 
 - (void)configMessage:(UserInfo *)infoMessage {
     
-    NSArray *tagArray = [infoMessage.tag componentsSeparatedByString:@","];
-    if ([NSString isEmptyString:infoMessage.tag]) {
-        self.badgeCountLabel.text = @"0/4";
-    }
-    else {
-        self.badgeCountLabel.text = [NSString stringWithFormat:@"%zd/4",tagArray.count];
-    }
-    
-    self.starView.rate = infoMessage.starGrade / 5.0f;
-
-    [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"]];
-        }
-    }
     self.failedView.hidden = YES;
     // 认证状态
     self.hasAuth = NO;