老师端首页

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -486,18 +486,6 @@
 		BC366FD32CF0610400583E61 /* CourseStudentVos.m in Sources */ = {isa = PBXBuildFile; fileRef = BC366FD02CF0610400583E61 /* CourseStudentVos.m */; };
 		BC366FD42CF0610400583E61 /* GroupCourseListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC366FD22CF0610400583E61 /* GroupCourseListModel.m */; };
 		BC366FD72CF067F700583E61 /* CourseGroupDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC366FD62CF067F700583E61 /* CourseGroupDetailModel.m */; };
-		BC3673D428A606A500059721 /* musicRoom_animation_3.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673C828A606A400059721 /* musicRoom_animation_3.png */; };
-		BC3673D528A606A500059721 /* live_animation_2.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673C928A606A400059721 /* live_animation_2.png */; };
-		BC3673D628A606A500059721 /* live_animation_0.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673CA28A606A400059721 /* live_animation_0.png */; };
-		BC3673D728A606A500059721 /* live_animation_3.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673CB28A606A400059721 /* live_animation_3.png */; };
-		BC3673D828A606A500059721 /* accomapny_animation_1.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673CC28A606A400059721 /* accomapny_animation_1.png */; };
-		BC3673D928A606A500059721 /* accomapny_animation_2.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673CD28A606A500059721 /* accomapny_animation_2.png */; };
-		BC3673DA28A606A500059721 /* accomapny_animation_0.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673CE28A606A500059721 /* accomapny_animation_0.png */; };
-		BC3673DB28A606A500059721 /* live_animation_1.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673CF28A606A500059721 /* live_animation_1.png */; };
-		BC3673DC28A606A500059721 /* musicRoom_animation_0.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673D028A606A500059721 /* musicRoom_animation_0.png */; };
-		BC3673DD28A606A500059721 /* accomapny_animation_3.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673D128A606A500059721 /* accomapny_animation_3.png */; };
-		BC3673DE28A606A500059721 /* musicRoom_animation_1.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673D228A606A500059721 /* musicRoom_animation_1.png */; };
-		BC3673DF28A606A500059721 /* musicRoom_animation_2.png in Resources */ = {isa = PBXBuildFile; fileRef = BC3673D328A606A500059721 /* musicRoom_animation_2.png */; };
 		BC36A50E2AB42B46002FEFB1 /* GroupOwnerTagView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC36A50C2AB42B46002FEFB1 /* GroupOwnerTagView.m */; };
 		BC36A50F2AB42B46002FEFB1 /* GroupOwnerTagView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC36A50D2AB42B46002FEFB1 /* GroupOwnerTagView.xib */; };
 		BC3744D428DB156F004EDFCF /* KSImageShareViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC3744D328DB156F004EDFCF /* KSImageShareViewController.m */; };
@@ -595,9 +583,6 @@
 		BC4BCE7A2823AB6500522C8B /* KSAddressPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC4BCE792823AB6500522C8B /* KSAddressPickerView.m */; };
 		BC4BCE7D2823B66000522C8B /* AddressDetailBodyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC4BCE7C2823B66000522C8B /* AddressDetailBodyView.m */; };
 		BC4BCE7F2823B66A00522C8B /* AddressDetailBodyView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC4BCE7E2823B66A00522C8B /* AddressDetailBodyView.xib */; };
-		BC513E7A28A4D85F003F58C4 /* accomapny_animation.json in Resources */ = {isa = PBXBuildFile; fileRef = BC513E7928A4D85F003F58C4 /* accomapny_animation.json */; };
-		BC513E7C28A4D868003F58C4 /* musicRoom_animation.json in Resources */ = {isa = PBXBuildFile; fileRef = BC513E7B28A4D868003F58C4 /* musicRoom_animation.json */; };
-		BC513E7E28A4D874003F58C4 /* live_animation.json in Resources */ = {isa = PBXBuildFile; fileRef = BC513E7D28A4D874003F58C4 /* live_animation.json */; };
 		BC523B1028A09F3000E9D66B /* MineHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC523B0F28A09F2F00E9D66B /* MineHeadView.m */; };
 		BC523B1228A09F3800E9D66B /* MineHeadView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC523B1128A09F3800E9D66B /* MineHeadView.xib */; };
 		BC542E3328406EA400633781 /* UserAuthViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC542E3228406EA400633781 /* UserAuthViewController.m */; };
@@ -2066,18 +2051,6 @@
 		BC366FD22CF0610400583E61 /* GroupCourseListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroupCourseListModel.m; sourceTree = "<group>"; };
 		BC366FD52CF067F700583E61 /* CourseGroupDetailModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CourseGroupDetailModel.h; sourceTree = "<group>"; };
 		BC366FD62CF067F700583E61 /* CourseGroupDetailModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CourseGroupDetailModel.m; sourceTree = "<group>"; };
-		BC3673C828A606A400059721 /* musicRoom_animation_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicRoom_animation_3.png; sourceTree = "<group>"; };
-		BC3673C928A606A400059721 /* live_animation_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = live_animation_2.png; sourceTree = "<group>"; };
-		BC3673CA28A606A400059721 /* live_animation_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = live_animation_0.png; sourceTree = "<group>"; };
-		BC3673CB28A606A400059721 /* live_animation_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = live_animation_3.png; sourceTree = "<group>"; };
-		BC3673CC28A606A400059721 /* accomapny_animation_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = accomapny_animation_1.png; sourceTree = "<group>"; };
-		BC3673CD28A606A500059721 /* accomapny_animation_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = accomapny_animation_2.png; sourceTree = "<group>"; };
-		BC3673CE28A606A500059721 /* accomapny_animation_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = accomapny_animation_0.png; sourceTree = "<group>"; };
-		BC3673CF28A606A500059721 /* live_animation_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = live_animation_1.png; sourceTree = "<group>"; };
-		BC3673D028A606A500059721 /* musicRoom_animation_0.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicRoom_animation_0.png; sourceTree = "<group>"; };
-		BC3673D128A606A500059721 /* accomapny_animation_3.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = accomapny_animation_3.png; sourceTree = "<group>"; };
-		BC3673D228A606A500059721 /* musicRoom_animation_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicRoom_animation_1.png; sourceTree = "<group>"; };
-		BC3673D328A606A500059721 /* musicRoom_animation_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = musicRoom_animation_2.png; sourceTree = "<group>"; };
 		BC36A50B2AB42B46002FEFB1 /* GroupOwnerTagView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupOwnerTagView.h; sourceTree = "<group>"; };
 		BC36A50C2AB42B46002FEFB1 /* GroupOwnerTagView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GroupOwnerTagView.m; sourceTree = "<group>"; };
 		BC36A50D2AB42B46002FEFB1 /* GroupOwnerTagView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = GroupOwnerTagView.xib; sourceTree = "<group>"; };
@@ -2241,9 +2214,6 @@
 		BC4BCE7B2823B66000522C8B /* AddressDetailBodyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AddressDetailBodyView.h; sourceTree = "<group>"; };
 		BC4BCE7C2823B66000522C8B /* AddressDetailBodyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AddressDetailBodyView.m; sourceTree = "<group>"; };
 		BC4BCE7E2823B66A00522C8B /* AddressDetailBodyView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AddressDetailBodyView.xib; sourceTree = "<group>"; };
-		BC513E7928A4D85F003F58C4 /* accomapny_animation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = accomapny_animation.json; sourceTree = "<group>"; };
-		BC513E7B28A4D868003F58C4 /* musicRoom_animation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = musicRoom_animation.json; sourceTree = "<group>"; };
-		BC513E7D28A4D874003F58C4 /* live_animation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = live_animation.json; sourceTree = "<group>"; };
 		BC523B0E28A09F2F00E9D66B /* MineHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MineHeadView.h; sourceTree = "<group>"; };
 		BC523B0F28A09F2F00E9D66B /* MineHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MineHeadView.m; sourceTree = "<group>"; };
 		BC523B1128A09F3800E9D66B /* MineHeadView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MineHeadView.xib; sourceTree = "<group>"; };
@@ -3909,7 +3879,6 @@
 		277935FC27E32BBF0010E277 /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				BCA1136928A4D6E6007FAFB9 /* AnimationSource */,
 				BCDE359D289BC03E00A9A560 /* HomeAlbumModel.h */,
 				BCDE359C289BC03E00A9A560 /* HomeAlbumModel.m */,
 				BC6BEA9E288A4C0900022109 /* HomeMessageModel.h */,
@@ -5838,25 +5807,6 @@
 			path = HomeMusic;
 			sourceTree = "<group>";
 		};
