UI走查样式修改

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/Controller/KSChatListViewController.m

@@ -45,7 +45,7 @@
     [self.listVC.view mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.top.bottom.mas_equalTo(self.view);
     }];
-    self.listVC.tableViewForAll.tipsMsgWhenNoConversation = @"暂无内容～";
+    self.listVC.tableViewForAll.tipsMsgWhenNoConversation = @"暂无内容";
     [self.listVC.tableViewForAll.tipsView setImage:[UIImage imageNamed:@"wd_img_zwsj"]];
     [self.listVC.tableViewContainer mas_makeConstraints:^(MASConstraintMaker *make) {
         make.bottom.left.right.mas_equalTo(self.listVC.view);

KulexiuForTeacher/KulexiuForTeacher/Module/Course/Controller/CourseViewController.m

@@ -138,7 +138,7 @@
 }
 
 - (void)configEmptyView {
-    [self setPromptString:@"暂无课程～" imageName:@"empty_course" inView:self.tableView];
+    [self setPromptString:@"暂无课程" imageName:@"empty_course" inView:self.tableView];
 }
 
 - (void)configUI {

KulexiuForTeacher/KulexiuForTeacher/Module/Course/MusicRoom/View/MusicRoomCourseListCell.xib

@@ -116,7 +116,7 @@
                                 </constraints>
                             </imageView>
                             <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DLH-WQ-IQA">
-                                <rect key="frame" x="215" y="12" width="62" height="22"/>
+                                <rect key="frame" x="218" y="12" width="62" height="22"/>
                                 <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="62" id="TwZ-4I-UWI"/>
@@ -125,6 +125,11 @@
                                 <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
                                 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                 <state key="normal" title="开始上课"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                        <real key="value" value="11"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
                                 <connections>
                                     <action selector="enterClassRoom:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="1OP-dY-Yk7"/>
                                 </connections>
@@ -138,7 +143,7 @@
                             <constraint firstItem="2QC-c9-Pmm" firstAttribute="leading" secondItem="UCx-jd-4fG" secondAttribute="leading" constant="12" id="2Es-v7-Hme"/>
                             <constraint firstItem="sbq-HP-naE" firstAttribute="leading" secondItem="Cfn-74-up3" secondAttribute="trailing" constant="10" id="56v-Wb-J1M"/>
                             <constraint firstItem="Cfn-74-up3" firstAttribute="leading" secondItem="UCx-jd-4fG" secondAttribute="leading" constant="12" id="A7Y-2f-Wxs"/>
-                            <constraint firstAttribute="trailing" secondItem="DLH-WQ-IQA" secondAttribute="trailing" constant="15" id="Bbi-Hk-Zf6"/>
+                            <constraint firstAttribute="trailing" secondItem="DLH-WQ-IQA" secondAttribute="trailing" constant="12" id="Bbi-Hk-Zf6"/>
                             <constraint firstItem="sbq-HP-naE" firstAttribute="top" secondItem="Cfn-74-up3" secondAttribute="top" constant="-1" id="MOU-7t-oGQ"/>
                             <constraint firstItem="OUr-fR-uAC" firstAttribute="leading" secondItem="sbq-HP-naE" secondAttribute="trailing" constant="5" id="PSn-pS-jsz"/>
                             <constraint firstItem="pFx-1U-bC2" firstAttribute="leading" secondItem="2QC-c9-Pmm" secondAttribute="trailing" constant="7" id="Rnv-VC-xcw"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Course/VIPCourse/View/ProgramCourseGroupBodyView.m

@@ -18,8 +18,8 @@
 #import "OnlineClassManager.h"
 #import "KSPremissionAlert.h"
 #import "RecordCheckManager.h"
-#import <KSChoosePicker.h>
 #import <KSFullDatePicker.h>
+#import "KSSmallChoosePicker.h"
 
 @interface ProgramCourseGroupBodyView ()<UITableViewDelegate,UITableViewDataSource>
 
@@ -91,6 +91,8 @@
 }
 
 - (void)configDefault {
+    self.secondChooseIndex = 1;
+    self.thirdChooseIndex = 1;
     [self.dateFormatter setDateFormat:@"yyyy-MM"];
     NSDate *currentDate = [NSDate date];
     self.classDate = [self.dateFormatter stringFromDate:currentDate];
@@ -446,40 +448,40 @@
     }
     else if (type == SORT_TYPE_STATUS) { // 状态
         MJWeakSelf;
-        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"课程状态" sourceData:@[@"全部",@"未开始",@"进行中",@"已结束"]  lastChooseIndex:self.secondChooseIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+        KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部",@"未开始",@"进行中",@"已结束"] lastChoose:self.secondChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
             weakSelf.secondChooseIndex = chooseIndex;
-            if (chooseIndex == 0) {
+            if (chooseIndex == 1) {
                 [weakSelf.sortView.secondLabel setText:@"全部状态"];
                 weakSelf.courseStatus = nil;
             }
             else {
                 [weakSelf.sortView.secondLabel setText:returnValue];
-                [weakSelf evaluateStatusWithIndex:chooseIndex isCourseStatus:YES];
+                [weakSelf evaluateStatusWithIndex:chooseIndex-1 isCourseStatus:YES];
             }
-            self.sortView.secondArrowUp = NO;
+            weakSelf.sortView.secondArrowUp = NO;
             [weakSelf refreshAndRequestData];
         } cancel:^{
-            self.sortView.secondArrowUp = NO;
+            weakSelf.sortView.secondArrowUp = NO;
         }];
         [picker showPicker];
     }
     else if (type == SORT_TYPE_ATTENDENCE) {
         
         MJWeakSelf;
-        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"考勤" sourceData:@[@"全部",@"到课",@"旷课"]  lastChooseIndex:self.secondChooseIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+        KSSmallChoosePicker *picker = [[KSSmallChoosePicker alloc] initWithTitle:@"" sourceData:@[@"全部考勤",@"到课",@"旷课"] lastChoose:self.thirdChooseIndex chooseColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
             weakSelf.thirdChooseIndex = chooseIndex;
-            if (chooseIndex == 0) {
+            if (chooseIndex == 1) {
                 [weakSelf.sortView.thirdLabel setText:@"全部考勤"];
                 weakSelf.attendanceStatus = nil;
             }
             else {
                 [weakSelf.sortView.thirdLabel setText:returnValue];
-                [weakSelf evaluateStatusWithIndex:chooseIndex isCourseStatus:NO];
+                [weakSelf evaluateStatusWithIndex:chooseIndex-1 isCourseStatus:NO];
             }
-            self.sortView.thirdArrowUp = NO;
+            weakSelf.sortView.thirdArrowUp = NO;
             [weakSelf refreshAndRequestData];
         } cancel:^{
-            self.sortView.thirdArrowUp = NO;
+            weakSelf.sortView.thirdArrowUp = NO;
         }];
         [picker showPicker];
     }

