nothing

KulexiuForStudent/KulexiuForStudent.xcodeproj/project.pbxproj

@@ -992,21 +992,6 @@
 		BCFDA63128BC99410022B497 /* HomeBannerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA62D28BC99410022B497 /* HomeBannerView.xib */; };
 		BCFDA63728BCA1C60022B497 /* HomeRecentCourseView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCFDA63428BCA1C60022B497 /* HomeRecentCourseView.m */; };
 		BCFDA63828BCA1C60022B497 /* HomeRecentCourseView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA63628BCA1C60022B497 /* HomeRecentCourseView.xib */; };
-		BCFDA64A28BCA2000022B497 /* accomapny_animation.json in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA63A28BCA2000022B497 /* accomapny_animation.json */; };
-		BCFDA64B28BCA2000022B497 /* musicRoom_animation_2.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA63C28BCA2000022B497 /* musicRoom_animation_2.png */; };
-		BCFDA64C28BCA2000022B497 /* live_animation_0.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA63D28BCA2000022B497 /* live_animation_0.png */; };
-		BCFDA64D28BCA2000022B497 /* live_animation_1.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA63E28BCA2000022B497 /* live_animation_1.png */; };
-		BCFDA64E28BCA2000022B497 /* musicRoom_animation_3.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA63F28BCA2000022B497 /* musicRoom_animation_3.png */; };
-		BCFDA64F28BCA2000022B497 /* musicRoom_animation_1.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA64028BCA2000022B497 /* musicRoom_animation_1.png */; };
-		BCFDA65028BCA2000022B497 /* live_animation_3.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA64128BCA2000022B497 /* live_animation_3.png */; };
-		BCFDA65128BCA2000022B497 /* live_animation_2.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA64228BCA2000022B497 /* live_animation_2.png */; };
-		BCFDA65228BCA2000022B497 /* musicRoom_animation_0.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA64328BCA2000022B497 /* musicRoom_animation_0.png */; };
-		BCFDA65328BCA2000022B497 /* accomapny_animation_3.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA64428BCA2000022B497 /* accomapny_animation_3.png */; };
-		BCFDA65428BCA2000022B497 /* accomapny_animation_2.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA64528BCA2000022B497 /* accomapny_animation_2.png */; };
-		BCFDA65528BCA2000022B497 /* accomapny_animation_0.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA64628BCA2000022B497 /* accomapny_animation_0.png */; };
-		BCFDA65628BCA2000022B497 /* accomapny_animation_1.png in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA64728BCA2000022B497 /* accomapny_animation_1.png */; };
-		BCFDA65728BCA2000022B497 /* musicRoom_animation.json in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA64828BCA2000022B497 /* musicRoom_animation.json */; };
-		BCFDA65828BCA2000022B497 /* live_animation.json in Resources */ = {isa = PBXBuildFile; fileRef = BCFDA64928BCA2000022B497 /* live_animation.json */; };
 		BCFDA65C28BCAEB10022B497 /* HomePageBodyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCFDA65B28BCAEB10022B497 /* HomePageBodyView.m */; };
 		BCFDA65F28BCAEC80022B497 /* HomeInformationBodyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCFDA65E28BCAEC80022B497 /* HomeInformationBodyView.m */; };
 		BCFDA66228BDC3640022B497 /* TalentTeacherModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BCFDA66028BDC3630022B497 /* TalentTeacherModel.m */; };