-		BC513E7F28A4D9BA003F58C4 /* images */ = {
-			isa = PBXGroup;
-			children = (
-				BC3673CE28A606A500059721 /* accomapny_animation_0.png */,
-				BC3673CC28A606A400059721 /* accomapny_animation_1.png */,
-				BC3673CD28A606A500059721 /* accomapny_animation_2.png */,
-				BC3673D128A606A500059721 /* accomapny_animation_3.png */,
-				BC3673CA28A606A400059721 /* live_animation_0.png */,
-				BC3673CF28A606A500059721 /* live_animation_1.png */,
-				BC3673C928A606A400059721 /* live_animation_2.png */,
-				BC3673CB28A606A400059721 /* live_animation_3.png */,
-				BC3673D028A606A500059721 /* musicRoom_animation_0.png */,
-				BC3673D228A606A500059721 /* musicRoom_animation_1.png */,
-				BC3673D328A606A500059721 /* musicRoom_animation_2.png */,
-				BC3673C828A606A400059721 /* musicRoom_animation_3.png */,
-			);
-			path = images;
-			sourceTree = "<group>";
-		};
 		BC56C94E29233C9700AF301F /* ViewModel */ = {
 			isa = PBXGroup;
 			children = (
@@ -6919,17 +6869,6 @@
 			path = BanList;
 			sourceTree = "<group>";
 		};
-		BCA1136928A4D6E6007FAFB9 /* AnimationSource */ = {
-			isa = PBXGroup;
-			children = (
-				BC513E7928A4D85F003F58C4 /* accomapny_animation.json */,
-				BC513E7B28A4D868003F58C4 /* musicRoom_animation.json */,
-				BC513E7D28A4D874003F58C4 /* live_animation.json */,
-				BC513E7F28A4D9BA003F58C4 /* images */,
-			);
-			path = AnimationSource;
-			sourceTree = "<group>";
-		};
 		BCA9CE1827FD5EBF00D558C6 /* LiveCourse */ = {
 			isa = PBXGroup;
 			children = (
@@ -8006,7 +7945,6 @@
 				BC38C42E2AF900E100ABFCC2 /* KSPlayerSliderView.xib in Resources */,
 				BCECE2182B3D5F0800C0D555 /* KSSortButtonView.xib in Resources */,
 				BCE6A09127F823BE00C97704 /* LiveCourseCell.xib in Resources */,
-				BC3673D828A606A500059721 /* accomapny_animation_1.png in Resources */,
 				275B172B27EB269F0081FDEF /* ChatAddressHeaderView.xib in Resources */,
 				BC41104F280678ED00800BD9 /* HomeworkSortView.xib in Resources */,
 				275FA56427F31AEE00EB6240 /* MinePageHeadView.xib in Resources */,
@@ -8055,7 +7993,6 @@
 				BCB14112288A49710022C13A /* HomeButtonView.xib in Resources */,
 				BC38C49D2AFA4C7D00ABFCC2 /* KSProgressLoadingView.xib in Resources */,
 				BC4BCE7F2823B66A00522C8B /* AddressDetailBodyView.xib in Resources */,
-				BC513E7A28A4D85F003F58C4 /* accomapny_animation.json in Resources */,
 				BCD457B62865651A0010B493 /* LiveMoreDisplayView.xib in Resources */,
 				BCC583FC28A9FA8100BAB4CF /* cloud_animation_19.png in Resources */,
 				BCB908FD2850C9CB00F5FF69 /* MusicChooseSearchView.xib in Resources */,
@@ -8064,7 +8001,6 @@
 				BC7003252CE74F5D008D041E /* ProgramAddButton.xib in Resources */,
 				BC71DEFE2A89F470003F165E /* TXTimeView.xib in Resources */,
 				BC4217FD2C4E3DFC00C70B2F /* KSUserDetailBottomView.xib in Resources */,
-				BC3673DE28A606A500059721 /* musicRoom_animation_1.png in Resources */,
 				BC366FCE2CF05E4E00583E61 /* CourseGroupPlanAlertView.xib in Resources */,
 				BC1553532AB3279500C1C347 /* TenentGroupAddMemberCell.xib in Resources */,
 				BCC0F7062A8CF13D00C4EFA4 /* TXDanBottomView.xib in Resources */,
@@ -8112,7 +8048,6 @@
 				BCC5840728A9FA8100BAB4CF /* cloud_animation_12.png in Resources */,
 				2708565327ED8B8C00EC8E72 /* GroupApplyChooseAllCell.xib in Resources */,
 				275E3DEE27F467BF0010EC30 /* LiveRoomBottomView.xib in Resources */,
-				BC3673D428A606A500059721 /* musicRoom_animation_3.png in Resources */,
 				BC4766212CE72806002574E5 /* MineEmptyIntroduceView.xib in Resources */,
 				BC14A61E28A0B5CE0086395C /* MineActionView.xib in Resources */,
 				BC71D1FF2887FDD40010F14B /* img_8.png in Resources */,
@@ -8120,7 +8055,6 @@
 				BC4BCE6D28239EEB00522C8B /* MyAddressListCell.xib in Resources */,
 				27BC3B2B27F2DB9600D81E30 /* MusicUploadView.xib in Resources */,
 				BC56C95A29233F1D00AF301F /* CoursewareBottomView.xib in Resources */,
-				BC3673DA28A606A500059721 /* accomapny_animation_0.png in Resources */,
 				BC31BF8D2B219C5700F7D538 /* TuningNavView.xib in Resources */,
 				BC2456F4286BEFDA00D1F7C0 /* MineEmptyVideoCell.xib in Resources */,
 				BCA1134928A22A66007FAFB9 /* HomeHotMusicCollectionCell.xib in Resources */,
@@ -8168,7 +8102,6 @@
 				BC71D1FA2887FDD40010F14B /* img_14.png in Resources */,
 				BC523B1228A09F3800E9D66B /* MineHeadView.xib in Resources */,
 				BCC408D62AFCE0D700C60249 /* KSCropImageNavView.xib in Resources */,
-				BC3673DC28A606A500059721 /* musicRoom_animation_0.png in Resources */,
 				275B16F127EAF9DD0081FDEF /* ChatNavView.xib in Resources */,
 				2773205327EDB75B008FAECA /* GroupNoticeCell.xib in Resources */,
 				2755C08627ED5770007D9070 /* GroupApplyMemberCell.xib in Resources */,
@@ -8204,7 +8137,6 @@
 				BC71D1EB2887FDD40010F14B /* img_1.png in Resources */,
 				BC71DF262A8A014F003F165E /* KSImageDisplayView.xib in Resources */,
 				BC161CE92AE0FD630071530A /* TenantGroupSortView.xib in Resources */,
-				BC3673DB28A606A500059721 /* live_animation_1.png in Resources */,
 				BC71DEF92A89F470003F165E /* TxClassroomChatOtherCell.xib in Resources */,
 				BCC583FB28A9FA8100BAB4CF /* cloud_animation_27.png in Resources */,
 				BC12637E28FEB5B900509E90 /* UserDetailNavView.xib in Resources */,
@@ -8234,7 +8166,6 @@
 				BC71D2062887FDD40010F14B /* img_23.png in Resources */,
 				BC14E48E2AB2FBCD000C4983 /* TenantUnbindDetailBodyView.xib in Resources */,
 				BCFA12852CF4634E005229AC /* VIPCourseCell.xib in Resources */,
-				BC513E7E28A4D874003F58C4 /* live_animation.json in Resources */,
 				BC106BA32A8F45AA000759A9 /* TXLiveRoomHeadView.xib in Resources */,
 				BC9EFEB62C0480A500CFA7B1 /* GroupBanNavView.xib in Resources */,
 				BCF7EB362C856C53006AA38C /* ScanOpenAlert.xib in Resources */,
@@ -8262,7 +8193,6 @@
 				BCA3369E2C942B340074DF75 /* KSSourceDownloadAlert.xib in Resources */,
 				BCE6A08C27F823A300C97704 /* AccompanyCourseCell.xib in Resources */,
 				BC7CFFBA2817E9FC00CAEB21 /* echarts.min.js in Resources */,
-				BC3673D528A606A500059721 /* live_animation_2.png in Resources */,
 				BC31BFA52B219C5700F7D538 /* WidgetBottomButtonView.xib in Resources */,
 				BC71D2012887FDD40010F14B /* img_18.png in Resources */,
 				BC106BA62A8F45AA000759A9 /* TXLiveDownSeatView.xib in Resources */,
@@ -8284,7 +8214,6 @@
 				BC71DF022A89F470003F165E /* MainDisplayView.xib in Resources */,
 				BC221FB628C82F0C00F99802 /* MinePageSortView.xib in Resources */,
 				BCA1135228A242FD007FAFB9 /* HomeBannerView.xib in Resources */,
-				BC3673D628A606A500059721 /* live_animation_0.png in Resources */,
 				BCA9AC592CEDDDEE00047BFA /* FansGroupAlertCell.xib in Resources */,
 				BC71D1FB2887FDD40010F14B /* img_28.png in Resources */,
 				BCA1135828A2439D007FAFB9 /* HomeBannerCell.xib in Resources */,
@@ -8317,7 +8246,6 @@
 				BC32E10E286AB326001434DD /* KSPublicAlertView.xib in Resources */,
 				BC71D296288811BF0010F14B /* tabbar3.json in Resources */,
 				BC71D2022887FDD40010F14B /* img_30.png in Resources */,
-				BC3673D928A606A500059721 /* accomapny_animation_2.png in Resources */,
 				BC7CFFAA2817E3BD00CAEB21 /* IncomeCountTopView.xib in Resources */,
 				BC0A22B82847523E0065C1AB /* MemberListCell.xib in Resources */,
 				BCB9FA632872C8D2005D766B /* UnderwayLiveCell.xib in Resources */,
@@ -8347,7 +8275,6 @@
 				BCA724052806AFF100DA0D0D /* AccompanyCourseInfoCell.xib in Resources */,
 				BC2456EF286BEFC600D1F7C0 /* MineEmptyIntroduceCell.xib in Resources */,
 				BC86CB192AC2E72500450EED /* KSNewConfirmAlertView.xib in Resources */,
-				BC3673DF28A606A500059721 /* musicRoom_animation_2.png in Resources */,
 				BCECE21E2B3D5F0800C0D555 /* FeedbackListNavView.xib in Resources */,
 				BC9070A928C71C8E00237958 /* MyCreateGroupHeadView.xib in Resources */,
 				BCC583F828A9FA8100BAB4CF /* cloud_animation_23.png in Resources */,
@@ -8389,9 +8316,7 @@
 				273C75A027E9681700F7C26F /* SettingBodyView.xib in Resources */,
 				BCC5840528A9FA8100BAB4CF /* cloud_animation_17.png in Resources */,
 				BC71D1F12887FDD40010F14B /* img_12.png in Resources */,
-				BC3673DD28A606A500059721 /* accomapny_animation_3.png in Resources */,
 				BC8C2C662824EB9800FBA5D5 /* NotiferHeadView.xib in Resources */,
-				BC3673D728A606A500059721 /* live_animation_3.png in Resources */,
 				BC9AA0D02ABC3D3A00CD954D /* KSComplainImageDisplayView.xib in Resources */,
 				BCECE2152B3D5F0800C0D555 /* FeedbackBodyView.xib in Resources */,
 				BC1263AA28FF98C300509E90 /* HomeRecommendMusicView.xib in Resources */,
@@ -8405,7 +8330,6 @@
 				BCA9CE5127FD954800D558C6 /* AccompanyRemarkCell.xib in Resources */,
 				BC84182E2AC2D82900D8F90E /* PasswordModifyBodyView.xib in Resources */,
 				BCB9FA682872C8F0005D766B /* FinishedLiveCell.xib in Resources */,
-				BC513E7C28A4D868003F58C4 /* musicRoom_animation.json in Resources */,
 				BCC03F89280460C000461B7C /* InstrumentHeaderView.xib in Resources */,
 				BC02BCE728B324C9005CB483 /* LiveDownSeatView.xib in Resources */,
 				BCD6D16728195A98009A773E /* WithdrawApplyBodyView.xib in Resources */,

KulexiuForTeacher/KulexiuForTeacher.xcodeproj/xcshareddata/xcschemes/KulexiuForTeacher.xcscheme

@@ -93,7 +93,7 @@
       buildConfiguration = "Debug">
    </AnalyzeAction>
    <ArchiveAction
-      buildConfiguration = "Release"
+      buildConfiguration = "DEV"
       revealArchiveInOrganizer = "YES">
    </ArchiveAction>
 </Scheme>

KulexiuForTeacher/KulexiuForTeacher/Assets.xcassets/Home/tenantAlbum_button.imageset/Contents.json

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

KulexiuForTeacher/KulexiuForTeacher/Module/Chat/View/ChatUserInfo/UserDetailBodyView.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" 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_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <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>
@@ -75,7 +75,7 @@
                                             </constraints>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="性别：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ix6-yj-abW">
-                                            <rect key="frame" x="48" y="24.666666666666657" width="46" height="21"/>
+                                            <rect key="frame" x="48" y="24.666666666666657" width="37.666666666666657" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="21" id="iYb-XU-9n5"/>
                                             </constraints>
@@ -84,7 +84,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yzA-J6-60W">
-                                            <rect key="frame" x="96" y="24.666666666666657" width="0.0" height="21"/>
+                                            <rect key="frame" x="87.666666666666671" y="24.666666666666657" width="0.0" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="21" id="ex4-d4-aaT"/>
                                             </constraints>
@@ -118,7 +118,7 @@
                                             </constraints>
                                         </imageView>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="声部：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m0W-G0-lyK">
-                                            <rect key="frame" x="48" y="25.666666666666657" width="46" height="21"/>
+                                            <rect key="frame" x="48" y="25.666666666666657" width="37.666666666666657" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="21" id="ZpX-6w-BFn"/>
                                             </constraints>
@@ -127,7 +127,7 @@
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ab0-kc-WGQ">
-                                            <rect key="frame" x="96" y="25.666666666666657" width="0.0" height="21"/>
+                                            <rect key="frame" x="87.666666666666671" y="25.666666666666657" width="0.0" height="21"/>
                                             <constraints>
                                                 <constraint firstAttribute="height" constant="21" id="UID-JK-AxO"/>
                                             </constraints>
@@ -191,7 +191,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="bhE-25-YYz">
-                    <rect key="frame" x="40" y="290" width="66" height="22"/>
+                    <rect key="frame" x="40" y="290.66666666666669" width="63.666666666666657" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="F6D-gT-EVx"/>
                     </constraints>
@@ -200,14 +200,10 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_left" translatesAutoresizingMaskIntoConstraints="NO" id="Jaj-wc-QDp">
-                    <rect key="frame" x="28" y="294" width="4" height="14"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="4" id="aMk-us-iHn"/>
-                        <constraint firstAttribute="height" constant="14" id="ek9-ya-EuK"/>
-                    </constraints>
+                    <rect key="frame" x="28" y="294" width="4" height="15"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JQZ-qL-qfG">
-                    <rect key="frame" x="14" y="328" width="362" height="252"/>
+                    <rect key="frame" x="14" y="328.66666666666669" width="362" height="252.00000000000006"/>
                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="252" id="12e-F9-uGR"/>
@@ -251,7 +247,7 @@
     <resources>
         <image name="chat_use_sex" width="20" height="20"/>
         <image name="chat_user_subject" width="20" height="20"/>
-        <image name="home_left" width="4" height="12"/>
+        <image name="home_left" width="4" height="15"/>
         <image name="mine_nomal" width="34" height="15"/>
         <image name="mine_uid" width="11" height="11"/>
         <image name="user_default_avatal" width="52" height="52"/>

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

@@ -56,8 +56,7 @@
     NSString *lessonEnd = [formatter stringFromDate:endDate];
     self.timeLabel.text = [NSString stringWithFormat:@"%@~%@",[NSString returnNoNullStringWithString:lessonBegin],[NSString returnNoNullStringWithString:lessonEnd]];
     self.courseGroupName.text = [NSString returnNoNullStringWithString:model.courseGroupName];
-    CourseStudentVos *studentInfo = [model.courseStudentVos lastObject];
-    self.nameLabel.text = [NSString returnNoNullStringWithString:studentInfo.userName];
+    [self configNameWithStudent:model.courseStudentVos];
     self.subjectLabel.text = [NSString returnNoNullStringWithString:model.subjectName];
     if ([NSString isEmptyString:model.subjectName]) {
         self.subjectView.hidden = YES;
@@ -68,6 +67,23 @@
     [self evaluateWithSource:model];
 }
 
+- (void)configNameWithStudent:(NSArray *)studentArray {
+    NSString *nameDesc = nil;
+    NSMutableArray *nameArray = [NSMutableArray array];
+    for (CourseStudentVos *stuModel in studentArray) {
+        if (![NSString isEmptyString:stuModel.userName]) {
+            [nameArray addObject:stuModel.userName];
+        }
+    }
+    if (nameArray.count > 2) {
+        nameDesc = [NSString stringWithFormat:@"%@、%@等%zd人", nameArray[0], nameArray[1], nameArray.count];
+    }
+    else {
+        nameDesc = [nameArray componentsJoinedByString:@"、"];
+    }
+    self.nameLabel.text = nameDesc;
+}
+
 - (void)evaluateWithSource:(GroupCourseListModel *)model {
     NSString *imageName = model.attendanceStatus ? @"course_attendence" : @"course_noArrive";
     if ([model.status isEqualToString:@"ING"]) {

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

@@ -76,7 +76,7 @@
                                     <constraint firstAttribute="width" constant="12" id="reb-TO-yHH"/>
                                 </constraints>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i7t-Y9-RL8">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="" textAlignment="natural" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i7t-Y9-RL8">
                                 <rect key="frame" x="62" y="83" width="0.0" height="17"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="17" id="mmW-vx-FKw"/>

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

@@ -40,7 +40,7 @@
     if (callback) {
         self.callback = callback;
     }
-    self.countLabel.text = [NSString stringWithFormat:@"%zd/200",planString.length];
+    self.countLabel.text = [NSString stringWithFormat:@"%zd/500",planString.length];
     self.tipsLabel.hidden = [NSString isEmptyString:planString] ? NO : YES;
     
     NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc]init];
@@ -97,7 +97,7 @@
         // 当前处于拼音输入状态，暂不更新 attributedText
         return YES;
     }
-    NSInteger limitCount = 200;
+    NSInteger limitCount = 500;
 
     NSString *newText = [[textView text] stringByReplacingCharactersInRange:range withString:text];
     if (newText.length > limitCount) {
@@ -132,7 +132,7 @@
     // 如果没有高亮选择的文本，说明不是拼音输入状态
     if (!position) {
         // 获取当前textView的内容
-        NSInteger limitCount = 200;
+        NSInteger limitCount = 500;
         NSString *currentText = textView.text;
         
         // 如果文本超出最大长度，进行截取
@@ -141,7 +141,7 @@
             textView.text = limitedText;
         }
         
-        self.countLabel.text = [NSString stringWithFormat:@"%zd/200",textView.text.length];
+        self.countLabel.text = [NSString stringWithFormat:@"%zd/500",textView.text.length];
     }
     [self updateTextViewLineHeight:textView];
 }

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

@@ -47,7 +47,7 @@
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KlC-4W-rhW">
                             <rect key="frame" x="14" y="58" width="365" height="164"/>
                             <subviews>
-                                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="ozS-Ji-bWH">
+                                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="ozS-Ji-bWH">
                                     <rect key="frame" x="12" y="13" width="341" height="117"/>
                                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                     <color key="textColor" systemColor="labelColor"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Controller/HomeViewController.m

@@ -47,7 +47,6 @@
 #import "TYCyclePagerView.h"
 #import "TYPageControl.h"
 #import "HomeBannerCell.h"
-#import "BadgeIntroduceView.h"
 #import "HomeAuthAlertView.h"
 #import "KSAwardAlertView.h"
 
@@ -63,12 +62,11 @@
 
 #import "HomeTenantPageView.h"
 #import "HomeMusicSheetLayout.h"
+#import "MinePageViewController.h"
 
 #define COLLECTION_WIDTH ((NSInteger)(IS_IPAD ? KPortraitWidth * 0.7 : KPortraitWidth * 0.83))
 #define COLLECTION_HEIGHT (320)
 
-#define BUTTONWIDTH (65)
-#define BUTTONHEIGHT (70)
 
 @interface HomeViewController ()<SDCycleScrollViewDelegate,UIScrollViewDelegate,UICollectionViewDelegate, UICollectionViewDelegateFlowLayout,UICollectionViewDataSource,TYCyclePagerViewDataSource,TYCyclePagerViewDelegate>
 
@@ -76,6 +74,8 @@
 
 @property (nonatomic, strong) HomeNewHeadView *headView;
 
+@property (nonatomic, strong) UIView *headBgView;
+
 @property (nonatomic, strong) UserInfo *mineInfo;
 
 @property (nonatomic, strong) PublicNoticeView *noticeView;
@@ -93,9 +93,7 @@
 @property (nonatomic, strong) HomeRecentCourseView *courseView;
 
 @property (nonatomic, strong) HomeButtonView *buttonContainer; // button container
-@property (nonatomic, strong) UIScrollView *buttonScrollView;
 @property (nonatomic, strong) NSMutableArray *buttonArray; // button 内容
-@property (nonatomic, assign) NSInteger buttonDotWidth;
 @property (nonatomic, assign) CGFloat buttonViewHeight; // button view 高度
 
 @property (nonatomic, assign) BOOL isFirstLoad;
@@ -126,8 +124,6 @@
 @property (nonatomic, strong) NSMutableArray *newestMusicArray; // 曲谱数据
 @property (nonatomic, assign) CGFloat newestMusicViewHeight; // music 高度
 
-@property (nonatomic, strong) BadgeIntroduceView *intruduceAlert;
-
 @property (nonatomic, strong) HomeAuthAlertView *authAlertView;
 
 @property (nonatomic, assign) BOOL isCheck;
@@ -138,11 +134,6 @@
 
 @property (nonatomic, assign) BOOL isSettingSubject;
 
-// 机构专辑
-@property (nonatomic, strong) HomeTenantPageView *tenantAlbumView;
-
-@property (nonatomic, assign) CGFloat tenantAlbumHeight;
-
 // 机构名称
 @property (nonatomic, strong) HomeTenantView *tenantNameView;
 
@@ -239,9 +230,16 @@
 - (void)refreshNotice {
     if (self.titleArray.count) {
         self.noticeView.hidden = NO;
+        CGFloat height = [PublicNoticeView getViewHeight];
+        [self.noticeView mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_equalTo(height);
+        }];
     }
     else {
         self.noticeView.hidden = YES;
+        [self.noticeView mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_equalTo(CGFLOAT_MIN);
+        }];
     }
     self.noticeScrollView.titlesGroup = self.titleArray;
 }