KulexiuForTeacher/KulexiuForTeacher/Module/Course/View/CourseForLiveCell.xib

@@ -137,8 +137,8 @@
                                             <constraint firstAttribute="height" constant="11" id="rQe-eX-5YW"/>
                                         </constraints>
                                     </view>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人已购买" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="do8-lR-Cg5">
-                                        <rect key="frame" x="7" y="1.5" width="66.5" height="17"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人学习" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="do8-lR-Cg5">
+                                        <rect key="frame" x="7" y="1.5" width="52.5" height="17"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                         <color key="textColor" red="0.41568627450980389" green="0.41568627450980389" blue="0.41568627450980389" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Course/View/CourseGroupView/CourseGroupPlanAlertView.m

@@ -7,7 +7,7 @@
 
 #import "CourseGroupPlanAlertView.h"
 
-@interface CourseGroupPlanAlertView ()<UITextViewDelegate>
+@interface CourseGroupPlanAlertView ()<UITextViewDelegate,UIGestureRecognizerDelegate>
 
 @property (weak, nonatomic) IBOutlet UIView *bgView;
 
@@ -29,6 +29,19 @@
     self.textView.textContainerInset = UIEdgeInsetsZero;
     self.bgView.layer.cornerRadius = 12.0f;
     self.bgView.layer.maskedCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner;