@@ -2674,21 +2659,6 @@
 		BCFDA63428BCA1C60022B497 /* HomeRecentCourseView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeRecentCourseView.m; sourceTree = "<group>"; };
 		BCFDA63528BCA1C60022B497 /* HomeRecentCourseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeRecentCourseView.h; sourceTree = "<group>"; };
 		BCFDA63628BCA1C60022B497 /* HomeRecentCourseView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = HomeRecentCourseView.xib; sourceTree = "<group>"; };
-		BCFDA63A28BCA2000022B497 /* accomapny_animation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = accomapny_animation.json; sourceTree = "<group>"; };
-		BCFDA63C28BCA2000022B497 /* musicRoom_animation_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicRoom_animation_2.png; sourceTree = "<group>"; };
-		BCFDA63D28BCA2000022B497 /* live_animation_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = live_animation_0.png; sourceTree = "<group>"; };
-		BCFDA63E28BCA2000022B497 /* live_animation_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = live_animation_1.png; sourceTree = "<group>"; };
-		BCFDA63F28BCA2000022B497 /* musicRoom_animation_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicRoom_animation_3.png; sourceTree = "<group>"; };
-		BCFDA64028BCA2000022B497 /* musicRoom_animation_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicRoom_animation_1.png; sourceTree = "<group>"; };
-		BCFDA64128BCA2000022B497 /* live_animation_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = live_animation_3.png; sourceTree = "<group>"; };
-		BCFDA64228BCA2000022B497 /* live_animation_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = live_animation_2.png; sourceTree = "<group>"; };
-		BCFDA64328BCA2000022B497 /* musicRoom_animation_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicRoom_animation_0.png; sourceTree = "<group>"; };
-		BCFDA64428BCA2000022B497 /* accomapny_animation_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = accomapny_animation_3.png; sourceTree = "<group>"; };
-		BCFDA64528BCA2000022B497 /* accomapny_animation_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = accomapny_animation_2.png; sourceTree = "<group>"; };
-		BCFDA64628BCA2000022B497 /* accomapny_animation_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = accomapny_animation_0.png; sourceTree = "<group>"; };
-		BCFDA64728BCA2000022B497 /* accomapny_animation_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = accomapny_animation_1.png; sourceTree = "<group>"; };
-		BCFDA64828BCA2000022B497 /* musicRoom_animation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = musicRoom_animation.json; sourceTree = "<group>"; };
-		BCFDA64928BCA2000022B497 /* live_animation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = live_animation.json; sourceTree = "<group>"; };
 		BCFDA65A28BCAEB10022B497 /* HomePageBodyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomePageBodyView.h; sourceTree = "<group>"; };
 		BCFDA65B28BCAEB10022B497 /* HomePageBodyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomePageBodyView.m; sourceTree = "<group>"; };
 		BCFDA65D28BCAEC80022B497 /* HomeInformationBodyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeInformationBodyView.h; sourceTree = "<group>"; };
@@ -6479,7 +6449,6 @@
 		BCFDA63328BCA1850022B497 /* RecentCourse */ = {
 			isa = PBXGroup;
 			children = (
-				BCFDA63928BCA2000022B497 /* AnimationSource */,
 				BCFDA63528BCA1C60022B497 /* HomeRecentCourseView.h */,
 				BCFDA63428BCA1C60022B497 /* HomeRecentCourseView.m */,
 				BCFDA63628BCA1C60022B497 /* HomeRecentCourseView.xib */,
@@ -6487,36 +6456,6 @@
 			path = RecentCourse;
 			sourceTree = "<group>";
 		};
-		BCFDA63928BCA2000022B497 /* AnimationSource */ = {
-			isa = PBXGroup;
-			children = (
-				BCFDA63B28BCA2000022B497 /* images */,
-				BCFDA63A28BCA2000022B497 /* accomapny_animation.json */,
-				BCFDA64928BCA2000022B497 /* live_animation.json */,
-				BCFDA64828BCA2000022B497 /* musicRoom_animation.json */,
-			);
-			path = AnimationSource;
-			sourceTree = "<group>";
-		};
-		BCFDA63B28BCA2000022B497 /* images */ = {
-			isa = PBXGroup;
-			children = (
-				BCFDA63C28BCA2000022B497 /* musicRoom_animation_2.png */,
-				BCFDA63D28BCA2000022B497 /* live_animation_0.png */,
-				BCFDA63E28BCA2000022B497 /* live_animation_1.png */,
-				BCFDA63F28BCA2000022B497 /* musicRoom_animation_3.png */,
-				BCFDA64028BCA2000022B497 /* musicRoom_animation_1.png */,
-				BCFDA64128BCA2000022B497 /* live_animation_3.png */,
-				BCFDA64228BCA2000022B497 /* live_animation_2.png */,
-				BCFDA64328BCA2000022B497 /* musicRoom_animation_0.png */,
-				BCFDA64428BCA2000022B497 /* accomapny_animation_3.png */,
-				BCFDA64528BCA2000022B497 /* accomapny_animation_2.png */,
-				BCFDA64628BCA2000022B497 /* accomapny_animation_0.png */,
-				BCFDA64728BCA2000022B497 /* accomapny_animation_1.png */,
-			);
-			path = images;
-			sourceTree = "<group>";
-		};
 		BCFDA65928BCAE7C0022B497 /* HomePageView */ = {
 			isa = PBXGroup;
 			children = (
@@ -6759,10 +6698,8 @@
 				BCC0F65B2A8CD8F500C4EFA4 /* TxClassroomChatOtherCell.xib in Resources */,
 				2723B66127F15CFB00E0B90B /* SettingBodyView.xib in Resources */,
 				BC11928C280FB44300A716F7 /* HomeworkVideoView.xib in Resources */,
-				BCFDA64D28BCA2000022B497 /* live_animation_1.png in Resources */,
 				BCD457A2286313D70010B493 /* NotiferNavView.xib in Resources */,
 				275E8AB527E18F8B00DD3F6E /* Assets.xcassets in Resources */,
-				BCFDA65028BCA2000022B497 /* live_animation_3.png in Resources */,
 				BC71D252288804CD0010F14B /* img_29.png in Resources */,
 				BC71D24D288804CD0010F14B /* img_12.png in Resources */,
 				BCC17DF82CEC6B4100808B60 /* ArrangeRecentRankButtonView.xib in Resources */,
@@ -6822,7 +6759,6 @@
 				BCFDA63828BCA1C60022B497 /* HomeRecentCourseView.xib in Resources */,
 				BC119270280FAF7D00A716F7 /* AccompanyCourseInfoCell.xib in Resources */,
 				BC2DFF5828BE143A0056105A /* HomeTempLiveCell.xib in Resources */,
-				BCFDA65528BCA2000022B497 /* accomapny_animation_0.png in Resources */,
 				BC3BF6412B9FE92600831494 /* ShareFunctionView.xib in Resources */,
 				BCC583C828A9EC6400BAB4CF /* cloud_animation_10.png in Resources */,
 				BCA3369A2C942B280074DF75 /* KSSourceDownloadAlert.xib in Resources */,
@@ -6846,18 +6782,15 @@
 				BC40B9FA2811768400DEC0D1 /* HotInformationHeadView.xib in Resources */,
 				BC27A06E280FF56C00F91E27 /* AccompanyEvaluateCell.xib in Resources */,
 				BC71D27B288804CD0010F14B /* img_21.png in Resources */,
-				BCFDA65628BCA2000022B497 /* accomapny_animation_1.png in Resources */,
 				BC38C3ED2AF893B400ABFCC2 /* KSMergeAudioControlView.xib in Resources */,
 				2723B66327F15CFC00E0B90B /* ModifyNameBodyView.xib in Resources */,
 				BC71D255288804CD0010F14B /* img_5.png in Resources */,
 				BC83A8402AD28AA60033D48B /* TenantNotiferNavView.xib in Resources */,
 				BCB6348327F6D29600ACFDCF /* LiveSeatApplyView.xib in Resources */,
-				BCFDA65328BCA2000022B497 /* accomapny_animation_3.png in Resources */,
 				BC8C2C612823F57100FBA5D5 /* MyAddressListCell.xib in Resources */,
 				BC31BF292B21925700F7D538 /* WidgetSpeedView.xib in Resources */,
 				2723B66A27F15CFC00E0B90B /* PhoneChangeBodyView.xib in Resources */,
 				BCC0F6662A8CD8F500C4EFA4 /* TXDanChatCell.xib in Resources */,
-				BCFDA65728BCA2000022B497 /* musicRoom_animation.json in Resources */,
 				BC8418412AC2D96C00D8F90E /* PasswordCheckBodyView.xib in Resources */,
 				BCC0F6622A8CD8F500C4EFA4 /* MainDisplayView.xib in Resources */,
 				BC71D278288804CD0010F14B /* img_20.png in Resources */,
@@ -6880,7 +6813,6 @@
 				BC71D12F2887A4DC0010F14B /* student_refresh.json in Resources */,
 				BC11929D280FD2EF00A716F7 /* HomeworkBottomView.xib in Resources */,
 				BC7663182827E49900C91A1D /* NotiferMessageCell.xib in Resources */,
-				BCFDA64B28BCA2000022B497 /* musicRoom_animation_2.png in Resources */,
 				BCC583C728A9EC6400BAB4CF /* cloud_animation_12.png in Resources */,
 				BCECE24B2B3D670500C0D555 /* KSSortButtonView.xib in Resources */,
 				BC71D26D288804CD0010F14B /* img_18.png in Resources */,
@@ -6893,14 +6825,12 @@
 				BCC0F6702A8CD8F500C4EFA4 /* MainToolButton.xib in Resources */,
 				BCB6347427F6D29600ACFDCF /* BaseEmoji.plist in Resources */,
 				BCB9091928530EA500F5FF69 /* KSShopCardView.xib in Resources */,
-				BCFDA64F28BCA2000022B497 /* musicRoom_animation_1.png in Resources */,
 				BC40BA252812560100DEC0D1 /* HomeCourseTipsView.xib in Resources */,
 				BC71D270288804CD0010F14B /* img_32.png in Resources */,
 				BC9AA0BC2ABC288600CD954D /* ChatComplainBottomView.xib in Resources */,
 				27F9032E27E87C2E00C08A19 /* DeviceCheckView.xib in Resources */,
 				BC31BF1D2B21925700F7D538 /* TuningForkSettingView.xib in Resources */,
 				275FA23727E7356B00CFEA2E /* LoginBodyView.xib in Resources */,
-				BCFDA65428BCA2000022B497 /* accomapny_animation_2.png in Resources */,
 				BC0D95332AC2AAA400E54D3F /* ForgetPasswordBodyView.xib in Resources */,
 				BC0D95182AC280CA00E54D3F /* KSWebLoadRefreshView.xib in Resources */,
 				BC71D273288804CD0010F14B /* img_33.png in Resources */,
@@ -6909,7 +6839,6 @@
 				BCFA12682CF424D8005229AC /* ProgramCourseListCell.xib in Resources */,
 				BC5A4B8B2CF42104008C2FDD /* MusicRoomCourseListCell.xib in Resources */,
 				BC5A4B8C2CF42104008C2FDD /* MusicRoomGroupHeadView.xib in Resources */,
-				BCFDA65828BCA2000022B497 /* live_animation.json in Resources */,
 				BCB5B2D62ABB1E13005BF25D /* KSEmptyStatusView.xib in Resources */,
 				BC31BF1E2B21925700F7D538 /* TunerSettingView.xib in Resources */,
 				BC71D259288804CD0010F14B /* img_48.png in Resources */,
@@ -6973,13 +6902,11 @@
 				BCC583B828A9EC6400BAB4CF /* cloud_animation_23.png in Resources */,
 				BC756CC328FE7DA900AA9ECB /* UserDetailNavView.xib in Resources */,
 				2723B66E27F15CFC00E0B90B /* PhoneCheckBodyView.xib in Resources */,
-				BCFDA65128BCA2000022B497 /* live_animation_2.png in Resources */,
 				BC119217280ED6A900A716F7 /* MyLessonSearchView.xib in Resources */,
 				BCC583BD28A9EC6400BAB4CF /* cloud_animation_25.png in Resources */,
 				BCC583BC28A9EC6400BAB4CF /* cloud_animation_19.png in Resources */,
 				BC71D262288804CD0010F14B /* img_54.png in Resources */,
 				BC8C2C5A2823F57100FBA5D5 /* areainfo.json in Resources */,
-				BCFDA64E28BCA2000022B497 /* musicRoom_animation_3.png in Resources */,
 				BC31BF232B21925700F7D538 /* ToneTuningBodyView.xib in Resources */,
 				BCC583CA28A9EC6400BAB4CF /* cloud_animation_6.png in Resources */,
 				2723B5C527F157B100E0B90B /* ContractListCell.xib in Resources */,
@@ -6997,7 +6924,6 @@
 				BC38C4A32AFA4F6C00ABFCC2 /* TenantMineFunctionView.xib in Resources */,
 				BCC0F6B32A8CDD4000C4EFA4 /* low_staff.png in Resources */,
 				BCB9FA47286EDCD7005D766B /* KSTipsAlert.xib in Resources */,
-				BCFDA64C28BCA2000022B497 /* live_animation_0.png in Resources */,
 				BC2932F52AAEC44E0024D98E /* InstitutionMineNavView.xib in Resources */,
 				BCC0F6582A8CD8F500C4EFA4 /* TXChatAreaTopView.xib in Resources */,
 				BC542E40284079E300633781 /* UserAuthBodyView.xib in Resources */,
@@ -7024,7 +6950,6 @@
 				BCC17DEE2CEC5CC600808B60 /* HomeArrangeRankView.xib in Resources */,
 				BC0D1F72281015B000C5D9E5 /* VideoCourseCell.xib in Resources */,
 				BCECE24A2B3D670500C0D555 /* FeedbackSortView.xib in Resources */,
-				BCFDA64A28BCA2000022B497 /* accomapny_animation.json in Resources */,
 				BCECE2492B3D670500C0D555 /* FeedbackNavView.xib in Resources */,
 				BCC409032AFCE6B500C60249 /* VideoCropImageViewCell.xib in Resources */,
 				BCC409082AFCE6B500C60249 /* KSCropImageNavView.xib in Resources */,
@@ -7039,7 +6964,6 @@
 				BCCE95C92AB0363100AB6385 /* TenantDarkSearhView.xib in Resources */,
 				BC40B9FF281177BD00DEC0D1 /* HomeInformationCell.xib in Resources */,
 				BC31BF2E2B21925700F7D538 /* WidgetDotView.xib in Resources */,
-				BCFDA65228BCA2000022B497 /* musicRoom_animation_0.png in Resources */,
 				BCC0F66B2A8CD8F500C4EFA4 /* ClassRoomTitleButton.xib in Resources */,
 				BC31BF1B2B21925700F7D538 /* TuningNavView.xib in Resources */,
 				BCFDA66828BDF06E0022B497 /* HomeHotStyleCell.xib in Resources */,

KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.h

@@ -551,11 +551,12 @@ NS_ASSUME_NONNULL_BEGIN
 /// 视频课列表查询
 /// @param post post
 /// @param lessonSubject 声部
+/// @param search 搜索
 /// @param page 分页
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)videoLessonGroupRequest:(NSString *)post lessonSubject:(NSString *)lessonSubject page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
++ (void)videoLessonGroupRequest:(NSString *)post lessonSubject:(NSString *)lessonSubject search:(NSString *)search page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure;
 
 // /api-student/courseSchedule/queryPianoClass
 

KulexiuForStudent/KulexiuForStudent/Common/Base/KSNetworkingManager.m

@@ -1154,15 +1154,17 @@
 /// 视频课列表查询
 /// @param post post
 /// @param lessonSubject 声部
+/// @param search 搜索
 /// @param page 分页
 /// @param rows 条数
 /// @param success 成功
 /// @param faliure 失败
-+ (void)videoLessonGroupRequest:(NSString *)post lessonSubject:(NSString *)lessonSubject page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
++ (void)videoLessonGroupRequest:(NSString *)post lessonSubject:(NSString *)lessonSubject search:(NSString *)search page:(NSInteger)page rows:(NSInteger)rows success:(void(^)(NSDictionary *dic))success faliure:(void(^)(NSError *error))faliure {
     [self configRequestMethodJSON];
     NSString *url = [NSString stringWithFormat:@"%@%@", hostURL, @"/api-student/videoLesson/selectMyGroup"];
     NSMutableDictionary *parm = [NSMutableDictionary dictionary];
     [parm setValue:lessonSubject forKey:@"lessonSubject"];
+    [parm setValue:search forKey:@"search"];
     [parm setValue:@(page) forKey:@"page"];
     [parm setValue:@(rows) forKey:@"rows"];
     [self request:post andWithUrl:url and:parm success:success faliure:faliure];

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeNewMusic/HomeNewMusicView.m

@@ -33,7 +33,7 @@
 }
 
 + (CGFloat)getViewHeight {
-    return 364.0f;
+    return 376.0f;
 }
 
 /*

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeNewMusic/HomeNewMusicView.xib

@@ -10,11 +10,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="HomeNewMusicView">
-            <rect key="frame" x="0.0" y="0.0" width="390" height="364"/>
+            <rect key="frame" x="0.0" y="0.0" width="390" height="376"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fy2-nu-LBW">
-                    <rect key="frame" x="332" y="13" width="44" height="18"/>
+                    <rect key="frame" x="332" y="23" width="44" height="18"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="0.10000000000000001" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="ydg-Ix-Mz0"/>
@@ -26,7 +26,7 @@
                     </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="6CW-e0-al3">
-                    <rect key="frame" x="24" y="10" width="67.666666666666671" height="24"/>
+                    <rect key="frame" x="24" y="20" width="67.666666666666671" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="24" id="ykn-Z7-imu"/>
                     </constraints>
@@ -35,7 +35,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" tag="1008" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="csk-1t-0jz">
-                    <rect key="frame" x="338" y="7" width="33" height="30"/>
+                    <rect key="frame" x="338" y="17" width="33" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="M3e-Eg-6I0"/>
                     </constraints>
@@ -48,26 +48,26 @@
                     </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="2pb-rc-jX4">
-                    <rect key="frame" x="338" y="14.666666666666668" width="24" height="14.666666666666668"/>
+                    <rect key="frame" x="338" y="24.666666666666668" width="24" height="14.666666666666668"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_more_green" translatesAutoresizingMaskIntoConstraints="NO" id="lcO-IB-Crt">
-                    <rect key="frame" x="365" y="18" width="6" height="8"/>
+                    <rect key="frame" x="365" y="28" width="6" height="8"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="6" id="Hcf-3X-Mrv"/>
                         <constraint firstAttribute="height" constant="8" id="SAN-px-udA"/>
                     </constraints>
                 </imageView>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_left" translatesAutoresizingMaskIntoConstraints="NO" id="Gnt-En-BW7">
-                    <rect key="frame" x="14" y="14.666666666666664" width="4" height="15"/>
+                    <rect key="frame" x="14" y="24.666666666666671" width="4" height="15"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="4" id="Jx9-Q2-wT3"/>
                     </constraints>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="csN-Ie-7a8">
-                    <rect key="frame" x="0.0" y="46" width="390" height="320"/>
+                    <rect key="frame" x="0.0" y="56" width="390" height="320"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="320" id="MyF-Wi-MeL"/>
@@ -86,7 +86,7 @@
                 <constraint firstItem="Gnt-En-BW7" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="Mgl-Vu-HI9"/>
                 <constraint firstItem="lcO-IB-Crt" firstAttribute="leading" secondItem="2pb-rc-jX4" secondAttribute="trailing" constant="3" id="PVy-22-561"/>
                 <constraint firstAttribute="trailing" secondItem="csN-Ie-7a8" secondAttribute="trailing" id="WCb-7V-4Xm"/>
-                <constraint firstItem="6CW-e0-al3" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="a2j-vq-f2z"/>
+                <constraint firstItem="6CW-e0-al3" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="a2j-vq-f2z"/>
                 <constraint firstItem="2pb-rc-jX4" firstAttribute="centerY" secondItem="6CW-e0-al3" secondAttribute="centerY" id="b6v-h7-2c0"/>
                 <constraint firstItem="2pb-rc-jX4" firstAttribute="leading" secondItem="csk-1t-0jz" secondAttribute="leading" id="dx0-PV-TnS"/>
                 <constraint firstItem="6CW-e0-al3" firstAttribute="leading" secondItem="Gnt-En-BW7" secondAttribute="trailing" constant="6" id="fI8-yL-qTO"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeRecommendMusic/HomeRecommendMusicView.m

@@ -33,7 +33,7 @@
 }
 
 + (CGFloat)getViewHeight {
-    return 364.0f;
+    return 376.0f;
 }
 
 

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HomeRecommendMusic/HomeRecommendMusicView.xib

@@ -10,11 +10,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="HomeRecommendMusicView">
-            <rect key="frame" x="0.0" y="0.0" width="390" height="364"/>
+            <rect key="frame" x="0.0" y="0.0" width="390" height="376"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gSD-Yz-KRC">
-                    <rect key="frame" x="332" y="13" width="44" height="18"/>
+                    <rect key="frame" x="332" y="23" width="44" height="18"/>
                     <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="0.10000000000000001" colorSpace="calibratedRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="18" id="kBH-qS-EqY"/>
@@ -26,7 +26,7 @@
                     </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="4Gb-9V-Vs2">
-                    <rect key="frame" x="24" y="10" width="67.666666666666671" height="24"/>
+                    <rect key="frame" x="24" y="20" width="67.666666666666671" height="24"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="24" id="j7f-c1-B4o"/>
                     </constraints>
@@ -35,7 +35,7 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" tag="1008" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Ql-Fk-cYb">
-                    <rect key="frame" x="338" y="7" width="33" height="30"/>
+                    <rect key="frame" x="338" y="17" width="33" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="t0v-AC-yCX"/>
                     </constraints>
@@ -48,26 +48,26 @@
                     </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="Mli-0b-3pS">
-                    <rect key="frame" x="338" y="14.666666666666668" width="24" height="14.666666666666668"/>
+                    <rect key="frame" x="338" y="24.666666666666668" width="24" height="14.666666666666668"/>
                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                     <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_more_green" translatesAutoresizingMaskIntoConstraints="NO" id="IEk-2m-N7I">
-                    <rect key="frame" x="365" y="18" width="6" height="8"/>
+                    <rect key="frame" x="365" y="28" width="6" height="8"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="6" id="byI-Z3-gT0"/>
                         <constraint firstAttribute="height" constant="8" id="qoy-h5-4Bu"/>
                     </constraints>
                 </imageView>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_left" translatesAutoresizingMaskIntoConstraints="NO" id="Te8-hi-wDF">
-                    <rect key="frame" x="14" y="14.666666666666664" width="4" height="15"/>
+                    <rect key="frame" x="14" y="24.666666666666671" width="4" height="15"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="4" id="g6O-Mb-yas"/>
                     </constraints>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sOs-N5-Dh3">
-                    <rect key="frame" x="0.0" y="46" width="390" height="320"/>
+                    <rect key="frame" x="0.0" y="56" width="390" height="320"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="320" id="J92-zM-Vmh"/>
@@ -85,7 +85,7 @@
                 <constraint firstItem="4Gb-9V-Vs2" firstAttribute="leading" secondItem="Te8-hi-wDF" secondAttribute="trailing" constant="6" id="EPn-Mj-O3D"/>
                 <constraint firstAttribute="trailing" secondItem="gSD-Yz-KRC" secondAttribute="trailing" constant="14" id="JMj-P1-q8L"/>
                 <constraint firstItem="4Gb-9V-Vs2" firstAttribute="centerY" secondItem="Te8-hi-wDF" secondAttribute="centerY" id="Pj3-mD-xum"/>
-                <constraint firstItem="4Gb-9V-Vs2" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="10" id="Pt2-sD-VP8"/>
+                <constraint firstItem="4Gb-9V-Vs2" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="Pt2-sD-VP8"/>
                 <constraint firstItem="IEk-2m-N7I" firstAttribute="centerY" secondItem="4Gb-9V-Vs2" secondAttribute="centerY" id="TpR-es-wzb"/>
                 <constraint firstItem="Mli-0b-3pS" firstAttribute="leading" secondItem="gSD-Yz-KRC" secondAttribute="leading" constant="6" id="VFz-yi-c52"/>
                 <constraint firstItem="sOs-N5-Dh3" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Yn3-lz-qgY"/>

KulexiuForStudent/KulexiuForStudent/Module/Home/View/HotMusic/HomeHotMusicView.m

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

KulexiuForStudent/KulexiuForStudent/Module/Home/View/RecentCourse/HomeRecentCourseView.m

@@ -68,7 +68,7 @@
         self.statusLabel.font = [UIFont systemFontOfSize:14.0f];
         self.statusLabel.textColor = THEMECOLOR;
     }
-    self.titleLabel.text = [NSString returnNoNullStringWithString:model.courseName];
+    self.titleLabel.text = [NSString returnNoNullStringWithString:model.courseGroupName];
 }
 
 

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/MyVideoCourseBodyView.m

@@ -25,7 +25,9 @@
 @property (nonatomic, assign) NSInteger rows;
 @property (nonatomic, assign) NSInteger pages;
 
-@property (nonatomic, strong) NSString *searchKey;
+@property (nonatomic, strong) NSString *subjectId;
+
+@property (nonatomic, strong) NSString *search;
 
 @property (nonatomic, copy) MyVideoSearchView *sortView;
 
@@ -89,7 +91,8 @@
 }
 
 - (void)requestData {
-    [KSNetworkingManager videoLessonGroupRequest:KS_POST lessonSubject:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+    
+    [KSNetworkingManager videoLessonGroupRequest:KS_POST lessonSubject:self.subjectId search:self.search page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
@@ -163,12 +166,12 @@
         KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"声部筛选" sourceData:nameArray lastChooseIndex:0 sureButtonColor:CLIENT_THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
             if (chooseIndex == 0) {
                 weakSelf.sortView.sortTitleLabel.text = @"全部声部";
-                weakSelf.searchKey = nil;
+                weakSelf.subjectId = nil;
             }
             else {
                 weakSelf.sortView.sortTitleLabel.text = returnValue;
                 NSDictionary *parm = self.subjectList[chooseIndex-1];
-                weakSelf.searchKey = [parm ks_stringValueForKey:@"subjectId"];
+                weakSelf.subjectId = [parm ks_stringValueForKey:@"subjectId"];
             }
             self.sortView.arrowUp = NO;
             [weakSelf refreshAndRequestData];

KulexiuForStudent/KulexiuForStudent/Module/Mine/MineCourse/View/VideoCourseGroup/MyVideoCourseGroupView.m

@@ -107,7 +107,7 @@
 
 
 - (void)requestData {
-    [KSNetworkingManager videoLessonGroupRequest:KS_POST lessonSubject:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
+    [KSNetworkingManager videoLessonGroupRequest:KS_POST lessonSubject:self.subjectId search:self.searchKey page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
         [self endRefresh];
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
             NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];

KulexiuForStudent/KulexiuForStudent/Module/Mine/View/KSMemberView.m

@@ -93,7 +93,7 @@
     NSString *memberTitle = nil;
     if ([userVip.vipType isEqualToString:@"PERMANENT_SVIP"]) {
         displayImg = @"member_card_bg_s";
-        memberDesc = @"您已是永久SVIP";
+        memberDesc = @"您已是永久SVIP会员";
         memberTitle = @"SVIP会员";
     }
     else if ([userVip.vipType isEqualToString:@"SVIP"]) {

KulexiuForStudent/KulexiuForStudent/Module/MusicSquare/Controller/MusicSquareViewController.m

@@ -96,7 +96,7 @@
     self.recommendMusicViewHeight = [HomeRecommendMusicView getViewHeight];
     [self.recommendMusicView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.albumView.mas_bottom).offset(20);
+        make.top.mas_equalTo(self.albumView.mas_bottom);
         make.height.mas_equalTo(self.recommendMusicViewHeight);
     }];
     
@@ -105,7 +105,7 @@
     self.newestMusicViewHeight = [HomeNewMusicView getViewHeight];
     [self.newestMusicView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.recommendMusicView.mas_bottom).offset(20);
+        make.top.mas_equalTo(self.recommendMusicView.mas_bottom);
         make.height.mas_equalTo(self.newestMusicViewHeight);
     }];
     
@@ -114,7 +114,7 @@
     self.musicViewHeight = [HomeHotMusicView getViewHeight];
     [self.hotMusicView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.newestMusicView.mas_bottom).offset(20);
+        make.top.mas_equalTo(self.newestMusicView.mas_bottom);
         make.height.mas_equalTo(self.musicViewHeight);
         make.bottom.mas_equalTo(self.scrollView.mas_bottom).offset(-10);
     }];