UI样式修改

KulexiuForStudent/KulexiuForStudent.xcodeproj/xcshareddata/xcschemes/KulexiuForStudent.xcscheme

@@ -51,7 +51,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "TEST"
+      buildConfiguration = "DEV"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/ArrangeCourse/arr_sort_down.imageset/Contents.json

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

KulexiuForStudent/KulexiuForStudent/Assets.xcassets/ArrangeCourse/arr_sort_up.imageset/Contents.json

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

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

@@ -19,7 +19,7 @@
 
 #define HIDE_COURSETIPS (@"HIDE_COURSETIPS")
 
-#define HEADER_HEIGHT (50)
+#define HEADER_HEIGHT (44)
 
 @interface HomeArrangeCourseController ()<JXPagerViewDelegate, JXPagerMainTableViewGestureDelegate,JXCategoryViewDelegate>
 

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/CourseDescAlertCell.xib

@@ -20,8 +20,8 @@
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZxP-yq-fSD">
                         <rect key="frame" x="0.0" y="0.0" width="324" height="248"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="什么是VIP定制课程？" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H1O-RV-1Sz">
-                                <rect key="frame" x="20" y="16" width="139.33333333333334" height="18"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="什么是VIP定制课？" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H1O-RV-1Sz">
+                                <rect key="frame" x="20.000000000000007" y="16" width="124.66666666666669" height="18"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18" id="EFZ-kx-sVa"/>
                                 </constraints>
@@ -31,7 +31,7 @@
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="69V-S9-pbv">
                                 <rect key="frame" x="20" y="44" width="284" height="155.33333333333334"/>
-                                <string key="text">VIP定制课程采用一对一专属授课模式，每节课时长为45分钟。课程内容根据学生的具体需求量身打造，旨在全面提升学生的个人技能与表现。不论是希望在乐器演奏技巧上取得突破，如提高指法精准度、气息控制能力或节奏掌握等；还是为即将到来的重要活动、比赛或考级做充分准备，我们都能提供高度匹配的教学方案。此外，教学进度将根据每位学员的学习吸收情况灵活调整，确保每个人都能在最适合自己的节奏中稳步前进，扎实提升个人能力。</string>
+                                <string key="text">VIP定制课采用一对一专属授课模式，每节课时长为45分钟。课程内容根据学生的具体需求量身打造，旨在全面提升学生的个人技能与表现。不论是希望在乐器演奏技巧上取得突破，如提高指法精准度、气息控制能力或节奏掌握等；还是为即将到来的重要活动、比赛或考级做充分准备，我们都能提供高度匹配的教学方案。此外，教学进度将根据每位学员的学习吸收情况灵活调整，确保每个人都能在最适合自己的节奏中稳步前进，扎实提升个人能力。</string>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" red="0.46666666666666667" green="0.46666666666666667" blue="0.46666666666666667" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeAccompanyCourseView.m

@@ -258,13 +258,14 @@
         }
         MJWeakSelf;
         KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:self.subjectIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            weakSelf.searchView.arrowUp = NO;
             weakSelf.subjectIndex = chooseIndex;
             weakSelf.searchView.subjectLabel.text = returnValue;
             NSDictionary *parm = self.subjectList[chooseIndex];
             weakSelf.subjectId = [parm ks_stringValueForKey:@"subjectId"];
             [weakSelf refreshAndRequestData];
         } cancel:^{
-            
+            weakSelf.searchView.arrowUp = NO;
         }];
         [picker showPicker];
     }

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeLiveCourseView.m

@@ -311,13 +311,14 @@
         }
         MJWeakSelf;
         KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:self.subjectIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            weakSelf.searchView.arrowUp = NO;
             weakSelf.subjectIndex = chooseIndex;
             weakSelf.searchView.subjectLabel.text = returnValue;
             NSDictionary *parm = self.subjectList[chooseIndex];
             weakSelf.subjectId = [parm ks_stringValueForKey:@"subjectId"];
             [weakSelf refreshAndRequestData];
         } cancel:^{
-            
+            weakSelf.searchView.arrowUp = NO;
         }];
         [picker showPicker];
     }

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeNavView.xib

