nothing

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -3985,11 +3985,11 @@
 		BC11920D280ED6A900A716F7 /* PopView */ = {
 			isa = PBXGroup;
 			children = (
-				BC11920E280ED6A900A716F7 /* NewClassPopView.h */,
-				BC11920F280ED6A900A716F7 /* NewClassPopCell.xib */,
 				BC119210280ED6A900A716F7 /* NewClassPopCell.h */,
-				BC119211280ED6A900A716F7 /* NewClassPopView.m */,
 				BC119212280ED6A900A716F7 /* NewClassPopCell.m */,
+				BC11920F280ED6A900A716F7 /* NewClassPopCell.xib */,
+				BC11920E280ED6A900A716F7 /* NewClassPopView.h */,
+				BC119211280ED6A900A716F7 /* NewClassPopView.m */,
 			);
 			path = PopView;
 			sourceTree = "<group>";

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/Controller/HomeArrangeCourseController.m

@@ -295,6 +295,7 @@
 - (CourseDescAlertView *)tipsAlert {
     if (!_tipsAlert) {
         _tipsAlert = [CourseDescAlertView sharedInstance];
+        _tipsAlert.showType = SHOWTYPE_SKIPMUIC;
         [_tipsAlert refreshView];
     }
     return _tipsAlert;

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/CourseDescAlertView.h

@@ -7,17 +7,26 @@
 
 #import <UIKit/UIKit.h>
 
+typedef NS_ENUM(NSInteger, SHOWTYPE) {
+    SHOWTYPE_ALL = 0,
+    SHOWTYPE_SKIPMUIC,
+    SHOWTYPE_SINGLE_VIP,
+};
+
 typedef NS_ENUM(NSInteger, COURSE_DISPLAY_INDEX) {
     COURSE_DISPLAY_INDEX_VIP = 0,
     COURSE_DISPLAY_INDEX_ACCOMPANY,
     COURSE_DISPLAY_INDEX_LIVE,
     COURSE_DISPLAY_INDEX_VIDEO,
+    COURSE_DISPLAY_INDEX_MUSICROOM,
 };
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface CourseDescAlertView : UIView
 
+@property (nonatomic, assign) SHOWTYPE showType;
+
 + (instancetype)sharedInstance;
 
 - (void)refreshView;

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/Controller/MyCourseViewController.m

@@ -317,6 +317,7 @@
 - (CourseDescAlertView *)tipsAlert {
     if (!_tipsAlert) {
         _tipsAlert = [CourseDescAlertView sharedInstance];
+        _tipsAlert.showType = SHOWTYPE_ALL;
         [_tipsAlert refreshView];
     }
     return _tipsAlert;

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyLessonSearchView.xib

@@ -1,39 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" 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="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MyLessonSearchView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="88"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LpR-2y-gXZ">
-                    <rect key="frame" x="0.0" y="0.0" width="414" height="88"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="50"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sav-8B-TD3">
-                            <rect key="frame" x="0.0" y="0.0" width="131.5" height="88"/>
+                            <rect key="frame" x="0.0" y="0.0" width="131.5" height="50"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="XXXX年XX月" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SZF-Nh-GLK">
-                                    <rect key="frame" x="16.5" y="35.5" width="90" height="17"/>
+                                    <rect key="frame" x="16.5" y="16.5" width="90" height="17"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="vSU-NS-Qou">
-                                    <rect key="frame" x="112.5" y="41" width="8" height="6"/>
+                                    <rect key="frame" x="112.5" y="22" width="8" height="6"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="6" id="L0G-Nt-hlU"/>
                                         <constraint firstAttribute="width" constant="8" id="nhm-Fv-ewC"/>
                                     </constraints>
                                 </imageView>
                                 <button opaque="NO" tag="1001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CSP-VE-Q55">
-                                    <rect key="frame" x="0.0" y="0.0" width="131.5" height="88"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="131.5" height="50"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <state key="normal">
                                         <color key="titleColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
@@ -56,23 +56,23 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EXN-FR-v0M">
-                            <rect key="frame" x="141.5" y="0.0" width="131" height="88"/>
+                            <rect key="frame" x="141.5" y="0.0" width="131" height="50"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课程状态" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6ns-hS-Kd7">
-                                    <rect key="frame" x="33" y="35.5" width="57.5" height="17"/>
+                                    <rect key="frame" x="33.5" y="16.5" width="56" height="17"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="OTv-DP-LWv">
-                                    <rect key="frame" x="96.5" y="41" width="8" height="6"/>
+                                    <rect key="frame" x="95.5" y="22" width="8" height="6"/>
                                     <constraints>
                                         <constraint firstAttribute="width" constant="8" id="5Xg-pv-7Nq"/>
                                         <constraint firstAttribute="height" constant="6" id="z2o-1V-B1s"/>
                                     </constraints>
                                 </imageView>
                                 <button opaque="NO" tag="1002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4ob-Ur-wiA">
-                                    <rect key="frame" x="0.0" y="0.0" width="131" height="88"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="131" height="50"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <state key="normal">
                                         <color key="titleColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="calibratedRGB"/>
@@ -95,23 +95,23 @@
                             </constraints>
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tfS-Rc-iEN">
-                            <rect key="frame" x="282.5" y="0.0" width="131.5" height="88"/>
+                            <rect key="frame" x="282.5" y="0.0" width="131.5" height="50"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全部声部" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o6O-VM-5uU">
-                                    <rect key="frame" x="33" y="35.5" width="57.5" height="17"/>
+                                    <rect key="frame" x="34" y="16.5" width="56" height="17"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
                                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="2nN-nP-Pcx">
-                                    <rect key="frame" x="96.5" y="41" width="8" height="6"/>
+                                    <rect key="frame" x="96" y="22" width="8" height="6"/>
                                     <constraints>
                                         <constraint firstAttribute="height" constant="6" id="Hqu-N6-YGq"/>
                                         <constraint firstAttribute="width" constant="8" id="RHc-EF-HM2"/>
                                     </constraints>
                                 </imageView>
                                 <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cgC-dL-lRH">
-                                    <rect key="frame" x="0.0" y="0.0" width="131.5" height="88"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="131.5" height="50"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <state key="normal">
                                         <color key="titleColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>