@@ -251,16 +249,13 @@
     [self.headView configMessage:self.mineInfo];
     [self refreshTenantNameView];
     [self refreshBannerView];
-    [self refreshButtonView];
     [self refreshNotice];
+    [self refreshButtonView];
     [self refreshCourseView:self.recentCourseModel];
     [self refreshAlbumView];
     [self refreshMusicView];
-    
-    // 刷新专辑显示
-    [self refreshTenantBanner];
+
     // 刷新排序
-    [self refreshViewLocation];
     if (self.isCheck) {
         [self checkShowAwardAlert];
     }
@@ -290,21 +285,6 @@
     [self.tenantNameView configTenantName:self.mineInfo.tenantName];
 }
 
-- (void)refreshTenantBanner {
-    if (self.mineInfo.tenantAlbumStatus != 0  && [UserDefault(TENANT_ID) integerValue] > 0) {
-        self.tenantAlbumHeight = [HomeTenantPageView getViewHeight];
-        self.tenantAlbumView.hidden = NO;
-    }
-    else {
-        self.tenantAlbumHeight = CGFLOAT_MIN;
-        self.tenantAlbumView.hidden = YES;
-    }
-    
-    [self.tenantAlbumView mas_updateConstraints:^(MASConstraintMaker *make) {
-        make.height.mas_equalTo(self.tenantAlbumHeight);
-    }];
-}
-
 - (void)removeFloatWindow {
     if ([self.view.subviews containsObject:self.suspendButton]) {
         [self.suspendButton removeFromSuperview];
@@ -391,50 +371,7 @@
     [self.bannerScroll reloadData];
 }
 
-- (void)refreshViewLocation {
-    // 如果有课程和公告 且有按钮
-    
-    CGFloat buttonViewDefaultHeight = self.buttonArray.count > 4 ? [HomeButtonView getViewHeight] : [HomeButtonView getViewHeight] - 20;
-    
-    if (self.titleArray.count && self.recentCourseModel && self.buttonArray.count) {
-        [self.noticeView mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.mas_equalTo(self.view);
-            make.top.mas_equalTo(self.bannerView.mas_bottom);
-            make.height.mas_equalTo(56.0f);
-        }];
-        
-        [self.buttonContainer mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.mas_equalTo(self.view);
-            make.top.mas_equalTo(self.noticeView.mas_bottom);
-            make.height.mas_equalTo(buttonViewDefaultHeight);
-        }];
-        [self.courseView mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.mas_equalTo(self.view);
-            make.top.mas_equalTo(self.buttonContainer.mas_bottom);
-            make.height.mas_equalTo(91.0f);
-        }];
-    }
-    else {
-        CGFloat buttonViewHeight = self.buttonArray.count ? buttonViewDefaultHeight : CGFLOAT_MIN;
-        [self.buttonContainer mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.mas_equalTo(self.view);
-            make.top.mas_equalTo(self.bannerView.mas_bottom);
-            make.height.mas_equalTo(buttonViewHeight);
-        }];
-        CGFloat noticeHeight = self.titleArray.count ? [self.noticeView getViewHeight] : CGFLOAT_MIN;
-        [self.noticeView mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.mas_equalTo(self.view);
-            make.top.mas_equalTo(self.buttonContainer.mas_bottom);
-            make.height.mas_equalTo(noticeHeight);
-        }];
-        CGFloat courseViewHeight = self.recentCourseModel ? 90.0f : CGFLOAT_MIN;
-        [self.courseView mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.left.right.mas_equalTo(self.view);
-            make.top.mas_equalTo(self.noticeView.mas_bottom);
-            make.height.mas_equalTo(courseViewHeight);
-        }];
-    }
-}
+
 
 
 - (void)requestHomeButton {
@@ -480,49 +417,52 @@
 }
 
 - (void)refreshButtonView {
-    CGFloat containerWidth = (KPortraitWidth - 28);
-    
+    [self.buttonContainer.buttonContentView removeAllSubViews];
+    // 添加机构专辑
+    if (self.mineInfo.tenantAlbumStatus != 0  && [UserDefault(TENANT_ID) integerValue] > 0) {
+        HomeMessageModel *buttonModel = [[HomeMessageModel alloc] init];
+        buttonModel.title = @"机构教程";
+        buttonModel.linkUrl = [NSString stringWithFormat:@"%@%@",WEBHOST,@"/#/train-tool"];
+        buttonModel.coverImage  = @"tenantAlbum_button";
+        buttonModel.isLocalButton = YES;
+        [self.buttonArray addObject:buttonModel];
+    }
+    CGFloat buttonSpace = (KPortraitWidth - BUTTON_ROWCOUNT * HOME_BUTTONWIDTH) / (BUTTON_ROWCOUNT + 1);
+    // 添加按钮
     if (self.buttonArray.count) {
-       
         self.buttonContainer.hidden = NO;
-        // 添加按钮
-        if (self.buttonArray.count > 4) { // 大于4个显示底部滚动视图
-            self.buttonContainer.buttonPageCtrl.hidden = NO;
-            self.buttonContainer.buttonDotLeft.constant = 0;
-            NSInteger addPage = (self.buttonArray.count % 4) > 0 ? 1 : 0;
-            NSInteger pageCount = self.buttonArray.count / 4 + addPage;
-            self.buttonDotWidth = 36 / pageCount;
-            self.buttonContainer.buttonDotWidth.constant = self.buttonDotWidth;
-            self.buttonScrollView.contentSize = CGSizeMake(containerWidth * pageCount, BUTTONHEIGHT);
-        }
-        else {
-            self.buttonContainer.buttonPageCtrl.hidden = YES;
-            self.buttonScrollView.contentSize = CGSizeMake(containerWidth, BUTTONHEIGHT);
+        CGFloat xSpace = 0.0f;
+        CGFloat ySpace = 0.0f;
+        for (NSInteger i = 0; i < self.buttonArray.count; i++) {
+            xSpace = buttonSpace / 2 + (i % BUTTON_ROWCOUNT) * (HOME_BUTTONWIDTH + buttonSpace);
+            ySpace = (i / BUTTON_ROWCOUNT) * (HOME_BUTTONHEIGHT + HOME_BUTTON_VERTICAL_SPACE);
+            HomeMessageModel *model = self.buttonArray[i];
+            KSHomeButton *buttonView = [KSHomeButton shareInstance];
+            if (model.isLocalButton) {
+                [buttonView.buttonImage setImage:[UIImage imageNamed:model.coverImage]];
+            }
+            else {
+                [buttonView.buttonImage sd_setImageWithURL:[NSURL URLWithString:[model.coverImage getUrlEndcodeString]]];
+            }
+            
+            buttonView.buttonTitle.text = model.title;
+            buttonView.frame = CGRectMake(xSpace, ySpace, HOME_BUTTONWIDTH, HOME_BUTTONHEIGHT);
+
+            buttonView.actionButton.tag = 3000 + i;
+            [buttonView.actionButton addTarget:self action:@selector(HomeTopButtonAction:) forControlEvents:UIControlEventTouchUpInside];
+            [self.buttonContainer.buttonContentView addSubview:buttonView];
         }
     }
     else {
         self.buttonContainer.hidden = YES;
-        self.buttonContainer.buttonPageCtrl.hidden = YES;
-        self.buttonScrollView.contentSize = CGSizeMake(containerWidth, CGFLOAT_MIN);
     }
     
-        
-    self.buttonScrollView.contentOffset = CGPointMake(0, 0);
-    [self.buttonScrollView removeAllSubViews];
-    CGFloat leftSpace = 10.0f;
-    CGFloat buttonSpace = (containerWidth - 4 * BUTTONWIDTH - leftSpace * 2) / 3;
-    
-    for (NSInteger i = 0; i < self.buttonArray.count; i++) {
-        HomeMessageModel *model = self.buttonArray[i];
-        KSHomeButton *buttonView = [KSHomeButton shareInstance];
-        
-        [buttonView.buttonImage sd_setImageWithURL:[NSURL URLWithString:[model.coverImage getUrlEndcodeString]]];
-        buttonView.buttonTitle.text = model.title;
-        buttonView.frame = CGRectMake(leftSpace + (i % 4) * (BUTTONWIDTH + buttonSpace) + (i / 4) * containerWidth, 0, BUTTONWIDTH, BUTTONHEIGHT);
-        buttonView.actionButton.tag = 3000 + i;
-        [buttonView.actionButton addTarget:self action:@selector(HomeTopButtonAction:) forControlEvents:UIControlEventTouchUpInside];
-        [self.buttonScrollView addSubview:buttonView];
-    }
+    // 高度
+    CGFloat buttonViewDefaultHeight = [HomeButtonView getViewHeight:self.buttonArray.count];
+    self.buttonViewHeight = buttonViewDefaultHeight;
+    [self.buttonContainer mas_updateConstraints:^(MASConstraintMaker *make) {
+        make.height.mas_equalTo(buttonViewDefaultHeight);
+    }];
 }
 
 - (void)HomeTopButtonAction:(UIButton *)sender {
@@ -534,6 +474,14 @@
                 ToneTuningViewController *ctrl = [[ToneTuningViewController alloc] init];
                 [self.navigationController pushViewController:ctrl animated:YES];
             }
+            else if ([model.linkUrl isEqualToString:@"native-homepage"]) {
+                MinePageViewController *pageCtrl = [[MinePageViewController alloc] init];
+                [self.navigationController pushViewController:pageCtrl animated:YES];
+            }
+            else if ([model.linkUrl isEqualToString:@"native-homework"]) {
+                HomeworkListViewController *ctrl = [[HomeworkListViewController alloc] init];
+                [self.navigationController pushViewController:ctrl animated:YES];
+            }
             else {
                 KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
                 webCtrl.url = [model.linkUrl getUrlEndcodeString];
@@ -667,11 +615,10 @@
 }
 
 - (void)configUI {
-    CGFloat navHeight = IS_iPhoneX ? 100 : 70;
+    CGFloat navHeight = [HomeNavView getViewHeight];
     [self.view addSubview:self.navView];
     [self.navView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(kScreenWidth);
-        make.right.top.mas_equalTo(self.view);
+        make.left.right.top.mas_equalTo(self.view);
         make.height.mas_equalTo(navHeight);
     }];
     [self.view bringSubviewToFront:self.navView];
@@ -697,6 +644,10 @@
         [weakSelf requestHomeMessage];
     }];
     
+    // 背景
+    [self.scrollView addSubview:self.headBgView];
+    
+    
     // header
     [self.scrollView addSubview:self.headView];
     CGFloat headHeight = [self.headView getViewHeight];
@@ -706,58 +657,60 @@
         make.height.mas_equalTo(headHeight);
     }];
     
-    [self.scrollView addSubview:self.bannerView];
-    
-    [self.bannerView mas_makeConstraints:^(MASConstraintMaker *make) {
+    // 最近课程
+    [self.scrollView addSubview:self.courseView];
+    [self.courseView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
         make.top.mas_equalTo(self.headView.mas_bottom);
         make.height.mas_equalTo(CGFLOAT_MIN);
     }];
-    
-    // 按钮
-    [self.scrollView addSubview:self.buttonContainer];
-    [self.buttonContainer mas_makeConstraints:^(MASConstraintMaker *make) {
+    self.courseView.hidden = YES;
+    // banner
+    [self.scrollView addSubview:self.bannerView];
+    [self.bannerView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.bannerView.mas_bottom);
+        make.top.mas_equalTo(self.courseView.mas_bottom);
         make.height.mas_equalTo(CGFLOAT_MIN);
     }];
-    self.buttonContainer.hidden = YES;
+    self.bannerView.hidden = YES;
     
     // 公告
     [self.scrollView addSubview:self.noticeView];
     [self.noticeView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.buttonContainer.mas_bottom);
+        make.top.mas_equalTo(self.bannerView.mas_bottom);
         make.height.mas_equalTo(CGFLOAT_MIN);
     }];
-    
     [self.noticeView.adView addSubview:self.noticeScrollView];
     [self.noticeScrollView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.left.right.bottom.mas_equalTo(self.noticeView.adView);
     }];
     self.noticeView.hidden = YES;
-    // 最近课程
-    [self.scrollView addSubview:self.courseView];
-    [self.courseView mas_makeConstraints:^(MASConstraintMaker *make) {
+    
+    // 按钮
+    [self.scrollView addSubview:self.buttonContainer];
+    [self.buttonContainer mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
         make.top.mas_equalTo(self.noticeView.mas_bottom);
         make.height.mas_equalTo(CGFLOAT_MIN);
     }];
-    self.courseView.hidden = YES;
+    self.buttonContainer.hidden = YES;
     
-    [self.scrollView addSubview:self.tenantAlbumView];
-    self.tenantAlbumHeight = CGFLOAT_MIN;
-    [self.tenantAlbumView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.courseView.mas_bottom);
-        make.height.mas_equalTo(self.tenantAlbumHeight);
+    [self.headBgView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(self.headView);
+        make.top.mas_equalTo(self.headView.mas_top);
+        make.bottom.mas_equalTo(self.buttonContainer.mas_bottom);
     }];
-    self.tenantAlbumView.hidden = YES;
+    
+    self.headBgView.layer.masksToBounds = YES;
+    self.headBgView.layer.cornerRadius = 18.0f;
+    self.headBgView.layer.maskedCorners = kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner;
+    
     [self.scrollView addSubview:self.albumView];
     self.albumViewHeight = [HomeAlbumView getViewHeight];
     [self.albumView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.tenantAlbumView.mas_bottom);
+        make.top.mas_equalTo(self.headBgView.mas_bottom);
         make.height.mas_equalTo(self.albumViewHeight);
     }];
     
@@ -875,6 +828,14 @@
 
 #pragma mark ----- lazying
 
+- (UIView *)headBgView {
+    if (!_headBgView) {
+        _headBgView = [[UIView alloc] init];
+        _headBgView.backgroundColor = [UIColor whiteColor];
+    }
+    return _headBgView;
+}
+
 - (HomeNavView *)navView {
     if (!_navView) {
         _navView = [HomeNavView shareInstance];
@@ -913,12 +874,9 @@
 }
 
 - (void)openSettingView {
-    if (@available(iOS 10, *)) {
-        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
-    } else {
-        [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString]];
-    }
+    [[UIApplication sharedApplication] openURL:[NSURL URLWithString:UIApplicationOpenSettingsURLString] options:@{} completionHandler:nil];
 }