@@ -30,10 +30,10 @@
                             </connections>
                         </button>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="program_tips" translatesAutoresizingMaskIntoConstraints="NO" id="VqX-k4-IdB">
-                            <rect key="frame" x="361" y="13" width="18" height="18"/>
+                            <rect key="frame" x="355" y="10" width="24" height="24"/>
                             <constraints>
-                                <constraint firstAttribute="width" constant="18" id="E3f-Aq-S5r"/>
-                                <constraint firstAttribute="height" constant="18" id="qw7-3D-obn"/>
+                                <constraint firstAttribute="height" constant="24" id="aNe-7N-jYM"/>
+                                <constraint firstAttribute="width" constant="24" id="eBX-73-7N0"/>
                             </constraints>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fmL-Hf-OFx">

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

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

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeSortView.m

@@ -9,6 +9,8 @@
 
 @interface HomeArrangeSortView ()<UITextFieldDelegate>
 
+@property (weak, nonatomic) IBOutlet UIImageView *arrowImage;
+
 
 @property (weak, nonatomic) IBOutlet UITextField *searchField;
 
@@ -36,6 +38,7 @@
 }
 
 - (IBAction)chooseSubject:(id)sender {
+    self.arrowUp = YES;
     [self endEditing:YES];
     if (self.callback) {
         self.callback(HOME_ARRANGE_SORT_SUBJECT, nil);
@@ -60,6 +63,22 @@
 + (CGFloat)getViewHeight {
     return 58.0f;
 }
+
+- (void)setArrowUp:(BOOL)arrowUp {
+    _arrowUp = arrowUp;
+    NSString *imageName = nil;
+    UIColor *labelColor = nil;
+    if (arrowUp) {
+        imageName = @"arr_sort_up";
+        labelColor = THEMECOLOR;
+    }
+    else {
+        imageName = @"arr_sort_down";
+        labelColor = HexRGB(0x131415);
+    }
+    [_arrowImage setImage:[UIImage imageNamed:imageName]];
+    self.subjectLabel.textColor = labelColor;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeSortView.xib

@@ -22,8 +22,8 @@
                             <color key="textColor" red="0.074509803921568626" green="0.078431372549019607" blue="0.082352941176470587" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="L2t-eK-pev">
-                            <rect key="frame" x="32" y="14" width="9" height="6"/>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arr_sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="L2t-eK-pev">
+                            <rect key="frame" x="32" y="14.666666666666666" width="9" height="4.6666666666666661"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="9" id="OHG-D3-ed4"/>
                             </constraints>
@@ -117,6 +117,7 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="arrowImage" destination="L2t-eK-pev" id="nAd-5m-WzG"/>
                 <outlet property="searchField" destination="QIy-bA-QSm" id="OMk-OF-AV9"/>
                 <outlet property="subjectLabel" destination="0zy-dI-QZa" id="PZl-hZ-Q22"/>
             </connections>
@@ -124,7 +125,7 @@
         </view>
     </objects>
     <resources>
+        <image name="arr_sort_down" width="8" height="4.6666665077209473"/>
         <image name="arrange_search_green" width="16" height="16"/>
-        <image name="sort_down" width="8" height="6"/>
     </resources>
 </document>

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeVIPCourseView.m

@@ -258,13 +258,14 @@
         }
         MJWeakSelf;
         KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:self.subjectIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            weakSelf.searchView.arrowUp = NO;
             weakSelf.subjectIndex = chooseIndex;
             weakSelf.searchView.subjectLabel.text = returnValue;
             NSDictionary *parm = self.subjectList[chooseIndex];
             weakSelf.subjectId = [parm ks_stringValueForKey:@"subjectId"];
             [weakSelf refreshAndRequestData];
         } cancel:^{
-            
+            weakSelf.searchView.arrowUp = NO;
         }];
         [picker showPicker];
     }