+    [self addTagGreture];
+}
+
+- (void)addTagGreture {
+    UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAction)];
+    gesture.delegate = self;
+    [self addGestureRecognizer:gesture];
+    
+}
+
+- (void)tapAction {
+    [self endEditing:YES];
+    [self removeFromSuperview];
 }
 
 - (NSDictionary *)getTypeAttributes {
@@ -82,7 +95,6 @@
 #pragma mark   ---- delegate
 
 - (void)textViewDidBeginEditing:(UITextView *)textView {
-    
     self.tipsLabel.hidden = YES;
 }
 
@@ -154,6 +166,13 @@
     [self endEditing:YES];
 }
 
+#pragma mark --- gesture delegate
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
+    if ([touch.view isDescendantOfView:self.bgView]) {
+        return NO;
+    }
+    return YES;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Course/View/CourseGroupView/GroupCourseSortView.m

@@ -74,6 +74,14 @@
     _firstArrowUp = firstArrowUp;
     NSString *imageName = firstArrowUp ? @"sort_up_blue" : @"sort_down_grey";
     [_firstArrow setImage:[UIImage imageNamed:imageName]];
+    UIColor *titleColor = nil;
+    if (firstArrowUp) {
+        titleColor = THEMECOLOR;
+    }
+    else {
+        titleColor = HexRGB(0x131415);
+    }
+    _firstLabel.textColor = titleColor;
 }
 
 - (void)setSecondArrowUp:(BOOL)secondArrowUp {
@@ -81,13 +89,28 @@
     NSString *imageName = secondArrowUp ? @"sort_up_blue" : @"sort_down_grey";
     [_secondArrow setImage:[UIImage imageNamed:imageName]];
 
-
+    UIColor *titleColor = nil;
+    if (secondArrowUp) {
+        titleColor = THEMECOLOR;
+    }
+    else {
+        titleColor = HexRGB(0x131415);
+    }
+    _secondLabel.textColor = titleColor;
 }
 
 - (void)setThirdArrowUp:(BOOL)thirdArrowUp {
     _thirdArrowUp = thirdArrowUp;
     NSString *imageName = thirdArrowUp ? @"sort_up_blue" : @"sort_down_grey";
     [_thirdArrow setImage:[UIImage imageNamed:imageName]];
+    UIColor *titleColor = nil;
+    if (thirdArrowUp) {
+        titleColor = THEMECOLOR;
+    }
+    else {
+        titleColor = HexRGB(0x131415);
+    }
+    _thirdLabel.textColor = titleColor;
 }
 
 - (void)setShowWhiteBg:(BOOL)showWhiteBg {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/FreezeListViewController.m

@@ -102,7 +102,7 @@
     self.isLoadMore = YES;
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无数据" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self setPromptString:@"暂无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
     [self.tableView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/IncomeCountViewController.m

@@ -499,7 +499,7 @@
         label.textColor = HexRGB(0x999999);
         label.textAlignment = NSTextAlignmentCenter;
         label.numberOfLines = 1;
-        label.text = @"暂无数据";
+        label.text = @"暂无内容";
         [_emptyView addSubview:label];
     }
     return _emptyView;

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/MyIncomeViewController.m

@@ -120,7 +120,7 @@
     self.isLoadMore = YES;
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无数据" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self setPromptString:@"暂无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
     [self.tableView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/Controller/NoRecordViewController.m

@@ -103,7 +103,7 @@
     self.isLoadMore = YES;
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无数据" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self setPromptString:@"暂无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
     [self.tableView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Income/WithDraw/Controller/CashRecordViewController.m

@@ -97,7 +97,7 @@
     self.isLoadMore = YES;
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无数据" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self setPromptString:@"暂无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
     [self.tableView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/Controller/MyMusicViewController.m

@@ -396,7 +396,7 @@
             [nameArray addObject:[parm ks_stringValueForKey:@"subjectName"]];
         }
         MJWeakSelf;
-        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"声部筛选" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
             if (chooseIndex == 0) {
                 weakSelf.searchView.subjectLabel.text = @"声部";
                 weakSelf.subjectIds = nil;

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicNavView.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" 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="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -31,7 +31,7 @@
                             </connections>
                         </button>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的曲谱" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fg5-gJ-agg">
-                            <rect key="frame" x="170" y="11" width="74" height="22"/>
+                            <rect key="frame" x="171.5" y="11" width="71.5" height="22"/>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/>
                             <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <nil key="highlightedColor"/>
@@ -63,7 +63,7 @@
                     </constraints>
                 </view>
             </subviews>
-            <color key="backgroundColor" red="0.96470588235294119" green="0.97254901960784312" blue="0.97647058823529409" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="0Un-oK-0CF" secondAttribute="bottom" id="cn7-fn-TzD"/>
                 <constraint firstItem="0Un-oK-0CF" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="dct-AI-fyK"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicSearchView.h

@@ -20,6 +20,8 @@ typedef void(^MusicSearchCallback)(MYMUSICSORT type, NSString * _Nullable search
 
 @interface MyMusicSearchView : UIView
 
+@property (nonatomic, assign) BOOL arrowUp;
+
 @property (weak, nonatomic) IBOutlet UILabel *subjectLabel;
 
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicSearchView.m

@@ -8,6 +8,7 @@
 #import "MyMusicSearchView.h"
 
 @interface MyMusicSearchView ()<UITextFieldDelegate>
+@property (weak, nonatomic) IBOutlet UIImageView *arrowImage;
 
 @property (weak, nonatomic) IBOutlet UIView *subjectView;
 
@@ -21,6 +22,7 @@
 @end
 
 @implementation MyMusicSearchView
+
 - (void)awakeFromNib {
     [super awakeFromNib];
     self.searchField.delegate = self;
@@ -49,6 +51,7 @@
 }
 
 - (IBAction)searchAction:(id)sender {
+    self.arrowUp = YES;
     [self endEditing:YES];
     if (self.callback) {
         self.callback(MYMUSICSORT_SEARCH, self.searchField.text);
@@ -98,6 +101,17 @@
     return 68.0f;
 }
 
+- (void)setArrowUp:(BOOL)arrowUp {
+    _arrowUp = arrowUp;
+    if (arrowUp) {
+        self.subjectLabel.textColor = THEMECOLOR;
+        [self.arrowImage setImage:[UIImage imageNamed:@"sort_up_blue"]];
+    }
+    else {
+        self.subjectLabel.textColor = HexRGB(0x131415);
+        [self.arrowImage setImage:[UIImage imageNamed:@"sort_down_grey"]];
+    }
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Music/View/MyMusicSearchView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" 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="22130"/>
+        <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>
@@ -60,16 +60,16 @@
                             <rect key="frame" x="14" y="11" width="82" height="28"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="声部" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mag-Fm-Weq">
-                                    <rect key="frame" x="13" y="5.5" width="49" height="17"/>
+                                    <rect key="frame" x="13" y="5.5" width="47" height="17"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_arrow_down" translatesAutoresizingMaskIntoConstraints="NO" id="bvu-ci-chR">
-                                    <rect key="frame" x="67" y="11.5" width="7" height="5"/>
+                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down_grey" translatesAutoresizingMaskIntoConstraints="NO" id="bvu-ci-chR">
+                                    <rect key="frame" x="65" y="11.5" width="9" height="5"/>
                                     <constraints>
-                                        <constraint firstAttribute="height" constant="5" id="7da-ak-o9k"/>
-                                        <constraint firstAttribute="width" constant="7" id="F8i-tn-8zh"/>
+                                        <constraint firstAttribute="width" constant="9" id="9AK-ol-6io"/>
+                                        <constraint firstAttribute="height" constant="5" id="qbN-6O-iJz"/>
                                     </constraints>
                                 </imageView>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eHc-u8-6jc">
@@ -202,6 +202,7 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="arrowImage" destination="bvu-ci-chR" id="ZKG-bF-9XX"/>
                 <outlet property="searchField" destination="4Tn-Xi-Lsb" id="10U-Pk-G6G"/>
                 <outlet property="searchLeft" destination="1hp-NB-FNS" id="yWR-bj-Ia7"/>
                 <outlet property="subjectLabel" destination="mag-Fm-Weq" id="pat-Hc-3Mb"/>
@@ -213,8 +214,8 @@
     </objects>
     <resources>
         <image name="minePage_next" width="5" height="7"/>
-        <image name="mine_arrow_down" width="7" height="5"/>
-        <image name="search_green" width="15" height="16"/>
+        <image name="search_green" width="16" height="16"/>
+        <image name="sort_down_grey" width="9" height="5"/>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/LiveCourseGroup/MyLiveCourseGroupListCell.m

@@ -57,7 +57,7 @@
     else {
         self.courseDesc.text = @"暂无介绍";
     }
-    self.bookDesc.text = [NSString stringWithFormat:@"%.0f人已学习", model.studentCount];
+    self.bookDesc.text = [NSString stringWithFormat:@"%.0f人学习", model.studentCount];
     
     NSMutableAttributedString *attrs = [[NSMutableAttributedString alloc] initWithString:@"已上课时 " attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12.0f weight:UIFontWeightRegular],NSForegroundColorAttributeName:HexRGB(0x999999)}];
     NSAttributedString *finishNumAttr = [[NSAttributedString alloc] initWithString:[NSString stringWithFormat:@"%zd", model.completeCourseNum] attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:12.0f weight:UIFontWeightSemibold],NSForegroundColorAttributeName:THEMECOLOR}];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/AddressList/Controller/AddressListViewController.m

@@ -67,7 +67,7 @@
 - (void)resetParamenter {
     self.dataArray = [NSMutableArray array];
     [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无数据" imageName:@"wd_img_zwsj" inView:self.tableView];
+    [self setPromptString:@"暂无内容" imageName:@"wd_img_zwsj" inView:self.tableView];
     [self.tableView reloadData];
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/Controller/MinePageViewController.m

@@ -101,7 +101,7 @@
     self.categoryView.titles = self.titles;
     self.categoryView.delegate = self;
     self.categoryView.titleFont = [UIFont systemFontOfSize:16.0f];
-    self.categoryView.titleSelectedFont = [UIFont systemFontOfSize:18.0f weight:UIFontWeightMedium];
+    self.categoryView.titleSelectedFont = [UIFont systemFontOfSize:16.0f weight:UIFontWeightMedium];
     self.categoryView.titleSelectedColor = HexRGB(0x333333);
     self.categoryView.titleColor = HexRGB(0x666666);
     self.categoryView.titleColorGradientEnabled = YES;
@@ -159,6 +159,7 @@
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
+    [self refreshStatusBarWhite:YES];
     self.navigationController.interactivePopGestureRecognizer.enabled = YES;
     [self requestTeachMessage];
     [self requestSubjectList];
@@ -179,8 +180,24 @@
 
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
+    [self refreshStatusBarWhite:NO];
     [IQKeyboardManager sharedManager].enable = YES;
 }
+
+- (void)refreshStatusBarWhite:(BOOL)isWhite {
+    if (isWhite) {
+        [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleLightContent;
+    }
+    else {
+        if (@available(iOS 13.0, *)) {
+            [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDarkContent;
+        } else {
+            // Fallback on earlier versions
+            [UIApplication sharedApplication].statusBarStyle = UIStatusBarStyleDefault;
+        }
+    }
+}
+
 - (void)viewDidAppear:(BOOL)animated {
     [super viewDidAppear:animated];
     self.navigationController.interactivePopGestureRecognizer.enabled = (self.categoryView.selectedIndex == 0);
@@ -346,19 +363,23 @@
     if (space > 100) {
         CGFloat rate = (space - 100) / (height - 100);
         NSLog(@"rate ---------%f",rate);
-        self.headView.topView.backgroundColor = HexRGBAlpha(0xffffff, rate);
-        if (rate == 1) {
+        if (rate >= 1) {
+            [self refreshStatusBarWhite:NO];
+            self.headView.topView.backgroundColor = HexRGBAlpha(0xffffff, 1);
             [self.headView.backImage setImage:[UIImage imageNamed:@"back_black"]];
             [self.headView.editImage setImage:[UIImage imageNamed:@"minePage_nav_edit_black"]];
             self.headView.headTitle.hidden = NO;
         }
         else {
+            [self refreshStatusBarWhite:YES];
+            self.headView.topView.backgroundColor = [UIColor clearColor];
             [self.headView.backImage setImage:[UIImage imageNamed:@"back_white"]];
-            [self.headView.editImage setImage:[UIImage imageNamed:@"minePage_nav_edit_black"]];
+            [self.headView.editImage setImage:[UIImage imageNamed:@"minePage_nav_edit_white"]];
             self.headView.headTitle.hidden = YES;
         }
     }
     else {
+        [self refreshStatusBarWhite:YES];
         self.headView.topView.backgroundColor = [UIColor clearColor];
         [self.headView.backImage setImage:[UIImage imageNamed:@"back_white"]];
         [self.headView.editImage setImage:[UIImage imageNamed:@"minePage_nav_edit_white"]];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/AccompanyCourseCell.m

@@ -76,6 +76,7 @@
 
 /// 课表使用
 - (void)configWithCourseMessage:(TableCourseModel *)model beforeTime:(NSInteger)beforeTime actionCallback:(AccompanyLessonCallback)callback {
+    self.opreationButton.hidden = NO;
     if (callback) {
         self.lessonCallback = callback;
     }

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/FansGroupAlert/FansGroupAlertCell.xib

@@ -10,18 +10,18 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="83" id="KGk-i7-Jjw" customClass="FansGroupAlertCell">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="82" id="KGk-i7-Jjw" customClass="FansGroupAlertCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="83"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
                 <rect key="frame" x="0.0" y="0.0" width="320" height="83"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="76n-GO-SJx">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="63"/>
+                    <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="76n-GO-SJx">
+                        <rect key="frame" x="0.0" y="20" width="320" height="62"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chat_fansGroup_logo" translatesAutoresizingMaskIntoConstraints="NO" id="cOU-Gd-KLn">
-                                <rect key="frame" x="20" y="10.666666666666664" width="42" height="42"/>
+                                <rect key="frame" x="20" y="10.666666666666668" width="42" height="42"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="42" id="GO6-9I-49O"/>
                                     <constraint firstAttribute="width" constant="42" id="UbU-XM-x44"/>
@@ -33,7 +33,7 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛群" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u61-Cw-ZNy">
-                                <rect key="frame" x="72" y="11.666666666666664" width="211" height="21"/>
+                                <rect key="frame" x="72" y="11.666666666666668" width="211" height="21.000000000000004"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="21" id="uoW-G1-qle"/>
                                 </constraints>
@@ -75,9 +75,9 @@
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="76n-GO-SJx" secondAttribute="trailing" id="6hE-Rl-Wxq"/>
-                    <constraint firstItem="76n-GO-SJx" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="La4-FW-6ag"/>
+                    <constraint firstItem="76n-GO-SJx" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="20" id="La4-FW-6ag"/>
                     <constraint firstItem="76n-GO-SJx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="caU-el-hi7"/>
-                    <constraint firstAttribute="bottom" secondItem="76n-GO-SJx" secondAttribute="bottom" constant="20" id="dei-xP-eEf"/>
+                    <constraint firstAttribute="bottom" secondItem="76n-GO-SJx" secondAttribute="bottom" id="dei-xP-eEf"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/FansGroupAlert/FansGroupAlertView.m

@@ -9,7 +9,7 @@
 #import "FansGroupAlertCell.h"
 #import "FansGroupEmptyView.h"
 
-#define ROW_HEIGHT (62)
+#define ROW_HEIGHT (82)
 
 @interface FansGroupAlertView ()<UITableViewDelegate, UITableViewDataSource>
 
@@ -121,7 +121,7 @@
             _tableView.delegate = self;
             _tableView.dataSource = self;
             _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-            _tableView.rowHeight = 62.0f;
+            _tableView.rowHeight = 82.0f;
             _tableView.showsVerticalScrollIndicator = NO;
             _tableView.bounces = NO;
             // cell

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/FansGroupAlert/FansGroupAlertView.xib

@@ -14,13 +14,13 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sqT-l2-2xZ">
-                    <rect key="frame" x="46.666666666666657" y="328.66666666666669" width="300" height="195.00000000000006"/>
+                    <rect key="frame" x="46.666666666666657" y="338.66666666666669" width="300" height="175.00000000000006"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fansGroup_alert_top" translatesAutoresizingMaskIntoConstraints="NO" id="2UF-fm-A6l">
                             <rect key="frame" x="0.0" y="0.0" width="300" height="113"/>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yue-SE-dsU">
-                            <rect key="frame" x="0.0" y="133" width="300" height="62"/>
+                            <rect key="frame" x="0.0" y="113" width="300" height="62"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="62" id="rff-qF-IJm"/>
@@ -47,7 +47,7 @@
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstItem="Yue-SE-dsU" firstAttribute="top" secondItem="2UF-fm-A6l" secondAttribute="bottom" constant="20" id="4CQ-22-Cns"/>
+                        <constraint firstItem="Yue-SE-dsU" firstAttribute="top" secondItem="2UF-fm-A6l" secondAttribute="bottom" id="4CQ-22-Cns"/>
                         <constraint firstAttribute="trailing" secondItem="vb1-ly-0S5" secondAttribute="trailing" constant="13" id="78Z-MM-r6O"/>
                         <constraint firstAttribute="width" constant="300" id="7q4-Wf-OUU"/>
                         <constraint firstAttribute="trailing" secondItem="2UF-fm-A6l" secondAttribute="trailing" id="DUz-5t-U1V"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/FansGroupAlert/FansGroupEmptyView.m

@@ -34,7 +34,7 @@
 
 
 + (CGFloat)getViewHeight {
-    return 117.0f;
+    return 109.0f;
 }
 /*
 // Only override drawRect: if you perform custom drawing.

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/FansGroupAlert/FansGroupEmptyView.xib

@@ -11,11 +11,11 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="FansGroupEmptyView">
-            <rect key="frame" x="0.0" y="0.0" width="393" height="117"/>
+            <rect key="frame" x="0.0" y="0.0" width="393" height="109"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您还没有粉丝群哦！" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="l2a-hQ-h8R">
-                    <rect key="frame" x="141.66666666666666" y="24" width="110" height="18"/>
+                    <rect key="frame" x="141.66666666666666" y="20" width="110" height="18"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="dsd-YR-G19"/>
                     </constraints>
@@ -24,7 +24,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CjH-cO-TsD">
-                    <rect key="frame" x="20" y="66" width="353" height="35"/>
+                    <rect key="frame" x="20" y="58" width="353" height="35"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fansGroup_create" translatesAutoresizingMaskIntoConstraints="NO" id="CVO-yD-vX2">
                             <rect key="frame" x="142" y="7" width="20" height="21"/>
@@ -72,7 +72,7 @@
             <constraints>
                 <constraint firstItem="l2a-hQ-h8R" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="2aq-dB-YbB"/>
                 <constraint firstAttribute="bottom" secondItem="CjH-cO-TsD" secondAttribute="bottom" constant="16" id="bgB-ET-pbE"/>
-                <constraint firstItem="l2a-hQ-h8R" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="24" id="hBT-e0-ghc"/>
+                <constraint firstItem="l2a-hQ-h8R" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="hBT-e0-ghc"/>
                 <constraint firstItem="CjH-cO-TsD" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" id="xjn-a8-Awa"/>
                 <constraint firstAttribute="trailing" secondItem="CjH-cO-TsD" secondAttribute="trailing" constant="20" id="yAP-1h-lc1"/>
             </constraints>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/HeadView/MineEmptyIntroduceView.xib

@@ -45,11 +45,11 @@
                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                     <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                     <state key="normal" title="去填写">
-                                        <color key="titleColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                                        <color key="titleColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </state>
                                     <userDefinedRuntimeAttributes>
                                         <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                            <color key="value" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                                            <color key="value" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
                                         </userDefinedRuntimeAttribute>
                                         <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                                             <real key="value" value="1"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/HeadView/MinePageHeadView.xib

@@ -24,7 +24,7 @@
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </view>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <blurEffect style="dark"/>
+                    <blurEffect style="systemUltraThinMaterialDark"/>
                 </visualEffectView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="emY-nQ-Sbn">
                     <rect key="frame" x="0.0" y="0.0" width="414" height="88"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/LiveCourseCell.m

@@ -43,7 +43,7 @@
     self.courseName.text = [NSString returnNoNullStringWithString:model.courseGroupName];
         
     if (model.coursePrice > 0) {
-        self.orderUser.text = [NSString stringWithFormat:@"%.0f人已购买",model.studentCount];
+        self.orderUser.text = [NSString stringWithFormat:@"%.0f人学习",model.studentCount];
     }
     else {
         self.orderUser.text = [NSString stringWithFormat:@"%.0f人已领取",model.studentCount];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineMusic/MinePageMusicSortView.h

@@ -18,6 +18,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MinePageMusicSortView : UIView
 
+@property (nonatomic, assign) BOOL arrowUp;
+
 @property (weak, nonatomic) IBOutlet UILabel *subjectLabel;
 
 + (instancetype)shareInstance;

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineMusic/MinePageMusicSortView.m

@@ -9,6 +9,8 @@
 
 @interface MinePageMusicSortView ()<UITextFieldDelegate>
 
+@property (weak, nonatomic) IBOutlet UIImageView *arrowImage;
+
 @property (weak, nonatomic) IBOutlet UIView *subjectView;
 
 @property (weak, nonatomic) IBOutlet UITextField *searchField;
@@ -37,6 +39,7 @@
 }
 
 - (IBAction)chooseSubject:(id)sender {
+    self.arrowUp = YES;
     [self endEditing:YES];
     if (self.callback) {
         self.callback(MINEMUSICSORT_SUBJECT, nil);
@@ -68,6 +71,18 @@
 + (CGFloat)getViewHeight {
     return 58.0f;
 }
+
+- (void)setArrowUp:(BOOL)arrowUp {
+    _arrowUp = arrowUp;
+    if (arrowUp) {
+        self.subjectLabel.textColor = THEMECOLOR;
+        [self.arrowImage setImage:[UIImage imageNamed:@"sort_up_blue"]];
+    }
+    else {
+        self.subjectLabel.textColor = HexRGB(0x131415);
+        [self.arrowImage setImage:[UIImage imageNamed:@"sort_down_grey"]];
+    }
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineMusic/MinePageMusicSortView.xib

@@ -140,6 +140,7 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="arrowImage" destination="0bT-xj-tf9" id="hfx-AZ-5uG"/>
                 <outlet property="searchField" destination="aQD-Vo-e2o" id="31J-08-JHU"/>
                 <outlet property="subjectLabel" destination="n2B-hz-KHC" id="UJ6-FP-R5W"/>
                 <outlet property="subjectView" destination="Xmo-XL-5yx" id="yHj-SU-R5W"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MineMusic/MinePageMusicView.m

@@ -38,6 +38,8 @@
 
 @property (nonatomic, strong) NSString *subjectIds;
 
+@property (nonatomic, assign) NSInteger lastChooseIndex;
+
 @end
 
 @implementation MinePageMusicView
@@ -269,7 +271,9 @@
             [nameArray addObject:[parm ks_stringValueForKey:@"subjectName"]];
         }
         MJWeakSelf;
-        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:self.lastChooseIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            weakSelf.sortView.arrowUp = NO;
+            weakSelf.lastChooseIndex = chooseIndex;
             if (chooseIndex == 0) {
                 weakSelf.sortView.subjectLabel.text = @"全部声部";
                 weakSelf.subjectIds = nil;
@@ -281,11 +285,13 @@
             }
             [weakSelf refreshAndRequestData];
         } cancel:^{
+            weakSelf.sortView.arrowUp = NO;
         }];
         [picker showPicker];
     }
     else {
         [LOADING_MANAGER MBShowAUTOHidingInWindow:@"无声部信息"];
+        self.sortView.arrowUp = NO;
     }
 }
 

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/MinePageLiveCourse/MineLiveCourseGroupCell.m

@@ -45,7 +45,7 @@
     self.courseName.text = [NSString returnNoNullStringWithString:model.courseGroupName];
         
     if (model.coursePrice > 0) {
-        self.orderUser.text = [NSString stringWithFormat:@"%.0f人已购买",model.studentCount];
+        self.orderUser.text = [NSString stringWithFormat:@"%.0f人学习",model.studentCount];
     }
     else {
         self.orderUser.text = [NSString stringWithFormat:@"%.0f人已领取",model.studentCount];