+
 - (void)toMessageCenter {
     NotiferMessageViewController *messageCenter = [[NotiferMessageViewController alloc] init];
     [self.navigationController pushViewController:messageCenter animated:YES];
@@ -938,11 +896,6 @@
 
 - (void)headAction:(HOMEHEADACTION)type {
     switch (type) {
-        case HOMEHEADACTION_DESC:
-        {
-            [self showDescAlert];
-        }
-            break;
         case HOMEHEADACTION_AUTH:
         {
             [self toAuthDetail];
@@ -1049,18 +1002,6 @@
     
 }
 
-- (BadgeIntroduceView *)intruduceAlert {
-    if (!_intruduceAlert) {
-        _intruduceAlert = [BadgeIntroduceView shareInstance];
-        _intruduceAlert.frame = CGRectMake(0, 0, KPortraitWidth, KPortraitHeight);
-    }
-    return _intruduceAlert;
-}
-
-- (void)showDescAlert {
-    [self.intruduceAlert showAlertInView:[NSObject getKeyWindow]];
-}
-
 - (void)toUserCenter {
     UserSettingViewController *ctrl = [[UserSettingViewController alloc] init];
     [self.navigationController pushViewController:ctrl animated:YES];
@@ -1098,7 +1039,7 @@
         _noticeScrollView.scrollEnabled = NO;
         _noticeScrollView.scrollDirection = UICollectionViewScrollDirectionVertical;
         _noticeScrollView.titleLabelTextColor = HexRGB(0x1a1a1a);
-        _noticeScrollView.titleLabelBackgroundColor = [UIColor whiteColor];
+        _noticeScrollView.titleLabelBackgroundColor = [UIColor clearColor];
         _noticeScrollView.titleLabelTextFont = [UIFont systemFontOfSize:14];
         _noticeScrollView.titlesGroup = self.titleArray;
     }
@@ -1177,36 +1118,18 @@
 
 #pragma mark ---- scroll view delegate
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
-    if (scrollView == self.buttonScrollView) {
-        NSInteger index = (NSInteger)(scrollView.contentOffset.x / (KPortraitWidth - 28));
-        
-        [UIView animateWithDuration:0.3f animations:^{
-            self.buttonContainer.buttonDotLeft.constant = index * self.buttonDotWidth;
-        }];
-    }
+   
 }
 
 #pragma mark ---- button container
+
 - (HomeButtonView *)buttonContainer {
     if (!_buttonContainer) {
         _buttonContainer = [HomeButtonView shareInstance];
-        [_buttonContainer.buttonContentView addSubview:self.buttonScrollView];
     }
     return _buttonContainer;
 }
 
-- (UIScrollView *)buttonScrollView {
-    if (!_buttonScrollView) {
-        _buttonScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 0, (KPortraitWidth - 28), BUTTONHEIGHT)];
-        _buttonScrollView.backgroundColor = [UIColor clearColor];
-        _buttonScrollView.pagingEnabled = YES;
-        _buttonScrollView.showsHorizontalScrollIndicator = NO;
-        _buttonScrollView.showsVerticalScrollIndicator = NO;
-        _buttonScrollView.delegate = self;
-    }
-    return _buttonScrollView;
-}
-
 #pragma mark ---- collection data source
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
     return 1;