KulexiuForStudent/KulexiuForStudent/Module/Home/ArrangeCourse/View/HomeArrangeVideoCourseView.m

@@ -238,13 +238,14 @@
         }
         MJWeakSelf;
         KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"" sourceData:nameArray lastChooseIndex:self.subjectIndex sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
+            weakSelf.searchView.arrowUp = NO;
             weakSelf.subjectIndex = chooseIndex;
             weakSelf.searchView.subjectLabel.text = returnValue;
             NSDictionary *parm = self.subjectList[chooseIndex];
             weakSelf.subjectId = [parm ks_stringValueForKey:@"subjectId"];
             [weakSelf refreshAndRequestData];
         } cancel:^{
-            
+            weakSelf.searchView.arrowUp = NO;
         }];
         [picker showPicker];
     }

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

@@ -36,7 +36,11 @@
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="program_tips" translatesAutoresizingMaskIntoConstraints="NO" id="cd4-ry-QF5">
-                            <rect key="frame" x="359" y="12" width="20" height="20"/>
+                            <rect key="frame" x="355" y="10" width="24" height="24"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="24" id="ZhB-TP-zNf"/>
+                                <constraint firstAttribute="height" constant="24" id="udx-p5-aah"/>
+                            </constraints>
                         </imageView>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2NZ-5x-aXa">
                             <rect key="frame" x="349" y="0.0" width="44" height="44"/>

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyCourseSortView/MyCourseSearchView.m

@@ -8,6 +8,9 @@
 #import "MyCourseSearchView.h"
 
 @interface MyCourseSearchView ()<UITextFieldDelegate>
+@property (weak, nonatomic) IBOutlet UILabel *sortLabel;
+
+@property (weak, nonatomic) IBOutlet UIImageView *arrowImage;
 
 @property (weak, nonatomic) IBOutlet UITextField *searchField;
 
@@ -61,6 +64,22 @@
 + (CGFloat)getViewHeight {
     return 58.0f;
 }
+
+- (void)setArrowUp:(BOOL)arrowUp {
+    _arrowUp = arrowUp;
+    NSString *imageName = nil;
+    UIColor *labelColor = nil;
+    if (arrowUp) {
+        imageName = @"arr_sort_up";
+        labelColor = THEMECOLOR;
+    }
+    else {
+        imageName = @"arr_sort_down";
+        labelColor = HexRGB(0x131415);
+    }
+    [_arrowImage setImage:[UIImage imageNamed:imageName]];
+    self.sortLabel.textColor = labelColor;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyCourseSortView/MyCourseSearchView.xib

@@ -22,7 +22,7 @@
                             <color key="textColor" red="0.074509803920000006" green="0.078431372550000003" blue="0.08235294118" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down_grey" translatesAutoresizingMaskIntoConstraints="NO" id="aG3-fG-AR8">
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arr_sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="aG3-fG-AR8">
                             <rect key="frame" x="32" y="14.666666666666668" width="9" height="5"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="9" id="VIv-ab-N47"/>
@@ -117,13 +117,15 @@
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
+                <outlet property="arrowImage" destination="aG3-fG-AR8" id="nXt-Hn-CIk"/>
                 <outlet property="searchField" destination="ZbY-Gz-MYd" id="uG1-ld-TiF"/>
+                <outlet property="sortLabel" destination="JbG-oJ-9Y1" id="K4F-fo-zB0"/>
             </connections>
             <point key="canvasLocation" x="32.824427480916029" y="-2.1126760563380285"/>
         </view>
     </objects>
     <resources>
+        <image name="arr_sort_down" width="8" height="4.6666665077209473"/>
         <image name="search_green" width="15" height="16"/>
-        <image name="sort_down_grey" width="9" height="5"/>
     </resources>
 </document>