@@ -1294,7 +1217,7 @@
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
     if (collectionView == self.albumCollectionView) {
-        return CGSizeMake(100, 140);
+        return CGSizeMake(100, 134);
 
     }
     else {
@@ -1530,7 +1453,7 @@
     if (!_bannerScroll) {
         _bannerScroll = [[TYCyclePagerView alloc] init];
         _bannerScroll.backgroundColor = [UIColor clearColor];
-        _bannerScroll.frame = CGRectMake(0, 0, kScreenWidth - 28, (kScreenWidth - 28) / 347 * 132);
+        _bannerScroll.frame = CGRectMake(0, 0, KPortraitWidth, (kScreenWidth - 28) / 347 * 132);
         _bannerScroll.isInfiniteLoop = YES;
         _bannerScroll.autoScrollInterval = 3.0f;
         _bannerScroll.reloadDataNeedResetIndex = YES;
@@ -1586,7 +1509,7 @@
 
 - (TYCyclePagerViewLayout *)layoutForPagerView:(TYCyclePagerView *)pageView {
     TYCyclePagerViewLayout *layout = [[TYCyclePagerViewLayout alloc]init];
-    layout.itemSize = CGSizeMake(kScreenWidth - 28, (kScreenWidth - 28) / 347 * 132);
+    layout.itemSize = CGSizeMake(kScreenWidth, (kScreenWidth - 28) / 347 * 132);
     layout.itemSpacing = 0;
     return layout;
     
@@ -1641,22 +1564,6 @@
     }
 }
 
-- (HomeTenantPageView *)tenantAlbumView {
-    if (!_tenantAlbumView) {
-        _tenantAlbumView = [HomeTenantPageView shareInstance];
-        MJWeakSelf;
-        [_tenantAlbumView displayTenatantPage:^{
-            [weakSelf showTenantAlbumPageView];
-        }];
-    }
-    return _tenantAlbumView;
-}
-
-- (void)showTenantAlbumPageView {
-    KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
-    ctrl.url = [NSString stringWithFormat:@"%@%@",WEBHOST,@"/#/train-tool"];
-    [self.navigationController pushViewController:ctrl animated:YES];
-}
 
 - (HomeTenantView *)tenantNameView {
     if (!_tenantNameView) {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/Model/HomeMessageModel.h

@@ -40,6 +40,8 @@
 @property (nonatomic, strong) NSString *attribute2;
 @property (nonatomic, strong) NSString *linkType;
 
+@property (nonatomic, assign) BOOL isLocalButton; // 是否本地按钮
+
 + (instancetype)modelObjectWithDictionary:(NSDictionary *)dict;
 - (instancetype)initWithDictionary:(NSDictionary *)dict;
 - (NSDictionary *)dictionaryRepresentation;

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/Controller/MyCourseViewController.m

@@ -114,10 +114,17 @@
 
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
+    // 页面appear 禁用
+    [IQKeyboardManager sharedManager].enable = NO;
     self.navigationController.interactivePopGestureRecognizer.enabled = YES;
     [self requestSubjectList];
 }
 
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    // 页面Disappear 启用
+    [IQKeyboardManager sharedManager].enable = YES;
+}
 - (void)requestSubjectList {
     [KSNetworkingManager querySubjectItemRequest:KS_POST success:^(NSDictionary * _Nonnull dic) {
         if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/AccompanyCourseGroup/MyAccompanyCourseGroupView.m

@@ -209,6 +209,7 @@
 - (MyCourseSearchView *)searchView {
     if (!_searchView) {
         _searchView = [MyCourseSearchView sharedInstance];
+        [_searchView configPlaceholder:@"请输入课程组名称"];
         MJWeakSelf;
         [_searchView searchActionCallback:^(MY_COURSE_SORT type, NSString * _Nullable searchKey) {
             [weakSelf searchAction:type searchKey:searchKey];

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

@@ -218,6 +218,7 @@
 - (MyCourseSearchView *)searchView {
     if (!_searchView) {
         _searchView = [MyCourseSearchView sharedInstance];
+        [_searchView configPlaceholder:@"请输入课程组名称"];
         MJWeakSelf;
         [_searchView searchActionCallback:^(MY_COURSE_SORT type, NSString * _Nullable searchKey) {
             [weakSelf searchAction:type searchKey:searchKey];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MusicRoomCourseGroup/MyMusicRoomCourseGroupView.m

@@ -207,6 +207,7 @@
 - (MyCourseSearchView *)searchView {
     if (!_searchView) {
         _searchView = [MyCourseSearchView sharedInstance];
+        [_searchView configPlaceholder:@"请输入课程组名称"];
         MJWeakSelf;
         [_searchView searchActionCallback:^(MY_COURSE_SORT type, NSString * _Nullable searchKey) {
             [weakSelf searchAction:type searchKey:searchKey];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyCourseSortView/MyCourseSearchView.h

@@ -22,6 +22,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (instancetype)sharedInstance;
 
+- (void)configPlaceholder:(NSString *)placeholderString;
+
 - (void)searchActionCallback:(MyCourseSortCallback)callback;
 
 + (CGFloat)getViewHeight;

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyCourseSortView/MyCourseSearchView.m

@@ -26,6 +26,13 @@
     return view;
 }
 
+- (void)configPlaceholder:(NSString *)placeholderString {
+    if (![NSString isEmptyString:placeholderString]) {
+        self.searchField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholderString attributes:@{NSForegroundColorAttributeName:HexRGBAlpha(0x000000, 0.4),NSFontAttributeName:[UIFont systemFontOfSize:14.0f]}];
+    }
+    
+}
+
 - (void)searchActionCallback:(MyCourseSortCallback)callback {
     if (callback) {
         self.callback = callback;

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/VIPCourseGroup/MyVipCourseGroupView.m

@@ -210,6 +210,7 @@
 - (MyCourseSearchView *)searchView {
     if (!_searchView) {
         _searchView = [MyCourseSearchView sharedInstance];
+        [_searchView configPlaceholder:@"请输入课程组名称"];
         MJWeakSelf;
         [_searchView searchActionCallback:^(MY_COURSE_SORT type, NSString * _Nullable searchKey) {
             [weakSelf searchAction:type searchKey:searchKey];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/VideoCourseGroup/MyVideoCourseGroupView.m

@@ -207,6 +207,7 @@
 - (MyCourseSearchView *)searchView {
     if (!_searchView) {
         _searchView = [MyCourseSearchView sharedInstance];
+        [_searchView configPlaceholder:@"请输入课程组名称"];
         MJWeakSelf;
         [_searchView searchActionCallback:^(MY_COURSE_SORT type, NSString * _Nullable searchKey) {
             [weakSelf searchAction:type searchKey:searchKey];

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeAlbumView.m

@@ -34,7 +34,7 @@
 
 
 + (CGFloat)getViewHeight {
-    return 194.0f;
+    return 178.0f;
 }
 
 /*

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeAlbumView.xib

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" 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="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="HomeAlbumView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="194"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="178"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KTG-G7-svg">
-                    <rect key="frame" x="349" y="32" width="45" height="18"/>
+                    <rect key="frame" x="350" y="22" 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="IvR-F6-A6w"/>
@@ -26,36 +26,36 @@
                     </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="4Cx-dC-YoK">
-                    <rect key="frame" x="355" y="33.5" width="25" height="15"/>
+                    <rect key="frame" x="356" y="23.5" width="24" height="15"/>
                     <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>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门专辑" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A5i-dJ-9Mu">
-                    <rect key="frame" x="35" y="30" width="65.5" height="22"/>
+                    <rect key="frame" x="35" y="20" width="67.5" height="22"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="22" id="cYj-Mu-vFC"/>
                     </constraints>
-                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
-                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="17"/>
+                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_more_green" translatesAutoresizingMaskIntoConstraints="NO" id="sK1-pz-8Kl">
-                    <rect key="frame" x="383" y="37" width="6" height="8"/>
+                    <rect key="frame" x="383" y="27" width="6" height="8"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="8" id="x9g-bg-MGm"/>
                         <constraint firstAttribute="width" constant="6" id="ynQ-3M-BsI"/>
                     </constraints>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P5X-p7-Ey6">
-                    <rect key="frame" x="0.0" y="54" width="414" height="140"/>
+                    <rect key="frame" x="0.0" y="44" width="414" height="134"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="140" id="dfh-ec-j10"/>
+                        <constraint firstAttribute="height" constant="134" id="dfh-ec-j10"/>
                     </constraints>
                 </view>
                 <button opaque="NO" tag="1008" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DVE-40-kqu">
-                    <rect key="frame" x="355" y="26" width="34" height="30"/>
+                    <rect key="frame" x="356" y="16" width="33" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="vCB-7k-sHa"/>
                     </constraints>
@@ -68,11 +68,7 @@
                     </connections>
                 </button>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_left" translatesAutoresizingMaskIntoConstraints="NO" id="kHC-jW-zF2">
-                    <rect key="frame" x="25" y="32" width="4" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="4" id="3KN-YH-s46"/>
-                        <constraint firstAttribute="height" constant="18" id="UDg-6w-bAM"/>
-                    </constraints>
+                    <rect key="frame" x="25" y="23.5" width="4" height="15"/>
                 </imageView>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -88,7 +84,7 @@
                 <constraint firstItem="DVE-40-kqu" firstAttribute="centerY" secondItem="A5i-dJ-9Mu" secondAttribute="centerY" id="dEK-YP-pkl"/>
                 <constraint firstItem="A5i-dJ-9Mu" firstAttribute="centerY" secondItem="kHC-jW-zF2" secondAttribute="centerY" id="dfG-xS-HYt"/>
                 <constraint firstItem="sK1-pz-8Kl" firstAttribute="trailing" secondItem="DVE-40-kqu" secondAttribute="trailing" id="eam-oI-GVG"/>
-                <constraint firstItem="A5i-dJ-9Mu" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="30" id="gsV-KK-bkk"/>
+                <constraint firstItem="A5i-dJ-9Mu" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="gsV-KK-bkk"/>
                 <constraint firstItem="sK1-pz-8Kl" firstAttribute="centerY" secondItem="A5i-dJ-9Mu" secondAttribute="centerY" id="ic0-Oy-cXN"/>
                 <constraint firstItem="sK1-pz-8Kl" firstAttribute="trailing" secondItem="KTG-G7-svg" secondAttribute="trailing" constant="-5" id="qsa-r7-hcB"/>
                 <constraint firstItem="4Cx-dC-YoK" firstAttribute="leading" secondItem="KTG-G7-svg" secondAttribute="leading" constant="6" id="qsw-or-D3A"/>
@@ -101,11 +97,11 @@
             <connections>
                 <outlet property="albumContentView" destination="P5X-p7-Ey6" id="dhI-B5-jMN"/>
             </connections>
-            <point key="canvasLocation" x="131.8840579710145" y="-37.5"/>
+            <point key="canvasLocation" x="131.8840579710145" y="-42.857142857142854"/>
         </view>
     </objects>
     <resources>
-        <image name="home_left" width="4" height="18"/>
+        <image name="home_left" width="4" height="15"/>
         <image name="home_more_green" width="5" height="8"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeBannerCell.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" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="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="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,7 +18,7 @@
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="video_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="KRw-yx-PyP">
-                        <rect key="frame" x="0.0" y="0.0" width="389" height="143"/>
+                        <rect key="frame" x="14" y="0.0" width="361" height="143"/>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                                 <real key="value" value="12"/>
@@ -29,10 +29,10 @@
             </view>
             <viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="KRw-yx-PyP" secondAttribute="trailing" id="E99-a0-3To"/>
+                <constraint firstAttribute="trailing" secondItem="KRw-yx-PyP" secondAttribute="trailing" constant="14" id="E99-a0-3To"/>
                 <constraint firstItem="KRw-yx-PyP" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="k9u-re-YWc"/>
                 <constraint firstAttribute="bottom" secondItem="KRw-yx-PyP" secondAttribute="bottom" id="nom-3g-a3v"/>
-                <constraint firstItem="KRw-yx-PyP" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="o6d-XR-yAa"/>
+                <constraint firstItem="KRw-yx-PyP" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" constant="14" id="o6d-XR-yAa"/>
             </constraints>
             <size key="customSize" width="389" height="143"/>
             <connections>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeBannerView.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="20037"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,16 +14,16 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TxO-MH-UVa">
-                    <rect key="frame" x="14" y="12" width="386" height="173"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="173"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstAttribute="trailing" secondItem="TxO-MH-UVa" secondAttribute="trailing" constant="14" id="0r3-Rk-6nL"/>
-                <constraint firstItem="TxO-MH-UVa" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="12" id="BF3-AJ-S65"/>
-                <constraint firstAttribute="bottom" secondItem="TxO-MH-UVa" secondAttribute="bottom" id="FoY-Yd-bSd"/>
-                <constraint firstItem="TxO-MH-UVa" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="zwG-j0-akh"/>
+                <constraint firstAttribute="trailing" secondItem="TxO-MH-UVa" secondAttribute="trailing" id="0r3-Rk-6nL"/>
+                <constraint firstItem="TxO-MH-UVa" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="BF3-AJ-S65"/>
+                <constraint firstAttribute="bottom" secondItem="TxO-MH-UVa" secondAttribute="bottom" constant="12" id="FoY-Yd-bSd"/>
+                <constraint firstItem="TxO-MH-UVa" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="zwG-j0-akh"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeButtonView.h

@@ -7,23 +7,21 @@
 
 #import <UIKit/UIKit.h>
 
+#define HOME_BUTTON_VERTICAL_SPACE (12)
+#define HOME_BUTTONWIDTH (70)
+#define HOME_BUTTONHEIGHT (68)
+//#define BUTTON_ROWCOUNT (IS_IPAD ? 7 : 5)
+#define BUTTON_ROWCOUNT (5)
+
 NS_ASSUME_NONNULL_BEGIN
 
 @interface HomeButtonView : UIView
 
 @property (weak, nonatomic) IBOutlet UIView *buttonContentView;
 
-@property (weak, nonatomic) IBOutlet UIView *buttonPageCtrl;
-
-@property (weak, nonatomic) IBOutlet UIView *pageDot;
-
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *buttonDotLeft;
-
-@property (weak, nonatomic) IBOutlet NSLayoutConstraint *buttonDotWidth;
-
 + (instancetype)shareInstance;
 
-+ (CGFloat)getViewHeight;
++ (CGFloat)getViewHeight:(NSInteger)buttonCount;
 
 @end
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeButtonView.m

@@ -14,9 +14,12 @@
     return view;
 }
 
-+ (CGFloat)getViewHeight {
-    return 118.0;
++ (CGFloat)getViewHeight:(NSInteger)buttonCount {
+    NSInteger addRow = buttonCount % 5 == 0 ? 0 : 1;
+    NSInteger totalCount = (buttonCount / 5 + addRow);
+    return totalCount * HOME_BUTTONHEIGHT + (totalCount - 1) * HOME_BUTTON_VERTICAL_SPACE + 20;
 }
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeButtonView.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="20037"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23504"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,79 +14,22 @@
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FDF-ZT-TJx">
-                    <rect key="frame" x="14" y="12" width="386" height="106"/>
-                    <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hu0-Qz-IjA">
-                            <rect key="frame" x="175" y="92" width="36" height="4"/>
-                            <subviews>
-                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Qq-0N-maI">
-                                    <rect key="frame" x="0.0" y="0.0" width="18" height="4"/>
-                                    <color key="backgroundColor" red="0.0039215686269999999" green="0.75686274509999996" blue="0.70980392160000005" alpha="1" colorSpace="calibratedRGB"/>
-                                    <constraints>
-                                        <constraint firstAttribute="width" constant="18" id="HF0-79-ZOQ"/>
-                                    </constraints>
-                                    <userDefinedRuntimeAttributes>
-                                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                            <real key="value" value="2"/>
-                                        </userDefinedRuntimeAttribute>
-                                    </userDefinedRuntimeAttributes>
-                                </view>
-                            </subviews>
-                            <color key="backgroundColor" red="0.92156862750000001" green="0.92156862750000001" blue="0.92156862750000001" alpha="1" colorSpace="calibratedRGB"/>
-                            <constraints>
-                                <constraint firstItem="9Qq-0N-maI" firstAttribute="top" secondItem="Hu0-Qz-IjA" secondAttribute="top" id="03a-hK-kLd"/>
-                                <constraint firstAttribute="bottom" secondItem="9Qq-0N-maI" secondAttribute="bottom" id="AOu-5X-e7N"/>
-                                <constraint firstAttribute="width" constant="36" id="Ftu-7O-gVM"/>
-                                <constraint firstItem="9Qq-0N-maI" firstAttribute="leading" secondItem="Hu0-Qz-IjA" secondAttribute="leading" id="Gbt-lz-MWl"/>
-                                <constraint firstAttribute="height" constant="4" id="SEn-Hw-wmX"/>
-                            </constraints>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                    <real key="value" value="2"/>
-                                </userDefinedRuntimeAttribute>
-                            </userDefinedRuntimeAttributes>
-                        </view>
-                    </subviews>
-                    <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <constraints>
-                        <constraint firstItem="Hu0-Qz-IjA" firstAttribute="centerX" secondItem="FDF-ZT-TJx" secondAttribute="centerX" id="Hsr-mg-qWh"/>
-                        <constraint firstAttribute="bottom" secondItem="Hu0-Qz-IjA" secondAttribute="bottom" constant="10" id="YkV-kK-CMd"/>
-                    </constraints>
-                    <userDefinedRuntimeAttributes>
-                        <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                            <real key="value" value="10"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="size" keyPath="shadowOffset">
-                            <size key="value" width="0.0" height="2"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="color" keyPath="shadowUIColor">
-                            <color key="value" red="0.8980392157" green="0.8980392157" blue="0.8980392157" alpha="0.10000000000000001" colorSpace="calibratedRGB"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="shadowOpacity">
-                            <real key="value" value="1"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="shadowRadius">
-                            <real key="value" value="2"/>
-                        </userDefinedRuntimeAttribute>
-                    </userDefinedRuntimeAttributes>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="98"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                 </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstItem="FDF-ZT-TJx" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="12" id="D3O-sT-Grz"/>
-                <constraint firstAttribute="bottom" secondItem="FDF-ZT-TJx" secondAttribute="bottom" id="N4E-bP-VUJ"/>
-                <constraint firstItem="FDF-ZT-TJx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="WkT-zx-U1t"/>
-                <constraint firstAttribute="trailing" secondItem="FDF-ZT-TJx" secondAttribute="trailing" constant="14" id="vJG-sS-Gpn"/>
+                <constraint firstItem="FDF-ZT-TJx" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="D3O-sT-Grz"/>
+                <constraint firstAttribute="bottom" secondItem="FDF-ZT-TJx" secondAttribute="bottom" constant="20" id="N4E-bP-VUJ"/>
+                <constraint firstItem="FDF-ZT-TJx" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="WkT-zx-U1t"/>
+                <constraint firstAttribute="trailing" secondItem="FDF-ZT-TJx" secondAttribute="trailing" id="vJG-sS-Gpn"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="buttonContentView" destination="FDF-ZT-TJx" id="736-Mg-5pC"/>
-                <outlet property="buttonDotLeft" destination="Gbt-lz-MWl" id="jQi-Dc-Y0g"/>
-                <outlet property="buttonDotWidth" destination="HF0-79-ZOQ" id="ogM-Ak-FDg"/>
-                <outlet property="buttonPageCtrl" destination="Hu0-Qz-IjA" id="VVs-D3-azH"/>
-                <outlet property="pageDot" destination="9Qq-0N-maI" id="Fa4-d7-dmt"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="49.553571428571423"/>
         </view>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeHotAlbumCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -11,10 +11,10 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="HomeHotAlbumCell">
-            <rect key="frame" x="0.0" y="0.0" width="100" height="140"/>
+            <rect key="frame" x="0.0" y="0.0" width="100" height="134"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                <rect key="frame" x="0.0" y="0.0" width="100" height="140"/>
+                <rect key="frame" x="0.0" y="0.0" width="100" height="134"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="video_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="mkp-8k-Rld">
@@ -39,19 +39,19 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xPp-Kr-NCd">
-                        <rect key="frame" x="7" y="85" width="49.5" height="16"/>
+                        <rect key="frame" x="7" y="85" width="50" height="16"/>
                         <subviews>
                             <visualEffectView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cXb-U6-JT3">
-                                <rect key="frame" x="0.0" y="0.0" width="49.5" height="16"/>
+                                <rect key="frame" x="0.0" y="0.0" width="50" height="16"/>
                                 <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="ISI-l1-b2c">
-                                    <rect key="frame" x="0.0" y="0.0" width="49.5" height="16"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="50" height="16"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <color key="backgroundColor" red="0.2627450980392157" green="0.2627450980392157" blue="0.2627450980392157" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                 </view>
                                 <blurEffect style="light"/>
                             </visualEffectView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="365人" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HyK-tc-JYn">
-                                <rect key="frame" x="15" y="3" width="27.5" height="9"/>
+                                <rect key="frame" x="15" y="3" width="28" height="9"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="9" id="QTs-RA-B2w"/>
                                 </constraints>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeMusic/HomeHotMusicView.m

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

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeMusic/HomeHotMusicView.xib

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" 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="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="HomeHotMusicView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="384"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="376"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="h7W-In-fdG">
-                    <rect key="frame" x="355" y="32" width="45" height="18"/>
+                    <rect key="frame" x="356" 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="asa-Yc-c71"/>
@@ -26,16 +26,16 @@
                     </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="ObF-3e-j29">
-                    <rect key="frame" x="35" y="30" width="65.5" height="22"/>
+                    <rect key="frame" x="24" y="20" width="64" height="24"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="22" id="cPc-Bd-itn"/>
+                        <constraint firstAttribute="height" constant="24" id="cPc-Bd-itn"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" tag="1008" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mse-cv-4Ye">
-                    <rect key="frame" x="361" y="26" width="34" height="30"/>
+                    <rect key="frame" x="362" y="17" width="33" height="30"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="30" id="t8p-p9-2cB"/>
                     </constraints>
@@ -48,27 +48,23 @@
                     </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="QzC-dk-bqa">
-                    <rect key="frame" x="361" y="33.5" width="25" height="15"/>
+                    <rect key="frame" x="362" y="24.5" width="24" height="15"/>
                     <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="9xg-C3-kxV">
-                    <rect key="frame" x="389" y="37" width="6" height="8"/>
+                    <rect key="frame" x="389" y="28" width="6" height="8"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="8" id="4NE-LI-O7V"/>
                         <constraint firstAttribute="width" constant="6" id="sgn-3m-cHO"/>
                     </constraints>
                 </imageView>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_left" translatesAutoresizingMaskIntoConstraints="NO" id="oHM-Ms-xi2">
-                    <rect key="frame" x="25" y="32" width="4" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="4" id="l68-iF-54P"/>
-                        <constraint firstAttribute="height" constant="18" id="t54-eC-fGm"/>
-                    </constraints>
+                    <rect key="frame" x="14" y="24.5" width="4" height="15"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HAn-QD-Jml">
-                    <rect key="frame" x="0.0" y="64" width="414" height="320"/>
+                    <rect key="frame" x="0.0" y="56" width="414" height="320"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="320" id="td9-Wn-3Az"/>
@@ -77,14 +73,14 @@
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstItem="ObF-3e-j29" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="30" id="7aw-rc-R9Y"/>
+                <constraint firstItem="ObF-3e-j29" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" id="7aw-rc-R9Y"/>
                 <constraint firstItem="QzC-dk-bqa" firstAttribute="centerY" secondItem="ObF-3e-j29" secondAttribute="centerY" id="Age-D0-dig"/>
                 <constraint firstItem="9xg-C3-kxV" firstAttribute="centerY" secondItem="ObF-3e-j29" secondAttribute="centerY" id="BVv-Ms-GX8"/>
                 <constraint firstItem="ObF-3e-j29" firstAttribute="leading" secondItem="oHM-Ms-xi2" secondAttribute="trailing" constant="6" id="BaP-GH-FfD"/>
                 <constraint firstAttribute="trailing" secondItem="HAn-QD-Jml" secondAttribute="trailing" id="N4q-rx-yJu"/>
                 <constraint firstItem="HAn-QD-Jml" firstAttribute="top" secondItem="ObF-3e-j29" secondAttribute="bottom" constant="12" id="O2M-vx-n3b"/>
                 <constraint firstItem="9xg-C3-kxV" firstAttribute="leading" secondItem="QzC-dk-bqa" secondAttribute="trailing" constant="3" id="dsR-mo-asO"/>
-                <constraint firstItem="oHM-Ms-xi2" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="25" id="eRq-2z-Pai"/>
+                <constraint firstItem="oHM-Ms-xi2" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="eRq-2z-Pai"/>
                 <constraint firstItem="9xg-C3-kxV" firstAttribute="trailing" secondItem="mse-cv-4Ye" secondAttribute="trailing" id="hUf-hs-gY3"/>
                 <constraint firstItem="HAn-QD-Jml" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="lBc-3W-wwt"/>
                 <constraint firstItem="9xg-C3-kxV" firstAttribute="trailing" secondItem="h7W-In-fdG" secondAttribute="trailing" constant="-5" id="mEP-hS-RyU"/>
@@ -105,7 +101,7 @@
         </view>
     </objects>
     <resources>
-        <image name="home_left" width="4" height="18"/>
+        <image name="home_left" width="4" height="15"/>
         <image name="home_more_green" width="5" height="8"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeNavView.h

@@ -26,6 +26,9 @@ typedef void(^HomeNavCallback)(HOMENAV_ACTION action);
 
 - (void)displayMessageCenter:(HomeNavCallback)callback;
 
+
++ (CGFloat)getViewHeight;
+
 @end
 
 NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeNavView.m

@@ -76,7 +76,9 @@
 }
 
 
-
++ (CGFloat)getViewHeight {
+    return kNaviBarHeight;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeNavView.xib

@@ -74,13 +74,13 @@
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="游客" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xSC-vm-098">
-                            <rect key="frame" x="25" y="10" width="38.5" height="24"/>
+                            <rect key="frame" x="16" y="10" width="38.5" height="24"/>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
                             <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" translatesAutoresizingMaskIntoConstraints="NO" id="030-NP-gEA">
-                            <rect key="frame" x="69.5" y="13" width="39" height="18"/>
+                            <rect key="frame" x="60.5" y="13" width="39" height="18"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="18" id="8P2-Ec-bnf"/>
                                 <constraint firstAttribute="width" secondItem="030-NP-gEA" secondAttribute="height" multiplier="39:18" id="fcB-wh-8ad"/>
@@ -100,7 +100,7 @@
                         <constraint firstAttribute="height" constant="44" id="cj7-26-Plu"/>
                         <constraint firstItem="qSz-FE-UVP" firstAttribute="top" secondItem="vOh-9c-b3r" secondAttribute="top" id="dgb-Bb-S6e"/>
                         <constraint firstItem="q6l-Iv-Tbq" firstAttribute="centerY" secondItem="xSC-vm-098" secondAttribute="centerY" id="haf-Ki-Dhr"/>
-                        <constraint firstItem="xSC-vm-098" firstAttribute="leading" secondItem="vOh-9c-b3r" secondAttribute="leading" constant="25" id="twJ-Hw-Msg"/>
+                        <constraint firstItem="xSC-vm-098" firstAttribute="leading" secondItem="vOh-9c-b3r" secondAttribute="leading" constant="16" id="twJ-Hw-Msg"/>
                     </constraints>
                 </view>
             </subviews>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeNewHeadView.h

@@ -9,7 +9,6 @@
 #import "UserInfo.h"
 
 typedef NS_ENUM(NSInteger, HOMEHEADACTION) {
-    HOMEHEADACTION_DESC,   // 勋章介绍
     HOMEHEADACTION_AUTH,   // 老师认证
     HOMEHEADACTION_EDUCATION, // 学历认证
     HOMEHEADACTION_EDUCATIONFINISH, // 完成认证

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeNewHeadView.m

@@ -101,6 +101,7 @@
     self.failedView.hidden = YES;
     // 认证状态
     self.hasAuth = NO;
+//    infoMessage.entryStatus = @"UNPASS";
     if ([infoMessage.entryStatus isEqualToString:@"PASS"]) { // 审核通过
         self.authView.backgroundColor = HexRGB(0xEFFBF9);
         [self.authIcon setImage:[UIImage imageNamed:@"auth_success_icon"]];
@@ -161,11 +162,6 @@
     }
 }
 
-- (IBAction)showDesc:(id)sender {
-    if (self.callback) {
-        self.callback(HOMEHEADACTION_DESC);
-    }
-}
 
 - (void)authDetailAction:(HomeHeadBlock)callback {
     if (callback) {
@@ -180,7 +176,7 @@
 
 
 - (CGFloat)getViewHeight {
-    return 80;
+    return 51;
 }
 
 /*

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeNewHeadView.xib

@@ -10,67 +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="HomeNewHeadView">
-            <rect key="frame" x="0.0" y="0.0" width="531" height="80"/>
+            <rect key="frame" x="0.0" y="0.0" width="531" height="51"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G60-Et-o3r">
-                    <rect key="frame" x="24" y="2" width="114" height="23"/>
-                    <subviews>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineStyle_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="Cdf-rH-nsz">
-                            <rect key="frame" x="0.0" y="0.0" width="23" height="23"/>
-                            <constraints>
-                                <constraint firstAttribute="width" constant="23" id="P9P-AN-QZM"/>
-                                <constraint firstAttribute="height" constant="23" id="grd-7y-LaY"/>
-                            </constraints>
-                        </imageView>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineVideo_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="wYg-iQ-k09">
-                            <rect key="frame" x="29" y="0.0" width="23" height="23"/>
-                        </imageView>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineLive_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="ajS-D4-GM0">
-                            <rect key="frame" x="58" y="0.0" width="23" height="23"/>
-                        </imageView>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mineMusic_nomal" translatesAutoresizingMaskIntoConstraints="NO" id="rNo-SY-uMx">
-                            <rect key="frame" x="87" y="0.0" width="23" height="23"/>
-                        </imageView>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <gestureRecognizers/>
-                    <constraints>
-                        <constraint firstAttribute="bottom" secondItem="Cdf-rH-nsz" secondAttribute="bottom" id="4mR-ks-6P6"/>
-                        <constraint firstItem="wYg-iQ-k09" firstAttribute="width" secondItem="Cdf-rH-nsz" secondAttribute="width" id="7a2-ev-ECO"/>
-                        <constraint firstItem="ajS-D4-GM0" firstAttribute="centerY" secondItem="Cdf-rH-nsz" secondAttribute="centerY" id="GrE-gx-i7C"/>
-                        <constraint firstItem="wYg-iQ-k09" firstAttribute="height" secondItem="Cdf-rH-nsz" secondAttribute="height" id="KkX-Se-ujn"/>
-                        <constraint firstItem="ajS-D4-GM0" firstAttribute="width" secondItem="Cdf-rH-nsz" secondAttribute="width" id="LZL-0c-bCI"/>
-                        <constraint firstItem="wYg-iQ-k09" firstAttribute="centerY" secondItem="Cdf-rH-nsz" secondAttribute="centerY" id="MlK-8f-LgY"/>
-                        <constraint firstItem="Cdf-rH-nsz" firstAttribute="top" secondItem="G60-Et-o3r" secondAttribute="top" id="anH-pW-9CV"/>
-                        <constraint firstAttribute="trailing" secondItem="rNo-SY-uMx" secondAttribute="trailing" constant="4" id="bIs-if-89v"/>
-                        <constraint firstItem="wYg-iQ-k09" firstAttribute="leading" secondItem="Cdf-rH-nsz" secondAttribute="trailing" constant="6" id="cbT-SA-NW4"/>
-                        <constraint firstItem="ajS-D4-GM0" firstAttribute="leading" secondItem="wYg-iQ-k09" secondAttribute="trailing" constant="6" id="dBI-9d-eW4"/>
-                        <constraint firstItem="rNo-SY-uMx" firstAttribute="height" secondItem="Cdf-rH-nsz" secondAttribute="height" id="p8n-KM-xLN"/>
-                        <constraint firstItem="rNo-SY-uMx" firstAttribute="leading" secondItem="ajS-D4-GM0" secondAttribute="trailing" constant="6" id="pko-8C-6Ai"/>
-                        <constraint firstItem="Cdf-rH-nsz" firstAttribute="leading" secondItem="G60-Et-o3r" secondAttribute="leading" id="vSf-Kf-q3G"/>
-                        <constraint firstItem="ajS-D4-GM0" firstAttribute="height" secondItem="Cdf-rH-nsz" secondAttribute="height" id="vrP-cd-5x7"/>
-                        <constraint firstItem="rNo-SY-uMx" firstAttribute="centerY" secondItem="Cdf-rH-nsz" secondAttribute="centerY" id="wch-mi-sjh"/>
-                        <constraint firstItem="rNo-SY-uMx" firstAttribute="width" secondItem="Cdf-rH-nsz" secondAttribute="width" id="yjV-s8-EDl"/>
-                    </constraints>
-                    <connections>
-                        <outletCollection property="gestureRecognizers" destination="7DH-Yq-F32" appends="YES" id="co4-Z0-6Hy"/>
-                    </connections>
-                </view>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="勋章" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sUP-ZP-Dxs">
-                    <rect key="frame" x="145" y="5" width="28" height="17"/>
-                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                    <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0/4" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GIJ-nK-Ul6">
-                    <rect key="frame" x="179" y="5" width="23" height="17"/>
-                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                    <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jce-l2-nVi">
-                    <rect key="frame" x="393" y="35" width="114" height="30"/>
+                    <rect key="frame" x="14" y="5" width="114" height="30"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="auth_nomal_icon" translatesAutoresizingMaskIntoConstraints="NO" id="l7x-is-S7Y">
                             <rect key="frame" x="9" y="5" width="20" height="20"/>
@@ -92,7 +36,7 @@
                             </connections>
                         </button>
                     </subviews>
-                    <color key="backgroundColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="backgroundColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstItem="l7x-is-S7Y" firstAttribute="leading" secondItem="Jce-l2-nVi" secondAttribute="leading" constant="9" id="1HE-aP-HHp"/>
                         <constraint firstItem="ZBc-68-Goe" firstAttribute="leading" secondItem="Jce-l2-nVi" secondAttribute="leading" id="2oJ-BN-cyZ"/>
@@ -113,51 +57,8 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K9c-3E-YUK">
-                    <rect key="frame" x="453" y="24" width="54" height="16"/>
-                    <subviews>
-                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="认证失败" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tqA-UQ-Vrb">
-                            <rect key="frame" x="6" y="2" width="41" height="12"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="10"/>
-                            <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                    </subviews>
-                    <color key="backgroundColor" red="0.98431372549019602" green="0.36862745098039218" blue="0.19607843137254902" alpha="1" colorSpace="calibratedRGB"/>
-                    <constraints>
-                        <constraint firstItem="tqA-UQ-Vrb" firstAttribute="leading" secondItem="K9c-3E-YUK" secondAttribute="leading" constant="6" id="HUR-t2-eVj"/>
-                        <constraint firstAttribute="trailing" secondItem="tqA-UQ-Vrb" secondAttribute="trailing" constant="7" id="Hp6-1T-Z2G"/>
-                        <constraint firstAttribute="height" constant="16" id="RcL-av-VnF"/>
-                        <constraint firstItem="tqA-UQ-Vrb" firstAttribute="centerY" secondItem="K9c-3E-YUK" secondAttribute="centerY" id="ZpB-nF-Qz6"/>
-                        <constraint firstAttribute="width" constant="54" id="g7X-Ls-VIP"/>
-                    </constraints>
-                </view>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="评分：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nDP-6c-WeM">
-                    <rect key="frame" x="382" y="6" width="30" height="15"/>
-                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/>
-                    <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Eh7-SW-rWW">
-                    <rect key="frame" x="412" y="4" width="95" height="19"/>
-                    <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PmF-Mq-0JT" customClass="KSStarView">
-                            <rect key="frame" x="0.0" y="0.0" width="95" height="19"/>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        </view>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="19" id="6QK-u7-AO5"/>
-                        <constraint firstAttribute="trailing" secondItem="PmF-Mq-0JT" secondAttribute="trailing" id="Caf-Za-tIJ"/>
-                        <constraint firstItem="PmF-Mq-0JT" firstAttribute="leading" secondItem="Eh7-SW-rWW" secondAttribute="leading" id="H3w-Vs-nVs"/>
-                        <constraint firstItem="PmF-Mq-0JT" firstAttribute="top" secondItem="Eh7-SW-rWW" secondAttribute="top" id="Ylc-Oa-Lse"/>
-                        <constraint firstAttribute="width" constant="95" id="cGl-nV-6pT"/>
-                        <constraint firstAttribute="bottom" secondItem="PmF-Mq-0JT" secondAttribute="bottom" id="qSM-7y-dxV"/>
-                    </constraints>
-                </view>
                 <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qdW-5e-X9f">
-                    <rect key="frame" x="499" y="35" width="8" height="8"/>
+                    <rect key="frame" x="120" y="5" width="8" height="8"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kpv-Vp-oFn">
                             <rect key="frame" x="1" y="1" width="6" height="6"/>
@@ -184,34 +85,61 @@
                         </userDefinedRuntimeAttribute>
                     </userDefinedRuntimeAttributes>
                 </view>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="K9c-3E-YUK">
+                    <rect key="frame" x="120" y="0.0" width="54" height="16"/>
+                    <subviews>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="认证失败" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tqA-UQ-Vrb">
+                            <rect key="frame" x="6" y="2" width="42" height="12"/>
+                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="10"/>
+                            <color key="textColor" red="0.98431372549019602" green="0.36862745098039218" blue="0.19607843137254902" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
+                    <color key="backgroundColor" red="1" green="0.96078431372549022" blue="0.94901960784313721" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <constraints>
+                        <constraint firstItem="tqA-UQ-Vrb" firstAttribute="leading" secondItem="K9c-3E-YUK" secondAttribute="leading" constant="6" id="HUR-t2-eVj"/>
+                        <constraint firstAttribute="trailing" secondItem="tqA-UQ-Vrb" secondAttribute="trailing" constant="6" id="Hp6-1T-Z2G"/>
+                        <constraint firstAttribute="height" constant="16" id="RcL-av-VnF"/>
+                        <constraint firstItem="tqA-UQ-Vrb" firstAttribute="centerY" secondItem="K9c-3E-YUK" secondAttribute="centerY" id="ZpB-nF-Qz6"/>
+                        <constraint firstAttribute="width" constant="54" id="g7X-Ls-VIP"/>
+                    </constraints>
+                    <userDefinedRuntimeAttributes>
+                        <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                            <real key="value" value="1"/>
+                        </userDefinedRuntimeAttribute>
+                        <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                            <color key="value" red="1" green="0.47058823529411764" blue="0.32156862745098036" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        </userDefinedRuntimeAttribute>
+                    </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="Hbt-Ka-sJd">
-                    <rect key="frame" x="27" y="43" width="45" height="20"/>
+                    <rect key="frame" x="452" y="10" width="45" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="6if-aG-kuL"/>
                         <constraint firstAttribute="width" constant="45" id="LTR-WG-Lje"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="homeSubject_choose" translatesAutoresizingMaskIntoConstraints="NO" id="mcI-xg-AYQ">
-                    <rect key="frame" x="78" y="46" width="14" height="14"/>
+                    <rect key="frame" x="503" y="13" width="14" height="14"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="14" id="Nbq-df-NQ4"/>
                         <constraint firstAttribute="width" constant="14" id="bl8-d1-9nH"/>
                     </constraints>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CVF-vi-Nmp">
-                    <rect key="frame" x="72" y="43" width="0.0" height="20"/>
+                    <rect key="frame" x="497" y="10" width="0.0" height="20"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="20" id="3nK-j6-8Uf"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                    <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="n7U-cl-uZy">
-                    <rect key="frame" x="27" y="35.5" width="65" height="35"/>
+                    <rect key="frame" x="452" y="2.5" width="65" height="35"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="35" id="eF1-q5-ExD"/>
                     </constraints>
@@ -223,32 +151,22 @@
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstItem="Jce-l2-nVi" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="mcI-xg-AYQ" secondAttribute="trailing" constant="10" id="0So-lu-dsb"/>
-                <constraint firstItem="sUP-ZP-Dxs" firstAttribute="centerY" secondItem="G60-Et-o3r" secondAttribute="centerY" id="35Q-mn-MzL"/>
-                <constraint firstItem="nDP-6c-WeM" firstAttribute="centerY" secondItem="GIJ-nK-Ul6" secondAttribute="centerY" id="4hA-Jh-6X6"/>
+                <constraint firstItem="Hbt-Ka-sJd" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Jce-l2-nVi" secondAttribute="trailing" constant="10" id="3lc-wA-8ui"/>
                 <constraint firstItem="mcI-xg-AYQ" firstAttribute="centerY" secondItem="CVF-vi-Nmp" secondAttribute="centerY" id="5Kf-nq-UGY"/>
                 <constraint firstItem="qdW-5e-X9f" firstAttribute="top" secondItem="Jce-l2-nVi" secondAttribute="top" id="5LM-ZS-zye"/>
-                <constraint firstAttribute="trailing" secondItem="Jce-l2-nVi" secondAttribute="trailing" constant="24" id="5wY-ji-QPi"/>
                 <constraint firstItem="CVF-vi-Nmp" firstAttribute="centerY" secondItem="Hbt-Ka-sJd" secondAttribute="centerY" id="6Gk-TA-zcE"/>
                 <constraint firstItem="mcI-xg-AYQ" firstAttribute="leading" secondItem="CVF-vi-Nmp" secondAttribute="trailing" constant="6" id="7ts-xU-Z5S"/>
                 <constraint firstItem="CVF-vi-Nmp" firstAttribute="centerY" secondItem="n7U-cl-uZy" secondAttribute="centerY" id="BXH-p4-ORs"/>
-                <constraint firstItem="Eh7-SW-rWW" firstAttribute="leading" secondItem="nDP-6c-WeM" secondAttribute="trailing" id="BxK-XL-TfM"/>
                 <constraint firstItem="CVF-vi-Nmp" firstAttribute="leading" secondItem="Hbt-Ka-sJd" secondAttribute="trailing" id="CMb-G7-1rK"/>
-                <constraint firstItem="K9c-3E-YUK" firstAttribute="trailing" secondItem="Jce-l2-nVi" secondAttribute="trailing" id="J4y-Jw-53G"/>
-                <constraint firstItem="Hbt-Ka-sJd" firstAttribute="top" secondItem="G60-Et-o3r" secondAttribute="bottom" constant="18" id="Kc2-qW-cG8"/>
-                <constraint firstAttribute="bottom" secondItem="Jce-l2-nVi" secondAttribute="bottom" constant="15" id="NRD-kE-BFv"/>
-                <constraint firstItem="GIJ-nK-Ul6" firstAttribute="centerY" secondItem="G60-Et-o3r" secondAttribute="centerY" id="PDh-cd-ke5"/>
-                <constraint firstAttribute="trailing" secondItem="Eh7-SW-rWW" secondAttribute="trailing" constant="24" id="VRm-Y6-u2L"/>
+                <constraint firstItem="Jce-l2-nVi" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="E6P-Dt-pz0"/>
+                <constraint firstAttribute="trailing" secondItem="mcI-xg-AYQ" secondAttribute="trailing" constant="14" id="MVY-tc-nb3"/>
+                <constraint firstAttribute="bottom" secondItem="Jce-l2-nVi" secondAttribute="bottom" constant="16" id="NRD-kE-BFv"/>
+                <constraint firstItem="K9c-3E-YUK" firstAttribute="top" secondItem="Jce-l2-nVi" secondAttribute="top" constant="-5" id="P9B-FT-UX8"/>
                 <constraint firstItem="qdW-5e-X9f" firstAttribute="trailing" secondItem="Jce-l2-nVi" secondAttribute="trailing" id="Xgz-oO-3SI"/>
-                <constraint firstItem="Eh7-SW-rWW" firstAttribute="centerY" secondItem="nDP-6c-WeM" secondAttribute="centerY" id="YbM-aK-3Wu"/>
                 <constraint firstItem="mcI-xg-AYQ" firstAttribute="trailing" secondItem="n7U-cl-uZy" secondAttribute="trailing" id="YrW-g9-Zeu"/>
-                <constraint firstItem="G60-Et-o3r" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="2" id="e0l-Oj-qcg"/>
-                <constraint firstItem="G60-Et-o3r" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="24" id="oxP-IZ-oSI"/>
-                <constraint firstItem="sUP-ZP-Dxs" firstAttribute="leading" secondItem="G60-Et-o3r" secondAttribute="trailing" constant="7" id="qQb-Mw-aPM"/>
-                <constraint firstItem="Hbt-Ka-sJd" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="27" id="tx0-2M-Veh"/>
-                <constraint firstItem="GIJ-nK-Ul6" firstAttribute="leading" secondItem="sUP-ZP-Dxs" secondAttribute="trailing" constant="6" id="uPv-rF-rzz"/>
+                <constraint firstAttribute="bottom" secondItem="Hbt-Ka-sJd" secondAttribute="bottom" constant="21" id="Z6n-UD-lQa"/>
+                <constraint firstItem="K9c-3E-YUK" firstAttribute="leading" secondItem="Jce-l2-nVi" secondAttribute="trailing" constant="-8" id="lKt-4F-GGJ"/>
                 <constraint firstItem="n7U-cl-uZy" firstAttribute="leading" secondItem="Hbt-Ka-sJd" secondAttribute="leading" id="uQF-Rs-zme"/>
-                <constraint firstItem="K9c-3E-YUK" firstAttribute="bottom" secondItem="Jce-l2-nVi" secondAttribute="top" constant="5" id="y8F-1z-mAK"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
@@ -257,34 +175,18 @@
                 <outlet property="authIcon" destination="l7x-is-S7Y" id="tD4-VZ-R6A"/>
                 <outlet property="authTitle" destination="H6Y-EP-j6O" id="RCR-Iv-2tA"/>
                 <outlet property="authView" destination="Jce-l2-nVi" id="edG-mm-RBe"/>
-                <outlet property="badgeCountLabel" destination="GIJ-nK-Ul6" id="CSP-lB-ixS"/>
                 <outlet property="dotView" destination="qdW-5e-X9f" id="Fv6-3s-EES"/>
                 <outlet property="failDescLabel" destination="tqA-UQ-Vrb" id="zSe-wv-Itu"/>
                 <outlet property="failedView" destination="K9c-3E-YUK" id="QaJ-bg-rxW"/>
-                <outlet property="gradeTitleLabel" destination="nDP-6c-WeM" id="Kmw-F7-p3b"/>
-                <outlet property="liveImage" destination="ajS-D4-GM0" id="wAy-z1-Y1G"/>
-                <outlet property="musicImage" destination="rNo-SY-uMx" id="d4j-nb-6NB"/>
                 <outlet property="nextImage" destination="cln-Cb-asa" id="Oix-Fw-HIo"/>
-                <outlet property="starView" destination="PmF-Mq-0JT" id="gMv-D9-wuh"/>
-                <outlet property="styleImage" destination="Cdf-rH-nsz" id="djp-I7-9pZ"/>
                 <outlet property="subjectLabel" destination="CVF-vi-Nmp" id="iuZ-nE-typ"/>
-                <outlet property="videoImage" destination="wYg-iQ-k09" id="Gae-qR-qwK"/>
             </connections>
-            <point key="canvasLocation" x="225.36231884057972" y="26.785714285714285"/>
+            <point key="canvasLocation" x="225.36231884057972" y="31.138392857142854"/>
         </view>
-        <tapGestureRecognizer id="7DH-Yq-F32">
-            <connections>
-                <action selector="showDesc:" destination="iN0-l3-epB" id="3bQ-2E-FdY"/>
-            </connections>
-        </tapGestureRecognizer>
     </objects>
     <resources>
         <image name="auth_next_white" width="6" height="9"/>
         <image name="auth_nomal_icon" width="20" height="20"/>
         <image name="homeSubject_choose" width="14" height="14"/>
-        <image name="mineLive_nomal" width="24" height="23"/>
-        <image name="mineMusic_nomal" width="24" height="23"/>
-        <image name="mineStyle_nomal" width="23" height="23"/>
-        <image name="mineVideo_nomal" width="23" height="23"/>
     </resources>
 </document>

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

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

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

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" 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_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="HomeNewMusicView">
-            <rect key="frame" x="0.0" y="0.0" width="390" height="388"/>
+            <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="331" y="32" width="45" 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,16 +26,16 @@
                     </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="30" width="73.666666666666671" height="22"/>
+                    <rect key="frame" x="24" y="20" width="71.666666666666671" height="24"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="22" id="ykn-Z7-imu"/>
+                        <constraint firstAttribute="height" constant="24" id="ykn-Z7-imu"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
                     <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                     <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="337" y="26" width="34" 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,27 +48,23 @@
                     </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="337" y="33.666666666666664" width="25" height="14.666666666666664"/>
+                    <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="37" 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="32" width="4" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="B5g-ev-PbH"/>
-                        <constraint firstAttribute="width" constant="4" id="Jx9-Q2-wT3"/>
-                    </constraints>
+                    <rect key="frame" x="14" y="24.666666666666671" width="4" height="15"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="csN-Ie-7a8">
-                    <rect key="frame" x="0.0" y="68" 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"/>
@@ -85,14 +81,14 @@
                 <constraint firstItem="csN-Ie-7a8" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="K1Y-fg-RQv"/>
                 <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 firstItem="csN-Ie-7a8" firstAttribute="top" secondItem="csk-1t-0jz" secondAttribute="bottom" constant="12" id="Puf-fP-R0z"/>
                 <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="30" 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"/>
                 <constraint firstItem="2pb-rc-jX4" firstAttribute="leading" secondItem="fy2-nu-LBW" secondAttribute="leading" constant="6" id="i1k-cJ-1as"/>
                 <constraint firstItem="lcO-IB-Crt" firstAttribute="centerY" secondItem="6CW-e0-al3" secondAttribute="centerY" id="jG3-Lk-KHu"/>
+                <constraint firstItem="csN-Ie-7a8" firstAttribute="top" secondItem="6CW-e0-al3" secondAttribute="bottom" constant="12" id="kdG-a7-f5g"/>
                 <constraint firstItem="csk-1t-0jz" firstAttribute="centerY" secondItem="6CW-e0-al3" secondAttribute="centerY" id="lrP-rE-aW8"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
@@ -105,7 +101,7 @@
         </view>
     </objects>
     <resources>
-        <image name="home_left" width="4" height="18"/>
+        <image name="home_left" width="4" height="15"/>
         <image name="home_more_green" width="5" height="8"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeRecentCourseView.h

@@ -27,6 +27,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)joinRoom:(RecentCourseAction)callback;
 
++ (CGFloat)getViewHeight;
+
 @end
 
 NS_ASSUME_NONNULL_END

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeRecentCourseView.m

@@ -6,13 +6,12 @@
 //
 
 #import "HomeRecentCourseView.h"
-#import <Lottie/Lottie.h>
 
 @interface HomeRecentCourseView ()
 
-@property (nonatomic, strong) LOTAnimationView *animationView;
+@property (weak, nonatomic) IBOutlet UIView *statusBgView;
 
-@property (weak, nonatomic) IBOutlet UIView *imageBgView;
+@property (weak, nonatomic) IBOutlet UILabel *statusLabel;
 
 @property (weak, nonatomic) IBOutlet UILabel *titleLabel;
 
@@ -54,37 +53,25 @@
         [formatter setDateFormat:@"yyyy-MM-dd HH:mm"];
         self.timeLabel.text = [NSString returnNoNullStringWithString:[formatter stringFromDate:beginDate]];
     }
-
-    NSString *jsonString = @"";
-    if ([self.courseModel.courseType isEqualToString:@"LIVE"]) {
-        jsonString = @"live_animation";
-    }
-    else if ([self.courseModel.courseType isEqualToString:@"PIANO_ROOM_CLASS"]) {
-        jsonString = @"musicRoom_animation";
+    
+    if ([model.status isEqualToString:@"ING"]) { // 进行中
+        self.statusBgView.layer.borderColor = [UIColor clearColor].CGColor;
+        self.statusBgView.backgroundColor = THEMECOLOR;
+        self.statusLabel.text = @"进入教室";
+        self.statusLabel.font = [UIFont systemFontOfSize:14.0f weight:UIFontWeightMedium];
+        self.statusLabel.textColor = [UIColor whiteColor];
     }
-    else if ([self.courseModel.courseType isEqualToString:@"VIP"]) {
-        jsonString = @"accomapny_animation.json";
+    else { // 未开始
+        self.statusBgView.backgroundColor = [UIColor whiteColor];
+        self.statusBgView.layer.borderColor = HexRGBAlpha(0x2DC7AA, 0.5f).CGColor;
+        self.statusLabel.text = @"即将开始";
+        self.statusLabel.font = [UIFont systemFontOfSize:14.0f];
+        self.statusLabel.textColor = THEMECOLOR;
     }
-    else {
-        jsonString = @"accomapny_animation";
-    }
-    [self configAnimationView:jsonString];
+    self.titleLabel.text = [NSString returnNoNullStringWithString:model.courseGroupName];
 }
 
-- (void)configAnimationView:(NSString *)jsonString {
-    if ([self.imageBgView.subviews containsObject:self.animationView]) {
-        [self.animationView removeFromSuperview];
-    }
-    self.animationView = [LOTAnimationView animationWithFilePath:[[NSBundle mainBundle] pathForResource:jsonString ofType:@"json"]];
-    //2.加载后台给的json(url)
-    self.animationView.frame = CGRectMake(0, 0, 128, 91);
-    self.animationView.loopAnimation = YES;
-    self.animationView.contentMode = UIViewContentModeScaleAspectFill;
-    self.animationView.animationSpeed = 1.0;
-    self.animationView.loopAnimation = YES;
-    [self.imageBgView addSubview:self.animationView];
-    [self.animationView play];
-}
+
 
 - (IBAction)joinRoomAction:(id)sender {
     if (self.callback) {
@@ -101,12 +88,13 @@
         else /*if ([self.courseModel.courseType isEqualToString:@"PRACTICE"])*/ {
             type = RECENTCOURSE_TYPE_ACCOMPANY;
         }
-        
         self.callback(type, self.courseModel);
     }
 }
 
-
++ (CGFloat)getViewHeight {
+    return 82.0f;
+}
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeRecentCourseView.xib

@@ -1,110 +1,115 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="HomeRecentCourseView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="90"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="82"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jzj-07-uBu">
-                    <rect key="frame" x="14" y="20" width="386" height="70"/>
+                    <rect key="frame" x="14" y="0.0" width="386" height="70"/>
                     <subviews>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="您有新课程即将开始" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lrj-nH-46q">
-                            <rect key="frame" x="128" y="12" width="147" height="28"/>
+                            <rect key="frame" x="16" y="10" width="268" height="28"/>
                             <constraints>
                                 <constraint firstAttribute="height" constant="28" id="sH9-HN-Ism"/>
                             </constraints>
                             <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
-                            <color key="textColor" red="0.10196078431372549" green="0.10196078431372549" blue="0.10196078431372549" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.10196078431372549" green="0.10196078431372549" blue="0.10196078431372549" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="course_tips" translatesAutoresizingMaskIntoConstraints="NO" id="pUs-nj-cKV">
-                            <rect key="frame" x="128" y="42" width="15" height="14"/>
+                            <rect key="frame" x="16" y="40" width="15" height="14"/>
                         </imageView>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ebm-D0-ZwZ">
-                            <rect key="frame" x="148" y="49" width="0.0" height="0.0"/>
+                            <rect key="frame" x="39" y="38" width="0.0" height="18"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="18" id="xG3-5S-XL0"/>
+                            </constraints>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                            <color key="textColor" red="1" green="0.50196078431372548" blue="0.43529411764705883" alpha="1" colorSpace="calibratedRGB"/>
+                            <color key="textColor" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             <nil key="highlightedColor"/>
                         </label>
-                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_courseNext" translatesAutoresizingMaskIntoConstraints="NO" id="I3Y-BW-zVy">
-                            <rect key="frame" x="357" y="26" width="18" height="18"/>
-                        </imageView>
+                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nFt-Tj-nsV">
+                            <rect key="frame" x="294" y="22" width="76" height="26"/>
+                            <subviews>
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="即将开始" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FPN-v9-q51">
+                                    <rect key="frame" x="10" y="4.5" width="56" height="17"/>
+                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                    <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <nil key="highlightedColor"/>
+                                </label>
+                            </subviews>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <constraints>
+                                <constraint firstItem="FPN-v9-q51" firstAttribute="centerY" secondItem="nFt-Tj-nsV" secondAttribute="centerY" id="3Ui-AG-80k"/>
+                                <constraint firstAttribute="height" constant="26" id="Sn8-qk-VOK"/>
+                                <constraint firstAttribute="width" constant="76" id="Yvn-Hz-ZtR"/>
+                                <constraint firstItem="FPN-v9-q51" firstAttribute="centerX" secondItem="nFt-Tj-nsV" secondAttribute="centerX" id="syg-uc-dac"/>
+                            </constraints>
+                            <userDefinedRuntimeAttributes>
+                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                    <real key="value" value="1"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                    <color key="value" red="0.1764705882352941" green="0.7803921568627451" blue="0.66666666666666663" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
+                                </userDefinedRuntimeAttribute>
+                                <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                    <real key="value" value="13"/>
+                                </userDefinedRuntimeAttribute>
+                            </userDefinedRuntimeAttributes>
+                        </view>
                     </subviews>
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <gestureRecognizers/>
                     <constraints>
                         <constraint firstItem="ebm-D0-ZwZ" firstAttribute="centerY" secondItem="pUs-nj-cKV" secondAttribute="centerY" id="9ce-nN-JeR"/>
-                        <constraint firstItem="lrj-nH-46q" firstAttribute="top" secondItem="Jzj-07-uBu" secondAttribute="top" constant="12" id="Xw7-KT-WjY"/>
+                        <constraint firstItem="lrj-nH-46q" firstAttribute="top" secondItem="Jzj-07-uBu" secondAttribute="top" constant="10" id="Xw7-KT-WjY"/>
+                        <constraint firstItem="nFt-Tj-nsV" firstAttribute="leading" secondItem="lrj-nH-46q" secondAttribute="trailing" constant="10" id="XwQ-Yn-bi0"/>
                         <constraint firstAttribute="height" constant="70" id="bQc-MO-m30"/>
-                        <constraint firstItem="I3Y-BW-zVy" firstAttribute="centerY" secondItem="Jzj-07-uBu" secondAttribute="centerY" id="cid-QZ-ZHY"/>
-                        <constraint firstItem="ebm-D0-ZwZ" firstAttribute="leading" secondItem="pUs-nj-cKV" secondAttribute="trailing" constant="5" id="h4M-10-9kQ"/>
-                        <constraint firstItem="lrj-nH-46q" firstAttribute="leading" secondItem="Jzj-07-uBu" secondAttribute="leading" constant="128" id="qOf-lx-0rA"/>
+                        <constraint firstItem="nFt-Tj-nsV" firstAttribute="centerY" secondItem="Jzj-07-uBu" secondAttribute="centerY" id="daR-xM-DE0"/>
+                        <constraint firstAttribute="trailing" secondItem="nFt-Tj-nsV" secondAttribute="trailing" constant="16" id="e4c-8z-JUt"/>
+                        <constraint firstItem="ebm-D0-ZwZ" firstAttribute="leading" secondItem="pUs-nj-cKV" secondAttribute="trailing" constant="8" id="h4M-10-9kQ"/>
+                        <constraint firstItem="lrj-nH-46q" firstAttribute="leading" secondItem="Jzj-07-uBu" secondAttribute="leading" constant="16" id="qOf-lx-0rA"/>
                         <constraint firstItem="pUs-nj-cKV" firstAttribute="top" secondItem="lrj-nH-46q" secondAttribute="bottom" constant="2" id="qbO-gb-XFq"/>
                         <constraint firstItem="pUs-nj-cKV" firstAttribute="leading" secondItem="lrj-nH-46q" secondAttribute="leading" id="tuQ-H0-4Df"/>
-                        <constraint firstAttribute="trailing" secondItem="I3Y-BW-zVy" secondAttribute="trailing" constant="11" id="txu-hF-IbY"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                             <real key="value" value="10"/>
                         </userDefinedRuntimeAttribute>
                         <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                            <color key="value" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="size" keyPath="shadowOffset">
-                            <size key="value" width="0.0" height="2"/>
+                            <color key="value" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="color" keyPath="shadowUIColor">
-                            <color key="value" red="0.89803921568627454" green="0.89803921568627454" blue="0.89803921568627454" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="shadowOpacity">
+                        <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                             <real key="value" value="1"/>
                         </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="number" keyPath="shadowRadius">
-                            <real key="value" value="2"/>
-                        </userDefinedRuntimeAttribute>
-                        <userDefinedRuntimeAttribute type="boolean" keyPath="maskToBounces" value="NO"/>
                     </userDefinedRuntimeAttributes>
                     <connections>
                         <outletCollection property="gestureRecognizers" destination="rx0-oN-RKL" appends="YES" id="iaQ-no-GiC"/>
                     </connections>
                 </view>
-                <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="vsd-sl-jtT">
-                    <rect key="frame" x="14" y="-1" width="128" height="91"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="91" id="mxA-fh-cAU"/>
-                        <constraint firstAttribute="width" constant="128" id="u3O-yc-01G"/>
-                    </constraints>
-                </imageView>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aUl-ls-p4K">
-                    <rect key="frame" x="14" y="-1" width="128" height="91"/>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstAttribute="bottom" secondItem="Jzj-07-uBu" secondAttribute="bottom" id="A8I-iS-zIQ"/>
                 <constraint firstItem="Jzj-07-uBu" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="DgC-Xy-byN"/>
-                <constraint firstItem="aUl-ls-p4K" firstAttribute="bottom" secondItem="vsd-sl-jtT" secondAttribute="bottom" id="ZQt-az-0Mr"/>
                 <constraint firstAttribute="trailing" secondItem="Jzj-07-uBu" secondAttribute="trailing" constant="14" id="feY-bv-SDH"/>
-                <constraint firstItem="aUl-ls-p4K" firstAttribute="trailing" secondItem="vsd-sl-jtT" secondAttribute="trailing" id="g9B-UY-EHi"/>
-                <constraint firstItem="aUl-ls-p4K" firstAttribute="top" secondItem="vsd-sl-jtT" secondAttribute="top" id="gPk-3u-lmO"/>
-                <constraint firstItem="aUl-ls-p4K" firstAttribute="leading" secondItem="vsd-sl-jtT" secondAttribute="leading" id="hcn-Q6-rgN"/>
-                <constraint firstItem="vsd-sl-jtT" firstAttribute="bottom" secondItem="Jzj-07-uBu" secondAttribute="bottom" id="jb1-gr-dzL"/>
-                <constraint firstItem="vsd-sl-jtT" firstAttribute="leading" secondItem="Jzj-07-uBu" secondAttribute="leading" id="lY2-L7-ltx"/>
+                <constraint firstItem="Jzj-07-uBu" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="wPQ-OB-WHG"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
-                <outlet property="imageBgView" destination="aUl-ls-p4K" id="cy9-xy-XoE"/>
+                <outlet property="statusBgView" destination="nFt-Tj-nsV" id="JCH-sq-8Ss"/>
+                <outlet property="statusLabel" destination="FPN-v9-q51" id="W5n-8n-1yq"/>
                 <outlet property="timeLabel" destination="ebm-D0-ZwZ" id="N8s-Fo-9jS"/>
                 <outlet property="titleLabel" destination="lrj-nH-46q" id="y9y-NQ-vDX"/>
             </connections>
@@ -117,7 +122,9 @@
         </tapGestureRecognizer>
     </objects>
     <resources>
-        <image name="course_tips" width="15" height="14"/>
-        <image name="home_courseNext" width="18" height="18"/>
+        <image name="course_tips" width="14.5" height="14"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

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

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

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

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21225" 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_0" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21207"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="HomeRecommendMusicView">
-            <rect key="frame" x="0.0" y="0.0" width="390" height="308"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <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="331" y="32" width="45" 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,16 +26,16 @@
                     </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="30" width="73.666666666666671" height="22"/>
+                    <rect key="frame" x="24" y="20" width="67.666666666666671" height="24"/>
                     <constraints>
-                        <constraint firstAttribute="height" constant="22" id="j7f-c1-B4o"/>
+                        <constraint firstAttribute="height" constant="24" id="j7f-c1-B4o"/>
                     </constraints>
-                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/>
-                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                    <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
+                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <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="337" y="26" width="34" 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,27 +48,23 @@
                     </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="337" y="33.666666666666664" width="25" height="14.666666666666664"/>
+                    <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="37" 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="32" width="4" height="18"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="18" id="0nb-Nj-2lG"/>
-                        <constraint firstAttribute="width" constant="4" id="g6O-Mb-yas"/>
-                    </constraints>
+                    <rect key="frame" x="14" y="24.666666666666671" width="4" height="15"/>
                 </imageView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sOs-N5-Dh3">
-                    <rect key="frame" x="0.0" y="68" 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,15 +81,15 @@
                 <constraint firstItem="IEk-2m-N7I" firstAttribute="trailing" secondItem="gSD-Yz-KRC" secondAttribute="trailing" constant="-5" id="AKW-PK-EIG"/>
                 <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="sOs-N5-Dh3" firstAttribute="top" secondItem="4Gb-9V-Vs2" secondAttribute="bottom" constant="12" id="NSD-UZ-gFO"/>
                 <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="30" 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"/>
                 <constraint firstAttribute="trailing" secondItem="sOs-N5-Dh3" secondAttribute="trailing" id="ZKj-Zg-Isk"/>
                 <constraint firstItem="IEk-2m-N7I" firstAttribute="trailing" secondItem="0Ql-Fk-cYb" secondAttribute="trailing" id="crv-Dd-v7v"/>
                 <constraint firstItem="0Ql-Fk-cYb" firstAttribute="centerY" secondItem="4Gb-9V-Vs2" secondAttribute="centerY" id="goy-VI-GLl"/>
-                <constraint firstItem="sOs-N5-Dh3" firstAttribute="top" secondItem="0Ql-Fk-cYb" secondAttribute="bottom" constant="12" id="ljt-Ui-TI9"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
@@ -105,7 +101,7 @@
         </view>
     </objects>
     <resources>
-        <image name="home_left" width="4" height="18"/>
+        <image name="home_left" width="4" height="15"/>
         <image name="home_more_green" width="5" height="8"/>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeTenantView.m

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

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/HomeTenantView.xib

@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" 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_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="HomeTenantView">
-            <rect key="frame" x="0.0" y="0.0" width="393" height="30"/>
+            <rect key="frame" x="0.0" y="0.0" width="393" height="29"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qPd-T2-TBH">
-                    <rect key="frame" x="0.0" y="0.0" width="393" height="30"/>
+                    <rect key="frame" x="0.0" y="0.0" width="393" height="29"/>
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vDn-rU-rd6">
-                            <rect key="frame" x="24.999999999999993" y="1" width="108.33333333333331" height="18"/>
+                            <rect key="frame" x="16.000000000000007" y="1" width="105.66666666666669" height="18"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="武汉市小星星机构" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fY5-wx-V18">
-                                    <rect key="frame" x="5" y="0.0" width="98.333333333333329" height="18"/>
+                                    <rect key="frame" x="5" y="0.0" width="95.666666666666671" height="18"/>
                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                     <color key="textColor" red="1" green="0.4823529411764706" blue="0.19215686274509802" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <nil key="highlightedColor"/>
@@ -50,8 +50,8 @@
                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     <constraints>
                         <constraint firstItem="vDn-rU-rd6" firstAttribute="top" secondItem="qPd-T2-TBH" secondAttribute="top" constant="1" id="3rm-zc-w1T"/>
-                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="vDn-rU-rd6" secondAttribute="trailing" constant="25" id="Nfi-Aa-h6I"/>
-                        <constraint firstItem="vDn-rU-rd6" firstAttribute="leading" secondItem="qPd-T2-TBH" secondAttribute="leading" constant="25" id="vtO-72-6eC"/>
+                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="vDn-rU-rd6" secondAttribute="trailing" constant="16" id="Nfi-Aa-h6I"/>
+                        <constraint firstItem="vDn-rU-rd6" firstAttribute="leading" secondItem="qPd-T2-TBH" secondAttribute="leading" constant="16" id="vtO-72-6eC"/>
                     </constraints>
                 </view>
             </subviews>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/KSHomeButton.xib

@@ -1,20 +1,20 @@
 <?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>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="KSHomeButton">
-            <rect key="frame" x="0.0" y="0.0" width="80" height="80"/>
+            <rect key="frame" x="0.0" y="0.0" width="80" height="68"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="专项训练" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1ld-By-usD">
-                    <rect key="frame" x="2" y="63" width="76" height="17"/>
+                    <rect key="frame" x="2" y="51" width="76" height="17"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="17" id="HmM-NJ-9X6"/>
                     </constraints>
@@ -23,16 +23,16 @@
                     <nil key="highlightedColor"/>
                 </label>
                 <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Z8s-SG-JhM">
-                    <rect key="frame" x="8.5" y="0.0" width="63.5" height="80"/>
+                    <rect key="frame" x="8.5" y="0.0" width="63.5" height="68"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="63.5" id="JSo-aS-lFI"/>
                     </constraints>
                 </button>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fGp-yj-UZk">
-                    <rect key="frame" x="14.5" y="5" width="51" height="51"/>
+                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="fGp-yj-UZk">
+                    <rect key="frame" x="15" y="0.0" width="50" height="50"/>
                     <constraints>
-                        <constraint firstAttribute="width" constant="51" id="a4B-wg-004"/>
-                        <constraint firstAttribute="height" constant="51" id="xmk-HE-99v"/>
+                        <constraint firstAttribute="width" constant="50" id="a4B-wg-004"/>
+                        <constraint firstAttribute="height" constant="50" id="xmk-HE-99v"/>
                     </constraints>
                 </imageView>
             </subviews>
@@ -45,8 +45,8 @@
                 <constraint firstItem="1ld-By-usD" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="Zfj-98-cxn"/>
                 <constraint firstAttribute="trailing" secondItem="1ld-By-usD" secondAttribute="trailing" constant="2" id="bfB-Zj-nct"/>
                 <constraint firstItem="Z8s-SG-JhM" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="gyu-3P-I55"/>
-                <constraint firstItem="fGp-yj-UZk" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="5" id="t2k-gD-lM1"/>
-                <constraint firstAttribute="bottom" secondItem="1ld-By-usD" secondAttribute="bottom" id="ygh-pf-cwF"/>
+                <constraint firstItem="1ld-By-usD" firstAttribute="top" secondItem="fGp-yj-UZk" secondAttribute="bottom" constant="1" id="rks-6W-iJb"/>
+                <constraint firstItem="fGp-yj-UZk" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="t2k-gD-lM1"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/PublicNoticeView.h

@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)moreCallback:(NoticeMoreCallback)callback;
 
-- (CGFloat)getViewHeight;
++ (CGFloat)getViewHeight;
 
 @end
 

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/PublicNoticeView.m

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

KulexiuForTeacher/KulexiuForTeacher/Module/Home/View/PublicNoticeView.xib

@@ -1,28 +1,27 @@
 <?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"/>
-        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="PublicNoticeView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="52"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="56"/>
             <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="18s-Im-HaS">
-                    <rect key="frame" x="14" y="8" width="386" height="44"/>
+                    <rect key="frame" x="14" y="0.0" width="386" height="44"/>
                     <subviews>
                         <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="notice_icon" translatesAutoresizingMaskIntoConstraints="NO" id="Emb-yN-fCJ">
                             <rect key="frame" x="7" y="9" width="27" height="26"/>
                         </imageView>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FYH-Km-v6L">
                             <rect key="frame" x="41" y="0.0" width="296" height="44"/>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         </view>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l4x-1S-fJR">
                             <rect key="frame" x="342" y="0.0" width="44" height="44"/>
@@ -36,7 +35,7 @@
                             </connections>
                         </button>
                     </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <color key="backgroundColor" red="0.99607843137254903" green="0.97647058823529409" blue="0.95686274509803915" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="bottom" secondItem="l4x-1S-fJR" secondAttribute="bottom" id="1Jd-Qb-ShD"/>
                         <constraint firstItem="Emb-yN-fCJ" firstAttribute="centerY" secondItem="18s-Im-HaS" secondAttribute="centerY" id="Cfw-Em-J6j"/>
@@ -73,7 +72,7 @@
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="18s-Im-HaS" secondAttribute="trailing" constant="14" id="2VW-dV-Qen"/>
                 <constraint firstItem="18s-Im-HaS" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="KB3-aY-BCZ"/>
-                <constraint firstAttribute="bottom" secondItem="18s-Im-HaS" secondAttribute="bottom" id="XTG-kD-qov"/>
+                <constraint firstItem="18s-Im-HaS" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="m1L-Oi-IlS"/>
             </constraints>
             <nil key="simulatedTopBarMetrics"/>
             <nil key="simulatedBottomBarMetrics"/>
@@ -87,8 +86,5 @@
     <resources>
         <image name="notice_icon" width="27" height="26"/>
         <image name="notice_more" width="18" height="18"/>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
     </resources>
 </document>

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleTimeSettingCell.m

@@ -34,6 +34,11 @@
         self.timeStatusLabel.text = @"未设置";
     }
 }
+- (IBAction)settingTime:(id)sender {
+    if (self.callback) {
+        self.callback();
+    }
+}
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
     [super setSelected:selected animated:animated];

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/CreateStyle/View/MyStyleTimeSettingCell.xib

@@ -41,6 +41,9 @@
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wLT-Er-49O">
                                 <rect key="frame" x="257.33333333333331" y="0.0" width="89.666666666666686" height="57"/>
                                 <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                <connections>
+                                    <action selector="settingTime:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="nb4-T0-MtT"/>
+                                </connections>
                             </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>

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

@@ -55,10 +55,14 @@
     // Do any additional setup after loading the view.
     self.ks_prefersNavigationBarHidden = YES;
     _titles = @[@"VIP定制课",@"趣纠课",@"直播课",@"视频课",@"乐谱"];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(startSearchEdit) name:@"MinePageStartSearch" object:nil];
     [self configUI];
     [self countUMEvent];
 }
 
+- (void)startSearchEdit {
+    [self.pagerView setMainTableViewToMaxContentOffsetY];
+}
 - (void)countUMEvent {
     [USER_MANAGER sendUMEvent:@"klx_minePage"];
 }
@@ -475,6 +479,9 @@
     [self.intruduceAlert showAlertInView:[NSObject getKeyWindow]];
 }
 
+- (void)dealloc {
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
 
 /*
 #pragma mark - Navigation

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

@@ -51,6 +51,11 @@
     }
 }
 
+- (BOOL)textFieldShouldBeginEditing:(UITextField *)textField {
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"MinePageStartSearch" object:nil];
+    return YES;
+}
+
 - (BOOL)textFieldShouldReturn:(UITextField *)textField {
     [self endEditing:YES];
     if (self.callback) {

KulexiuForTeacher/KulexiuForTeacher/Module/Mine/MinePage/View/VipCourse/MinePageVIPCourseView.m

@@ -289,7 +289,7 @@
 - (void)settingCourseAction {
     // 设置VIP课程方案
     KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-    webCtrl.url = [NSString stringWithFormat:@"%@%@%@", WEBHOST, @"/#/practiceSetting", @"?tab=vip"];
+    webCtrl.url = [NSString stringWithFormat:@"%@%@%@", WEBHOST, @"/#/practiceSetting", @"?tabs=vip"];
     [self.naviController pushViewController:webCtrl animated:YES];
 }