Browse Source

部分样式修改

Steven 9 tháng trước cách đây
mục cha
commit
b94ce1825a
24 tập tin đã thay đổi với 81 bổ sung2620 xóa
  1. 10 58
      KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj
  2. 11 14
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/AccompanyCourseGroup/MyAccompanyCourseGroupView.m
  3. 10 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/LiveCourseGroup/MyLiveCourseGroupListCell.m
  4. 48 30
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/LiveCourseGroup/MyLiveCourseGroupListCell.xib
  5. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyCourseSortView/MyCourseRankSortView.m
  6. 1 1
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyCourseSortView/MyCourseSearchView.xib
  7. 0 25
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.h
  8. 0 721
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m
  9. 0 40
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonSearchView.h
  10. 0 96
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonSearchView.m
  11. 0 142
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonSearchView.xib
  12. 0 21
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLiveCourseCell.h
  13. 0 104
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLiveCourseCell.m
  14. 0 225
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLiveCourseCell.xib
  15. 0 22
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyMusicRoomBodyView.h
  16. 0 561
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyMusicRoomBodyView.m
  17. 0 22
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoCourseBodyView.h
  18. 0 396
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoCourseBodyView.m
  19. 0 26
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoSearchView.h
  20. 0 56
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoSearchView.m
  21. 0 59
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoSearchView.xib
  22. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/PopView/MusicRoomCourseCell.h
  23. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/PopView/MusicRoomCourseCell.m
  24. 0 0
      KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/PopView/MusicRoomCourseCell.xib

+ 10 - 58
KulexiuForTeacher/KulexiuForTeacher.xcodeproj/project.pbxproj

@@ -337,9 +337,6 @@
 		BC1263AA28FF98C300509E90 /* HomeRecommendMusicView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC1263A728FF98C300509E90 /* HomeRecommendMusicView.xib */; };
 		BC1263AB28FF98C300509E90 /* HomeRecommendMusicView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC1263A828FF98C300509E90 /* HomeRecommendMusicView.m */; };
 		BC1263AE28FF9A0300509E90 /* HomeMusicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BC1263AD28FF9A0200509E90 /* HomeMusicModel.m */; };
-		BC1365B8280D130C00EB03E2 /* MyVideoCourseBodyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC1365B7280D130C00EB03E2 /* MyVideoCourseBodyView.m */; };
-		BC1365BB280D162400EB03E2 /* MyVideoSearchView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC1365BA280D162400EB03E2 /* MyVideoSearchView.m */; };
-		BC1365BD280D163200EB03E2 /* MyVideoSearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC1365BC280D163200EB03E2 /* MyVideoSearchView.xib */; };
 		BC1365C4280D44EB00EB03E2 /* NotiferMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC1365C3280D44EB00EB03E2 /* NotiferMessageViewController.m */; };
 		BC1365C8280D476500EB03E2 /* NotiferMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC1365C6280D476500EB03E2 /* NotiferMessageCell.m */; };
 		BC1365C9280D476500EB03E2 /* NotiferMessageCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC1365C7280D476500EB03E2 /* NotiferMessageCell.xib */; };
@@ -383,6 +380,8 @@
 		BC161CE92AE0FD630071530A /* TenantGroupSortView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC161CE82AE0FD630071530A /* TenantGroupSortView.xib */; };
 		BC1E284F2C77218A0063E0A1 /* KSDeleteFailedAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC1E284C2C7721890063E0A1 /* KSDeleteFailedAlertView.xib */; };
 		BC1E28502C77218A0063E0A1 /* KSDeleteFailedAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC1E284E2C77218A0063E0A1 /* KSDeleteFailedAlertView.m */; };
+		BC206EDE2CEF2623001F2B85 /* MusicRoomCourseCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BC206EDC2CEF2623001F2B85 /* MusicRoomCourseCell.m */; };
+		BC206EDF2CEF2623001F2B85 /* MusicRoomCourseCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC206EDD2CEF2623001F2B85 /* MusicRoomCourseCell.xib */; };
 		BC221FA128C72B9500F99802 /* MyStyleVideoView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC221F9D28C72B9500F99802 /* MyStyleVideoView.xib */; };
 		BC221FA228C72B9500F99802 /* MyStyleVideoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC221F9E28C72B9500F99802 /* MyStyleVideoCell.xib */; };
 		BC221FA328C72B9500F99802 /* MyStyleVideoView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC221F9F28C72B9500F99802 /* MyStyleVideoView.m */; };
@@ -817,7 +816,6 @@
 		BC8B6E6E285836B600866917 /* low_staff.png in Resources */ = {isa = PBXBuildFile; fileRef = BC8B6E6C285836B600866917 /* low_staff.png */; };
 		BC8B6E7928585C2400866917 /* KSUMShareManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8B6E7828585C2400866917 /* KSUMShareManager.m */; };
 		BC8B6E84285887A400866917 /* MusicRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8B6E83285887A400866917 /* MusicRoomViewController.m */; };
-		BC8B6E87285888B100866917 /* MyMusicRoomBodyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8B6E86285888B100866917 /* MyMusicRoomBodyView.m */; };
 		BC8C2C642824EB9000FBA5D5 /* NotiferHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8C2C632824EB9000FBA5D5 /* NotiferHeadView.m */; };
 		BC8C2C662824EB9800FBA5D5 /* NotiferHeadView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BC8C2C652824EB9800FBA5D5 /* NotiferHeadView.xib */; };
 		BC8C2C7A28264CF400FBA5D5 /* ReceiveEvaluateListController.m in Sources */ = {isa = PBXBuildFile; fileRef = BC8C2C7928264CF400FBA5D5 /* ReceiveEvaluateListController.m */; };
@@ -862,8 +860,6 @@
 		BCA193BE282B9866004A585D /* MinePageGroupModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA193BC282B9866004A585D /* MinePageGroupModel.m */; };
 		BCA3369E2C942B340074DF75 /* KSSourceDownloadAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCA3369C2C942B340074DF75 /* KSSourceDownloadAlert.xib */; };
 		BCA3369F2C942B340074DF75 /* KSSourceDownloadAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA3369D2C942B340074DF75 /* KSSourceDownloadAlert.m */; };
-		BCA353CE2858A86200377661 /* MusicRoomCourseCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA353CC2858A86200377661 /* MusicRoomCourseCell.m */; };
-		BCA353CF2858A86200377661 /* MusicRoomCourseCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCA353CD2858A86200377661 /* MusicRoomCourseCell.xib */; };
 		BCA353D62858B18100377661 /* Records.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA353D32858B17E00377661 /* Records.m */; };
 		BCA353D72858B18100377661 /* MusicRoomDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA353D42858B18000377661 /* MusicRoomDetailModel.m */; };
 		BCA353D82858B18100377661 /* StudentHomeworkList.m in Sources */ = {isa = PBXBuildFile; fileRef = BCA353D52858B18100377661 /* StudentHomeworkList.m */; };
@@ -953,11 +949,6 @@
 		BCC03F89280460C000461B7C /* InstrumentHeaderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCC03F87280460C000461B7C /* InstrumentHeaderView.xib */; };
 		BCC03F8C280526B300461B7C /* MyStyleVideoChooseView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC03F8B280526B300461B7C /* MyStyleVideoChooseView.m */; };
 		BCC03F8F2805484200461B7C /* StyleVideoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC03F8D2805484200461B7C /* StyleVideoModel.m */; };
-		BCC03F95280562F700461B7C /* MyLessonBodyView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC03F94280562F700461B7C /* MyLessonBodyView.m */; };
-		BCC03F98280567CC00461B7C /* MyLessonSearchView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC03F97280567CC00461B7C /* MyLessonSearchView.m */; };
-		BCC03F9A2805681100461B7C /* MyLessonSearchView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCC03F992805681100461B7C /* MyLessonSearchView.xib */; };
-		BCC03F9E280579A500461B7C /* MyLiveCourseCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC03F9C280579A500461B7C /* MyLiveCourseCell.m */; };
-		BCC03F9F280579A500461B7C /* MyLiveCourseCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCC03F9D280579A500461B7C /* MyLiveCourseCell.xib */; };
 		BCC0F6F32A8CF11700C4EFA4 /* TXClassRoomAlertView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC0F6F02A8CF11700C4EFA4 /* TXClassRoomAlertView.m */; };
 		BCC0F6F42A8CF11700C4EFA4 /* TXClassRoomAlertView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BCC0F6F12A8CF11700C4EFA4 /* TXClassRoomAlertView.xib */; };
 		BCC0F7032A8CF13D00C4EFA4 /* TXDanBottomView.m in Sources */ = {isa = PBXBuildFile; fileRef = BCC0F6F62A8CF13D00C4EFA4 /* TXDanBottomView.m */; };
@@ -1793,11 +1784,6 @@
 		BC1263A928FF98C300509E90 /* HomeRecommendMusicView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeRecommendMusicView.h; sourceTree = "<group>"; };
 		BC1263AC28FF9A0200509E90 /* HomeMusicModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeMusicModel.h; sourceTree = "<group>"; };
 		BC1263AD28FF9A0200509E90 /* HomeMusicModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeMusicModel.m; sourceTree = "<group>"; };
-		BC1365B6280D130C00EB03E2 /* MyVideoCourseBodyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyVideoCourseBodyView.h; sourceTree = "<group>"; };
-		BC1365B7280D130C00EB03E2 /* MyVideoCourseBodyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyVideoCourseBodyView.m; sourceTree = "<group>"; };
-		BC1365B9280D162400EB03E2 /* MyVideoSearchView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyVideoSearchView.h; sourceTree = "<group>"; };
-		BC1365BA280D162400EB03E2 /* MyVideoSearchView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyVideoSearchView.m; sourceTree = "<group>"; };
-		BC1365BC280D163200EB03E2 /* MyVideoSearchView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyVideoSearchView.xib; sourceTree = "<group>"; };
 		BC1365C2280D44EB00EB03E2 /* NotiferMessageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotiferMessageViewController.h; sourceTree = "<group>"; };
 		BC1365C3280D44EB00EB03E2 /* NotiferMessageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NotiferMessageViewController.m; sourceTree = "<group>"; };
 		BC1365C5280D476500EB03E2 /* NotiferMessageCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotiferMessageCell.h; sourceTree = "<group>"; };
@@ -1867,6 +1853,9 @@
 		BC1E284C2C7721890063E0A1 /* KSDeleteFailedAlertView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KSDeleteFailedAlertView.xib; sourceTree = "<group>"; };
 		BC1E284D2C7721890063E0A1 /* KSDeleteFailedAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSDeleteFailedAlertView.h; sourceTree = "<group>"; };
 		BC1E284E2C77218A0063E0A1 /* KSDeleteFailedAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSDeleteFailedAlertView.m; sourceTree = "<group>"; };
+		BC206EDB2CEF2623001F2B85 /* MusicRoomCourseCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicRoomCourseCell.h; sourceTree = "<group>"; };
+		BC206EDC2CEF2623001F2B85 /* MusicRoomCourseCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicRoomCourseCell.m; sourceTree = "<group>"; };
+		BC206EDD2CEF2623001F2B85 /* MusicRoomCourseCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MusicRoomCourseCell.xib; sourceTree = "<group>"; };
 		BC221F9B28C72B9500F99802 /* MyStyleVideoView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyStyleVideoView.h; sourceTree = "<group>"; };
 		BC221F9C28C72B9500F99802 /* MyStyleVideoCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyStyleVideoCell.h; sourceTree = "<group>"; };
 		BC221F9D28C72B9500F99802 /* MyStyleVideoView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MyStyleVideoView.xib; sourceTree = "<group>"; };
@@ -2551,8 +2540,6 @@
 		BC8B6E7828585C2400866917 /* KSUMShareManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KSUMShareManager.m; sourceTree = "<group>"; };
 		BC8B6E82285887A400866917 /* MusicRoomViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicRoomViewController.h; sourceTree = "<group>"; };
 		BC8B6E83285887A400866917 /* MusicRoomViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicRoomViewController.m; sourceTree = "<group>"; };
-		BC8B6E85285888B100866917 /* MyMusicRoomBodyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyMusicRoomBodyView.h; sourceTree = "<group>"; };
-		BC8B6E86285888B100866917 /* MyMusicRoomBodyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyMusicRoomBodyView.m; sourceTree = "<group>"; };
 		BC8C2C622824EB9000FBA5D5 /* NotiferHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NotiferHeadView.h; sourceTree = "<group>"; };
 		BC8C2C632824EB9000FBA5D5 /* NotiferHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NotiferHeadView.m; sourceTree = "<group>"; };
 		BC8C2C652824EB9800FBA5D5 /* NotiferHeadView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NotiferHeadView.xib; sourceTree = "<group>"; };
@@ -2622,9 +2609,6 @@
 		BCA3369B2C942B340074DF75 /* KSSourceDownloadAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KSSourceDownloadAlert.h; sourceTree = "<group>"; };
 		BCA3369C2C942B340074DF75 /* KSSourceDownloadAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = KSSourceDownloadAlert.xib; sourceTree = "<group>"; };
 		BCA3369D2C942B340074DF75 /* KSSourceDownloadAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KSSourceDownloadAlert.m; sourceTree = "<group>"; };
-		BCA353CB2858A86200377661 /* MusicRoomCourseCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MusicRoomCourseCell.h; sourceTree = "<group>"; };
-		BCA353CC2858A86200377661 /* MusicRoomCourseCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MusicRoomCourseCell.m; sourceTree = "<group>"; };
-		BCA353CD2858A86200377661 /* MusicRoomCourseCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MusicRoomCourseCell.xib; sourceTree = "<group>"; };
 		BCA353D02858B17A00377661 /* StudentHomeworkList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StudentHomeworkList.h; sourceTree = "<group>"; };
 		BCA353D12858B17B00377661 /* MusicRoomDetailModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MusicRoomDetailModel.h; sourceTree = "<group>"; };
 		BCA353D22858B17D00377661 /* Records.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Records.h; sourceTree = "<group>"; };
@@ -2772,14 +2756,6 @@
 		BCC03F8B280526B300461B7C /* MyStyleVideoChooseView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyStyleVideoChooseView.m; sourceTree = "<group>"; };
 		BCC03F8D2805484200461B7C /* StyleVideoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StyleVideoModel.m; sourceTree = "<group>"; };
 		BCC03F8E2805484200461B7C /* StyleVideoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleVideoModel.h; sourceTree = "<group>"; };
-		BCC03F93280562F700461B7C /* MyLessonBodyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyLessonBodyView.h; sourceTree = "<group>"; };
-		BCC03F94280562F700461B7C /* MyLessonBodyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyLessonBodyView.m; sourceTree = "<group>"; };
-		BCC03F96280567CC00461B7C /* MyLessonSearchView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyLessonSearchView.h; sourceTree = "<group>"; };
-		BCC03F97280567CC00461B7C /* MyLessonSearchView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyLessonSearchView.m; sourceTree = "<group>"; };
-		BCC03F992805681100461B7C /* MyLessonSearchView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyLessonSearchView.xib; sourceTree = "<group>"; };
-		BCC03F9B280579A500461B7C /* MyLiveCourseCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyLiveCourseCell.h; sourceTree = "<group>"; };
-		BCC03F9C280579A500461B7C /* MyLiveCourseCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyLiveCourseCell.m; sourceTree = "<group>"; };
-		BCC03F9D280579A500461B7C /* MyLiveCourseCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyLiveCourseCell.xib; sourceTree = "<group>"; };
 		BCC0F6F02A8CF11700C4EFA4 /* TXClassRoomAlertView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TXClassRoomAlertView.m; sourceTree = "<group>"; };
 		BCC0F6F12A8CF11700C4EFA4 /* TXClassRoomAlertView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TXClassRoomAlertView.xib; sourceTree = "<group>"; };
 		BCC0F6F22A8CF11700C4EFA4 /* TXClassRoomAlertView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TXClassRoomAlertView.h; sourceTree = "<group>"; };
@@ -4596,24 +4572,6 @@
 				BCD160522CED841000A78B43 /* VideoCourseGroup */,
 				BCD160542CED844000A78B43 /* MusicRoomCourseGroup */,
 				BCDB09382805C0DD00D0BDAD /* PopView */,
-				BCC03F93280562F700461B7C /* MyLessonBodyView.h */,
-				BCC03F94280562F700461B7C /* MyLessonBodyView.m */,
-				BCC03F96280567CC00461B7C /* MyLessonSearchView.h */,
-				BCC03F97280567CC00461B7C /* MyLessonSearchView.m */,
-				BCC03F992805681100461B7C /* MyLessonSearchView.xib */,
-				BCC03F9B280579A500461B7C /* MyLiveCourseCell.h */,
-				BCC03F9C280579A500461B7C /* MyLiveCourseCell.m */,
-				BCC03F9D280579A500461B7C /* MyLiveCourseCell.xib */,
-				BC1365B6280D130C00EB03E2 /* MyVideoCourseBodyView.h */,
-				BC1365B7280D130C00EB03E2 /* MyVideoCourseBodyView.m */,
-				BC1365B9280D162400EB03E2 /* MyVideoSearchView.h */,
-				BC1365BA280D162400EB03E2 /* MyVideoSearchView.m */,
-				BC1365BC280D163200EB03E2 /* MyVideoSearchView.xib */,
-				BC8B6E85285888B100866917 /* MyMusicRoomBodyView.h */,
-				BC8B6E86285888B100866917 /* MyMusicRoomBodyView.m */,
-				BCA353CB2858A86200377661 /* MusicRoomCourseCell.h */,
-				BCA353CC2858A86200377661 /* MusicRoomCourseCell.m */,
-				BCA353CD2858A86200377661 /* MusicRoomCourseCell.xib */,
 				BCD160672CED86FB00A78B43 /* MyCourseGroupNavView.h */,
 				BCD160682CED86FB00A78B43 /* MyCourseGroupNavView.m */,
 				BCD1606A2CED870700A78B43 /* MyCourseGroupNavView.xib */,
@@ -7430,6 +7388,9 @@
 		BCDB09382805C0DD00D0BDAD /* PopView */ = {
 			isa = PBXGroup;
 			children = (
+				BC206EDB2CEF2623001F2B85 /* MusicRoomCourseCell.h */,
+				BC206EDC2CEF2623001F2B85 /* MusicRoomCourseCell.m */,
+				BC206EDD2CEF2623001F2B85 /* MusicRoomCourseCell.xib */,
 				BCDB093C2805C0EE00D0BDAD /* NewClassPopCell.h */,
 				BCDB093A2805C0ED00D0BDAD /* NewClassPopCell.m */,
 				BCDB093B2805C0EE00D0BDAD /* NewClassPopCell.xib */,
@@ -7874,7 +7835,6 @@
 				BC71D1FD2887FDD40010F14B /* img_31.png in Resources */,
 				277931CE27E30FC20010E277 /* KSPremissionAlert.xib in Resources */,
 				BC4058942863028C00111BC5 /* NotiferNavView.xib in Resources */,
-				BCA353CF2858A86200377661 /* MusicRoomCourseCell.xib in Resources */,
 				275E3DFC27F46B440010EC30 /* KSBeautySettingView.xib in Resources */,
 				BC38C48B2AFA207B00ABFCC2 /* KSEmptyStatusView.xib in Resources */,
 				BC48C3B5282931C000EE65C5 /* ReceiveEvaluateCell.xib in Resources */,
@@ -7893,7 +7853,6 @@
 				BC4218022C4E43A100C70B2F /* KSUserDetailNavView.xib in Resources */,
 				BCEA752D2819134400886A86 /* CardBindResultBodyView.xib in Resources */,
 				BC42180C2C4E474500C70B2F /* KSUserDetailBodyView.xib in Resources */,
-				BC1365BD280D163200EB03E2 /* MyVideoSearchView.xib in Resources */,
 				BC14A61428A0AC880086395C /* MineTeachToolView.xib in Resources */,
 				BC56C96729235C0500AF301F /* CoursewareNavView.xib in Resources */,
 				BC02BCEC28B324FE005CB483 /* LiveMemberSeatCell.xib in Resources */,
@@ -7981,6 +7940,7 @@
 				BCF425EA2AB96BE400BCD942 /* HomeTenantView.xib in Resources */,
 				BCA353E52859797500377661 /* MusicRoomStudentCell.xib in Resources */,
 				BCECE2162B3D5F0800C0D555 /* FeedbackNavView.xib in Resources */,
+				BC206EDF2CEF2623001F2B85 /* MusicRoomCourseCell.xib in Resources */,
 				BCECE21B2B3D5F0800C0D555 /* FeedbackListCell.xib in Resources */,
 				BC31BF952B219C5700F7D538 /* ToneTuningBodyView.xib in Resources */,
 				BC58E7DF281B96A4004B0893 /* MinePageTopView.xib in Resources */,
@@ -8115,9 +8075,7 @@
 				BCC5841628A9FA9D00BAB4CF /* AccompanyLoadingView.xib in Resources */,
 				BC2456EA286BEF8000D1F7C0 /* MineEmptyGroupCell.xib in Resources */,
 				BC71DEFA2A89F470003F165E /* TxClassroomChatMineCell.xib in Resources */,
-				BCC03F9A2805681100461B7C /* MyLessonSearchView.xib in Resources */,
 				BCC5840B28A9FA8100BAB4CF /* cloud_animation_7.png in Resources */,
-				BCC03F9F280579A500461B7C /* MyLiveCourseCell.xib in Resources */,
 				BCC583FF28A9FA8100BAB4CF /* cloud_animation_18.png in Resources */,
 				BCAF36F02CEAE3EF009434AD /* FansGroupAlertView.xib in Resources */,
 				BCC583F628A9FA8100BAB4CF /* cloud_animation_20.png in Resources */,
@@ -8355,6 +8313,7 @@
 				BC12638D28FEB5E600509E90 /* RecentPracticeModel.m in Sources */,
 				27BC3B2927F2DB8600D81E30 /* MusicUploadView.m in Sources */,
 				BC285833280947BA0024697C /* EvaluateSortView.m in Sources */,
+				BC206EDE2CEF2623001F2B85 /* MusicRoomCourseCell.m in Sources */,
 				BC32E109286AB142001434DD /* BaseAlertView.m in Sources */,
 				BCD6D16528195A91009A773E /* WithdrawApplyBodyView.m in Sources */,
 				27A54CE427E9B144007309A3 /* ModifyNameViewController.m in Sources */,
@@ -8435,7 +8394,6 @@
 				BCECE2132B3D5F0800C0D555 /* FeedbackViewController.m in Sources */,
 				BC14E46E2AB2A16A000C4983 /* HomeTenantPageView.m in Sources */,
 				BC106BAD2A8F45AA000759A9 /* TXLiveRoomHeadView.m in Sources */,
-				BCA353CE2858A86200377661 /* MusicRoomCourseCell.m in Sources */,
 				BCA9CE4327FD947C00D558C6 /* AccompanyArrangeCell.m in Sources */,
 				2779360F27E32BF20010E277 /* HomeViewController.m in Sources */,
 				27A2F62927E6C996009E2380 /* KSImageAlert.m in Sources */,
@@ -8483,9 +8441,7 @@
 				2779361B27E32C3A0010E277 /* MineViewController.m in Sources */,
 				BCF7EB342C856C53006AA38C /* ScanLoginBodyView.m in Sources */,
 				BC2888652A8100EA0064B773 /* KSConversationListController.m in Sources */,
-				BCC03F95280562F700461B7C /* MyLessonBodyView.m in Sources */,
 				BCE6A09027F823BE00C97704 /* LiveCourseCell.m in Sources */,
-				BCC03F98280567CC00461B7C /* MyLessonSearchView.m in Sources */,
 				BCA9CE5027FD954800D558C6 /* AccompanyRemarkCell.m in Sources */,
 				BCDE359B289BC02200A9A560 /* HomeHotAlbumCell.m in Sources */,
 				BC106B712A8F4586000759A9 /* TXLiveUser.m in Sources */,
@@ -8565,7 +8521,6 @@
 				BCDE3591289A7E4900A9A560 /* KSGroupTagImageView.m in Sources */,
 				27D83F5127F4036E00062476 /* KSNormalAlertView.m in Sources */,
 				BCED5CB4285083AC009A42DE /* ShareMusicViewController.m in Sources */,
-				BC1365B8280D130C00EB03E2 /* MyVideoCourseBodyView.m in Sources */,
 				BCF425E82AB96BDE00BCD942 /* HomeTenantView.m in Sources */,
 				BCDF82042A8A2919005F8B82 /* ClassMemberSettingHeadView.m in Sources */,
 				BCB9FA40286DA337005D766B /* GuideViewController.m in Sources */,
@@ -8799,7 +8754,6 @@
 				BCA9CE1527FD339400D558C6 /* AuthDisplayView.m in Sources */,
 				BCC408CD2AFCE0B700C60249 /* KSVideoCropViewController.m in Sources */,
 				BC38C4822AFA1F4B00ABFCC2 /* MineWorksNavView.m in Sources */,
-				BC1365BB280D162400EB03E2 /* MyVideoSearchView.m in Sources */,
 				27A54CF427E9BD53007309A3 /* AboutUsViewController.m in Sources */,
 				277931E627E30FC20010E277 /* UITextView+ZWLimitCounter.m in Sources */,
 				275E3DEC27F467B20010EC30 /* LiveRoomBottomView.m in Sources */,
@@ -9027,7 +8981,6 @@
 				BCE6A09527F823DC00C97704 /* MinePageMusicCell.m in Sources */,
 				BC56C97829238D6300AF301F /* CoursewareListModel.m in Sources */,
 				27D83F3F27F3EA8A00062476 /* MinePageCourseView.m in Sources */,
-				BC8B6E87285888B100866917 /* MyMusicRoomBodyView.m in Sources */,
 				2779331D27E311A10010E277 /* KSNetworkingManager.m in Sources */,
 				BC1263AE28FF9A0300509E90 /* HomeMusicModel.m in Sources */,
 				BCDE3594289B960100A9A560 /* HomeAlbumView.m in Sources */,
@@ -9048,7 +9001,6 @@
 				275E3DE427F467410010EC30 /* KSChatInputBarControl.m in Sources */,
 				BC71DF102A89F470003F165E /* KSMetronomeControlView.m in Sources */,
 				BC38C48C2AFA207B00ABFCC2 /* KSEmptyStatusView.m in Sources */,
-				BCC03F9E280579A500461B7C /* MyLiveCourseCell.m in Sources */,
 				27D5D5D527EDBCB900B4720C /* GroupNoticeModel.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

+ 11 - 14
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/AccompanyCourseGroup/MyAccompanyCourseGroupView.m

@@ -317,21 +317,18 @@
 
 - (void)sortActionWithType:(MY_COURSE_SORTTYPE)type status:(NSString *)status subjectId:(NSString *)subjectId statusChooseIndex:(NSInteger)statusChooseIndex subjectChooseIndex:(NSInteger)subjectChooseIndex  {
     self.searchView.arrowUp = NO;
-    if (type == MY_COURSE_SORTTYPE_HIDE) {
-        self.searchView.arrowUp = NO;
-        if (type == MY_COURSE_SORTTYPE_SORT) {
-            self.statusChooseIndex = statusChooseIndex;
-            self.subjectChooseIndex = subjectChooseIndex;
-            self.status = status;
-            self.subjectId = subjectId;
-            if ([NSString isEmptyString:status]) {
-                self.status = nil;
-            }
-            if ([NSString isEmptyString:subjectId]) {
-                self.subjectId = nil;
-            }
-            [self refreshAndRequestData];
+    if (type == MY_COURSE_SORTTYPE_SORT) {
+        self.statusChooseIndex = statusChooseIndex;
+        self.subjectChooseIndex = subjectChooseIndex;
+        self.status = status;
+        self.subjectId = subjectId;
+        if ([NSString isEmptyString:status]) {
+            self.status = nil;
+        }
+        if ([NSString isEmptyString:subjectId]) {
+            self.subjectId = nil;
         }
+        [self refreshAndRequestData];
     }
 }
 

+ 10 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/LiveCourseGroup/MyLiveCourseGroupListCell.m

@@ -12,6 +12,8 @@
 
 @property (weak, nonatomic) IBOutlet UILabel *courseStatus;
 
+@property (weak, nonatomic) IBOutlet UILabel *courseTime;
+
 @property (weak, nonatomic) IBOutlet UIImageView *courseCover;
 
 @property (weak, nonatomic) IBOutlet UILabel *courseSubject;
@@ -35,6 +37,14 @@
 
 - (void)configWithSource:(LiveLessonModel *)model {
     [self evaluateGroupStatus:model.status];
+    // time
+    NSDateFormatter *formatter = [NSObject getDateformatter];
+    [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+    NSDate *startDate = [formatter dateFromString:model.startTime];
+    [formatter setDateFormat:@"yyyy-MM-dd HH:mm"];
+    NSString *courseBegin = [formatter stringFromDate:startDate];
+    self.courseTime.text = [NSString returnNoNullStringWithString:courseBegin];
+    
     [self.courseCover sd_setImageWithURL:[NSURL URLWithString:[model.backgroundPic getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
     self.courseSubject.text = [NSString returnNoNullStringWithString:model.subjectName];
     self.courseTitle.text = [NSString returnNoNullStringWithString:model.courseGroupName];

+ 48 - 30
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/LiveCourseGroup/MyLiveCourseGroupListCell.xib

@@ -11,29 +11,24 @@
         <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="MyLiveCourseGroupListCell">
-            <rect key="frame" x="0.0" y="0.0" width="291" height="298"/>
+            <rect key="frame" x="0.0" y="0.0" width="277" height="347"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                <rect key="frame" x="0.0" y="0.0" width="291" height="298"/>
+                <rect key="frame" x="0.0" y="0.0" width="277" height="347"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xJj-eX-YDa">
-                        <rect key="frame" x="0.0" y="0.0" width="291" height="298"/>
+                        <rect key="frame" x="0.0" y="0.0" width="277" height="347"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_courseGroup_icon" translatesAutoresizingMaskIntoConstraints="NO" id="AUA-6F-MXS">
-                                <rect key="frame" x="12" y="16" width="16" height="14"/>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="课程状态" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HT9-iE-aoN">
-                                <rect key="frame" x="36" y="13" width="55.666666666666657" height="20"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" image="mine_page_live_tag" translatesAutoresizingMaskIntoConstraints="NO" id="AUA-6F-MXS">
+                                <rect key="frame" x="12" y="15" width="20" height="16"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="20" id="X1q-B1-232"/>
+                                    <constraint firstAttribute="height" constant="16" id="Q24-w6-KDC"/>
+                                    <constraint firstAttribute="width" constant="20" id="YQF-hU-pNP"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
-                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <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="8nr-OW-hsO">
-                                <rect key="frame" x="237" y="13" width="42" height="20"/>
+                            </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="已开课" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8nr-OW-hsO">
+                                <rect key="frame" x="223" y="13" width="42" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="pzy-qh-z2B"/>
                                 </constraints>
@@ -42,7 +37,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="video_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="gJz-ge-yei">
-                                <rect key="frame" x="12" y="45" width="267" height="150.33333333333334"/>
+                                <rect key="frame" x="12" y="46" width="253" height="142.33333333333334"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="gJz-ge-yei" secondAttribute="height" multiplier="16:9" id="LzS-SI-uJM"/>
                                 </constraints>
@@ -53,7 +48,7 @@
                                 </userDefinedRuntimeAttributes>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7YS-Lc-hvS">
-                                <rect key="frame" x="20" y="53" width="36" height="19"/>
+                                <rect key="frame" x="20" y="54" width="36" height="19"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="K2S-UG-2xD">
                                         <rect key="frame" x="6" y="3.0000000000000009" width="24" height="13.333333333333336"/>
@@ -76,7 +71,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="从零开始学竖笛直播课" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UwF-HP-7VM">
-                                <rect key="frame" x="12" y="203.33333333333334" width="267" height="22"/>
+                                <rect key="frame" x="12" y="196.33333333333334" width="253" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="mec-OG-ov4"/>
                                 </constraints>
@@ -85,7 +80,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="2hL-aY-XV2">
-                                <rect key="frame" x="12" y="229.33333333333334" width="267" height="20"/>
+                                <rect key="frame" x="12" y="222.33333333333334" width="253" height="20"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="20" id="1yp-t1-vx3"/>
                                 </constraints>
@@ -94,7 +89,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0ga-Xp-k5f">
-                                <rect key="frame" x="12" y="265" width="65" height="19"/>
+                                <rect key="frame" x="12" y="314" width="65" height="19"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人已购买" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Tu-az-bug">
                                         <rect key="frame" x="4" y="2.3333333333333153" width="57" height="14.333333333333336"/>
@@ -117,14 +112,32 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="已上课时 4 /总课时 6" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9sU-yS-7be">
-                                <rect key="frame" x="146.66666666666663" y="265" width="132.33333333333337" height="19"/>
+                                <rect key="frame" x="132.66666666666663" y="314" width="132.33333333333337" height="19"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="arrange_course_icon" translatesAutoresizingMaskIntoConstraints="NO" id="iiI-K9-fO1">
-                                <rect key="frame" x="132.66666666666666" y="267.66666666666669" width="12" height="14"/>
+                                <rect key="frame" x="118.66666666666667" y="316.66666666666669" width="12.000000000000014" height="14"/>
                             </imageView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="752" text="开课时间:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="80p-dX-TfO">
+                                <rect key="frame" x="39" y="13" width="62.666666666666657" height="20"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="20" id="YXu-A7-8Le"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
+                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="749" text="2024-11-16 09:30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Erw-V1-YaB">
+                                <rect key="frame" x="101.66666666666669" y="13" width="111.33333333333331" height="20"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="20" id="wGf-c3-p4r"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
+                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
@@ -132,28 +145,32 @@
                             <constraint firstAttribute="trailing" secondItem="8nr-OW-hsO" secondAttribute="trailing" constant="12" id="8TP-Md-KQH"/>
                             <constraint firstItem="2hL-aY-XV2" firstAttribute="top" secondItem="UwF-HP-7VM" secondAttribute="bottom" constant="4" id="A21-Y9-bAb"/>
                             <constraint firstItem="9sU-yS-7be" firstAttribute="leading" secondItem="iiI-K9-fO1" secondAttribute="trailing" constant="2" id="ARq-CK-t43"/>
-                            <constraint firstItem="HT9-iE-aoN" firstAttribute="leading" secondItem="AUA-6F-MXS" secondAttribute="trailing" constant="8" id="AoK-S7-ldP"/>
-                            <constraint firstItem="HT9-iE-aoN" firstAttribute="centerY" secondItem="AUA-6F-MXS" secondAttribute="centerY" id="BXT-gy-mMP"/>
                             <constraint firstItem="9sU-yS-7be" firstAttribute="centerY" secondItem="0ga-Xp-k5f" secondAttribute="centerY" id="EU1-Ph-UVy"/>
+                            <constraint firstItem="8nr-OW-hsO" firstAttribute="centerY" secondItem="Erw-V1-YaB" secondAttribute="centerY" id="FNS-k4-sdX"/>
                             <constraint firstItem="UwF-HP-7VM" firstAttribute="leading" secondItem="xJj-eX-YDa" secondAttribute="leading" constant="12" id="Jxb-8y-cp8"/>
                             <constraint firstAttribute="trailing" secondItem="9sU-yS-7be" secondAttribute="trailing" constant="12" id="L4i-wF-Re6"/>
                             <constraint firstItem="gJz-ge-yei" firstAttribute="top" secondItem="AUA-6F-MXS" secondAttribute="bottom" constant="15" id="LSH-OU-dCc"/>
                             <constraint firstAttribute="trailing" secondItem="2hL-aY-XV2" secondAttribute="trailing" constant="12" id="TPk-MW-c6u"/>
                             <constraint firstItem="gJz-ge-yei" firstAttribute="leading" secondItem="xJj-eX-YDa" secondAttribute="leading" constant="12" id="Tab-w6-EMA"/>
+                            <constraint firstItem="Erw-V1-YaB" firstAttribute="centerY" secondItem="AUA-6F-MXS" secondAttribute="centerY" id="VJ0-ON-udH"/>
+                            <constraint firstItem="Erw-V1-YaB" firstAttribute="leading" secondItem="80p-dX-TfO" secondAttribute="trailing" id="VJg-Sr-bvJ"/>
                             <constraint firstAttribute="bottom" secondItem="9sU-yS-7be" secondAttribute="bottom" constant="14" id="XcT-n7-xFg"/>
-                            <constraint firstItem="8nr-OW-hsO" firstAttribute="centerY" secondItem="HT9-iE-aoN" secondAttribute="centerY" id="Xv7-n8-APu"/>
                             <constraint firstItem="7YS-Lc-hvS" firstAttribute="top" secondItem="gJz-ge-yei" secondAttribute="top" constant="8" id="ZJz-b9-4Z5"/>
-                            <constraint firstItem="8nr-OW-hsO" firstAttribute="centerY" secondItem="HT9-iE-aoN" secondAttribute="centerY" id="ZfT-Al-5ON"/>
                             <constraint firstItem="7YS-Lc-hvS" firstAttribute="leading" secondItem="gJz-ge-yei" secondAttribute="leading" constant="8" id="Zms-fW-utt"/>
                             <constraint firstAttribute="trailing" secondItem="gJz-ge-yei" secondAttribute="trailing" constant="12" id="bx1-H0-mEf"/>
                             <constraint firstAttribute="bottom" secondItem="0ga-Xp-k5f" secondAttribute="bottom" constant="14" id="d2m-Jn-vFG"/>
+                            <constraint firstItem="Erw-V1-YaB" firstAttribute="centerY" secondItem="80p-dX-TfO" secondAttribute="centerY" id="frC-9a-09X"/>
                             <constraint firstItem="0ga-Xp-k5f" firstAttribute="top" relation="greaterThanOrEqual" secondItem="2hL-aY-XV2" secondAttribute="bottom" constant="8" id="gWa-yc-b28"/>
                             <constraint firstItem="UwF-HP-7VM" firstAttribute="top" secondItem="gJz-ge-yei" secondAttribute="bottom" constant="8" id="ign-tx-78w"/>
                             <constraint firstItem="0ga-Xp-k5f" firstAttribute="leading" secondItem="xJj-eX-YDa" secondAttribute="leading" constant="12" id="oTi-kR-hiS"/>
+                            <constraint firstItem="Erw-V1-YaB" firstAttribute="centerY" secondItem="80p-dX-TfO" secondAttribute="centerY" id="qla-3N-95K"/>
+                            <constraint firstItem="80p-dX-TfO" firstAttribute="leading" secondItem="AUA-6F-MXS" secondAttribute="trailing" constant="7" id="stl-6Q-jnH"/>
                             <constraint firstItem="AUA-6F-MXS" firstAttribute="leading" secondItem="xJj-eX-YDa" secondAttribute="leading" constant="12" id="tiQ-ev-GVh"/>
-                            <constraint firstItem="AUA-6F-MXS" firstAttribute="top" secondItem="xJj-eX-YDa" secondAttribute="top" constant="16" id="uyB-TJ-90N"/>
+                            <constraint firstItem="AUA-6F-MXS" firstAttribute="top" secondItem="xJj-eX-YDa" secondAttribute="top" constant="15" id="uyB-TJ-90N"/>
                             <constraint firstAttribute="trailing" secondItem="UwF-HP-7VM" secondAttribute="trailing" constant="12" id="vcj-Ub-YSw"/>
+                            <constraint firstItem="8nr-OW-hsO" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Erw-V1-YaB" secondAttribute="trailing" constant="10" id="wHo-Hj-RZX"/>
                             <constraint firstItem="iiI-K9-fO1" firstAttribute="centerY" secondItem="0ga-Xp-k5f" secondAttribute="centerY" id="yEh-Jh-3xh"/>
+                            <constraint firstItem="80p-dX-TfO" firstAttribute="centerY" secondItem="AUA-6F-MXS" secondAttribute="centerY" id="yJc-jc-rXM"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -170,22 +187,23 @@
                 <constraint firstItem="xJj-eX-YDa" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="tYg-hx-rEf"/>
                 <constraint firstAttribute="bottom" secondItem="xJj-eX-YDa" secondAttribute="bottom" id="xP1-4D-31W"/>
             </constraints>
-            <size key="customSize" width="291" height="298"/>
+            <size key="customSize" width="277" height="347"/>
             <connections>
                 <outlet property="bookDesc" destination="7Tu-az-bug" id="YQC-wH-7UJ"/>
                 <outlet property="courseCover" destination="gJz-ge-yei" id="Z0x-gZ-31s"/>
                 <outlet property="courseDesc" destination="2hL-aY-XV2" id="XSy-3v-1GF"/>
                 <outlet property="courseStatus" destination="8nr-OW-hsO" id="FD1-lo-pGc"/>
                 <outlet property="courseSubject" destination="K2S-UG-2xD" id="wQv-N0-1Gn"/>
+                <outlet property="courseTime" destination="Erw-V1-YaB" id="Bfa-at-etw"/>
                 <outlet property="courseTitle" destination="UwF-HP-7VM" id="w83-3a-9Ke"/>
                 <outlet property="finishDesc" destination="9sU-yS-7be" id="7Ee-v0-TRQ"/>
             </connections>
-            <point key="canvasLocation" x="214.50381679389312" y="80.281690140845072"/>
+            <point key="canvasLocation" x="228.24427480916029" y="95.422535211267615"/>
         </collectionViewCell>
     </objects>
     <resources>
         <image name="arrange_course_icon" width="12" height="14"/>
-        <image name="live_courseGroup_icon" width="16" height="14"/>
+        <image name="mine_page_live_tag" width="20" height="16"/>
         <image name="video_placeholder" width="103" height="72"/>
     </resources>
 </document>

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyCourseSortView/MyCourseRankSortView.m

@@ -274,7 +274,7 @@
     button.tag = tag;
     button.titleEdgeInsets = UIEdgeInsetsMake(0, 5, 0, 5);
     [button setTitle:buttonTitle forState:UIControlStateNormal];
-    [button.titleLabel setFont:[UIFont systemFontOfSize:12.0f weight:UIFontWeightRegular]];
+    [button.titleLabel setFont:[UIFont systemFontOfSize:13.0f weight:UIFontWeightRegular]];
     button.titleLabel.lineBreakMode = NSLineBreakByTruncatingMiddle;
     [button setTitleColor:HexRGB(0x999999) forState:UIControlStateNormal];
     [button addTarget:self action:@selector(buttonClickAction:) forControlEvents:UIControlEventTouchUpInside];

+ 1 - 1
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyCourseSortView/MyCourseSearchView.xib

@@ -11,7 +11,7 @@
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MyCourseSearchView">
             <rect key="frame" x="0.0" y="0.0" width="393" height="64"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+            <autoresizingMask key="autoresizingMask"/>
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ypg-l8-Rgd">
                     <rect key="frame" x="14" y="12" width="41" height="34"/>

+ 0 - 25
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.h

@@ -1,25 +0,0 @@
-//
-//  MyLessonBodyView.h
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/4/12.
-//
-
-#import <KSJXBodyView.h>
-#import "StateView.h"
-#import "Reachability.h"
-
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MyLessonBodyView : KSJXBodyView
-
-@property (nonatomic, strong) NSString *teaherStatus;
-
-@property (nonatomic, assign) BOOL liveFlag; // 是否有直播权限
-
-@property (nonatomic, strong) NSMutableArray *subjectList;
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 721
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonBodyView.m

@@ -1,721 +0,0 @@
-//
-//  MyLessonBodyView.m
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/4/12.
-//
-
-#import "MyLessonBodyView.h"
-#import "KSBaseWKWebViewController.h"
-#import "AuthDisplayView.h"
-#import "MyLiveCourseCell.h"
-#import "AccompanyCourseCell.h"
-#import "LiveLessonModel.h"
-#import "AccompanyLessonModel.h"
-#import "KSChatConversationViewController.h"
-#import "KSGroupConversationController.h"
-
-#import "MyLessonSearchView.h"
-#import "NewClassPopView.h"
-#import <KSFullDatePicker.h>
-#import "AccompanyDetailViewController.h"
-#import <KSChoosePicker.h>
-
-@interface MyLessonBodyView ()<UITableViewDelegate,UITableViewDataSource>
-
-@property (nonatomic, strong) NSDateFormatter *dateFormatter;
-
-@property (nonatomic, copy) MyLessonSearchView *sortView;
-
-@property (nonatomic, strong) NewClassPopView *popView;
-
-@property (nonatomic, strong) NSMutableArray *dataArray;
-
-@property (nonatomic, strong) StateView *promptView;
-@property (nonatomic, strong) UIView *promptPlaceView;
-
-@property (nonatomic, assign) BOOL networkAvaiable; // 网络是否可用
-
-@property (nonatomic, assign) BOOL isLoadMore;
-@property (nonatomic, assign) NSInteger rows;
-@property (nonatomic, assign) NSInteger pages;
-
-@property (nonatomic, strong) AuthDisplayView *authView;
-
-@property (nonatomic, assign) NSInteger secondChooseIndex;
-
-@property (nonatomic, assign) NSInteger thirdChooseIndex;
-
-@property (nonatomic, strong) NSString *classDate;
-
-@property (nonatomic, strong) NSString *status;
-
-@property (nonatomic, strong) NSString *subjectId;
-
-@property (nonatomic, strong) NSMutableArray *subjectMessageArray;
-
-@property (nonatomic, assign) BOOL teacherAuthPass;  // 是否通过老师审核
-
-@end
-
-@implementation MyLessonBodyView
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        
-        self.backgroundColor = HexRGB(0xf8f9fc);
-        self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, frame.size.width, frame.size.height) style:UITableViewStylePlain];
-        self.tableView.backgroundColor = HexRGB(0xf8f9fc);
-        self.tableView.showsVerticalScrollIndicator = NO;
-
-        self.tableView.dataSource = self;
-        self.tableView.delegate = self;
-        self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-        [self addSubview:self.tableView];
-        
-        
-        UIView *headView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
-        headView.backgroundColor = HexRGB(0xf8f9fc);
-        self.tableView.tableHeaderView = headView;
-        
-        UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
-        bottomView.backgroundColor = HexRGB(0xf8f9fc);
-        self.tableView.tableFooterView = bottomView;
-        [self.tableView registerNib:[UINib nibWithNibName:@"AccompanyCourseCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"AccompanyCourseCell"];
-        [self.tableView registerNib:[UINib nibWithNibName:@"MyLiveCourseCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"MyLiveCourseCell"];
-        
-        [self.dateFormatter setDateFormat:@"yyyy-MM"];
-        NSDate *currentDate = [NSDate date];
-        self.classDate = [self.dateFormatter stringFromDate:currentDate];
-        MJWeakSelf;
-        self.tableView.mj_header = [KSGifRefreshHeader headerWithRefreshingBlock:^{
-            [weakSelf resetParamenter];
-            [weakSelf requestData];
-        }];
-        self.tableView.mj_footer = [KSGifRefreshFooter footerWithRefreshingBlock:^{
-            if (weakSelf.isLoadMore) {
-                weakSelf.pages += 1;
-                [weakSelf requestData];
-            }
-            else {
-                [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
-            }
-        }];
-    }
-    return self;
-}
-
-- (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
-}
-
-- (void)refreshAndRequestData {
-    [self resetParamenter];
-    [self requestData];
-}
-
-- (void)resetParamenter {
-    self.isLoadMore = YES;
-    self.pages = 1;
-    self.rows = 10;
-    
-    self.dataArray = [NSMutableArray array];
-    [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无课程" imageName:@"empty_course" inView:self.tableView];
-    [self.tableView reloadData];
-}
-
-- (void)requestData {
-    if (self.selectIndex == 0) { // 陪练课
-        [KSNetworkingManager accompanyCourseRequest:KS_POST classMonth:self.classDate status:self.status subjectId:self.subjectId page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-            [self endRefresh];
-            if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-                NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
-                for (NSDictionary *parm in sourceArray) {
-                    AccompanyLessonModel *model = [[AccompanyLessonModel alloc] initWithDictionary:parm];
-                    [self.dataArray addObject:model];
-                }
-                
-                if (sourceArray.count < self.rows) {
-                    self.isLoadMore = NO;
-                }
-            }
-            else {
-                [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
-            }
-            [self.tableView reloadData];
-            [self changePromptLabelStateWithArray:self.dataArray];
-        } faliure:^(NSError * _Nonnull error) {
-            [self endRefresh];
-            if (self.networkAvaiable == NO) {
-                [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
-            }
-            [self.dataArray removeAllObjects];
-            [self.tableView reloadData];
-            [self changePromptLabelStateWithArray:self.dataArray];
-        }];
-    }
-    else { // 直播课
-        [KSNetworkingManager queryTeacherLiveCourse:KS_POST classDate:self.classDate status:self.status subjectId:self.subjectId page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-            [self endRefresh];
-            if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-                NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
-                for (NSDictionary *parm in sourceArray) {
-                    LiveLessonModel *model = [[LiveLessonModel alloc] initWithDictionary:parm];
-                    [self.dataArray addObject:model];
-                }
-                
-                if (sourceArray.count < self.rows) {
-                    self.isLoadMore = NO;
-                }
-            }
-            else {
-                [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
-            }
-            [self.tableView reloadData];
-            [self changePromptLabelStateWithArray:self.dataArray];
-        } faliure:^(NSError * _Nonnull error) {
-            [self endRefresh];
-            if (self.networkAvaiable == NO) {
-                [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
-            }
-            [self.dataArray removeAllObjects];
-            [self.tableView reloadData];
-            [self changePromptLabelStateWithArray:self.dataArray];
-        }];
-    }
-}
-
-- (void)beginRefreshImmediately {
-    [self.tableView.mj_header beginRefreshing];
-}
-
-- (void)beginFirstRefresh {
-    if (!self.isHeaderRefreshed) {
-        [self beginRefreshImmediately];
-    }
-}
-- (void)selectCellAtIndexPath:(NSIndexPath *)indexPath {
-    
-    if (self.lastSelectedIndexPath == indexPath) {
-        return;
-    }
-    if (self.lastSelectedIndexPath != nil) {
-        UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:self.lastSelectedIndexPath];
-        [cell setSelected:NO animated:NO];
-    }
-    UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
-    [cell setSelected:YES animated:NO];
-    self.lastSelectedIndexPath = indexPath;
-}
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    self.tableView.frame = self.bounds;
-    CGFloat topHeight = 55.0f;
-    self.tableView.frame = CGRectMake(0, topHeight, self.bounds.size.width, self.bounds.size.height - topHeight);
-    if (!_sortView) {
-        _sortView = [MyLessonSearchView shareInstance];
-        _sortView.frame = CGRectMake(0, 0, kScreenWidth, 55);
-        MJWeakSelf;
-        [_sortView sortAction:^(SORT_TYPE type) {
-            [weakSelf sortWithType:type];
-        }];
-        [self.dateFormatter setDateFormat:@"yyyy年M月"];
-        NSDate *currentDate = [NSDate date];
-        [self.sortView.firstButton setTitle:[self.dateFormatter stringFromDate:currentDate] forState:UIControlStateNormal];
-        [self addSubview:self.sortView];
-    }
-    if (self.teacherAuthPass == NO) {
-        [self showAuthView];
-    }
-    else {
-        [self hideAuthView];
-    }
-}
-
-- (void)sortWithType:(SORT_TYPE)type {
-    
-    if (type == SORT_TYPE_TIME) { // time
-        [self showPickerView];
-    }
-    else if (type == SORT_TYPE_STATUS) { // 状态
-        [self.popView refreshWithSourceArray:@[@"全部",@"未开始",@"进行中",@"已结束"] preChooseIndex:_secondChooseIndex inView:self actionItem:1];
-    }
-    else if (type == SORT_TYPE_SUBJECT) {
-        if (self.subjectList.count) {
-            NSMutableArray *nameArray = [NSMutableArray array];
-            [nameArray addObject:@"全部"];
-            for (NSDictionary *parm in self.subjectList) {
-                [nameArray addObject:[parm ks_stringValueForKey:@"subjectName"]];
-            }
-            MJWeakSelf;
-            KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"声部筛选" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
-                if (chooseIndex == 0) {
-                    [weakSelf.sortView.thirdButton setTitle:@"全部声部" forState:UIControlStateNormal];
-                    weakSelf.subjectId = nil;
-                }
-                else {
-                    [weakSelf.sortView.thirdButton setTitle:returnValue forState:UIControlStateNormal];
-                    NSDictionary *parm = self.subjectList[chooseIndex-1];
-                    weakSelf.subjectId = [parm ks_stringValueForKey:@"subjectId"];
-                }
-                self.sortView.thirdArrowUp = NO;
-                [weakSelf refreshAndRequestData];
-            } cancel:^{
-                self.sortView.thirdArrowUp = NO;
-            }];
-            [picker showPicker];
-        }
-        else {
-            [LOADING_MANAGER MBShowAUTOHidingInWindow:@"无声部信息"];
-            self.sortView.thirdArrowUp = NO;
-        }
-
-    }
-    else {
-        [self hiddenPopView];
-    }
-}
-
-- (void)showPickerView {
-    KSFullDatePicker *picker = [[KSFullDatePicker alloc] initWithTitle:@"" date:[NSDate date] pickMode:KSDATEPICKER_MODE_YEAR_MONTH sureButtonColor:THEMECOLOR selectDateBlock:^(NSString *date) {
-
-        self.classDate = date;
-        NSString *displayTime = [self getTimeDisplay:date];
-        [self.sortView.firstButton setTitle:displayTime forState:UIControlStateNormal];
-        [self resetPickerStatus];
-        // 请求数据
-        [self refreshAndRequestData];
-    } cancleBlock:^{
-        [self resetPickerStatus];
-    }];
-    [picker show];
-}
-
-
-- (NSString *)getTimeDisplay:(NSString *)chooseMonth {
-    [self.dateFormatter setDateFormat:@"yyyy-MM"];
-    NSDate *chooseDate = [self.dateFormatter dateFromString:chooseMonth];
-    [self.dateFormatter setDateFormat:@"yyyy年M月"];
-    NSString *displayTime = [self.dateFormatter stringFromDate:chooseDate];
-    return displayTime;
-}
-- (void)resetPickerStatus {
-    self.sortView.firstArrowUp = NO;
-}
-
-- (NewClassPopView *)popView {
-    if (!_popView) {
-        MJWeakSelf;
-        _popView = [[NewClassPopView alloc] initWithFrame:CGRectMake(0, 55, kScreenWidth, kScreenHeight - 55 - kNaviBarHeight - iPhoneXSafeBottomMargin) tableColor:HexRGB(0xf8f9fc) chooseCallback:^(NSString * _Nonnull sortStr, NSInteger chooseIndex, NSInteger item) {
-            if (chooseIndex != 0) {
-                // 回调
-                [weakSelf sortWithChooseIndex:chooseIndex item:item title:sortStr];
-            }
-            [weakSelf hiddenPopView];
-        }];
-    }
-    return _popView;
-}
-
-- (void)sortWithChooseIndex:(NSInteger)chooseIndex item:(NSInteger)item title:(NSString *)title {
-    if (item == 0) { //
-    }
-    else if (item == 1) { // 课程状态
-        self.secondChooseIndex = chooseIndex;
-        self.thirdChooseIndex = 0;
-        [self.sortView.secondButton setTitle:title forState:UIControlStateNormal];
-        switch (chooseIndex) {
-            case 1:
-            {
-                self.status = nil;
-                [self.sortView.secondButton setTitle:@"课程状态" forState:UIControlStateNormal];
-            }
-                break;
-            case 2:
-            {
-                self.status = @"NOT_START";
-            }
-                break;
-            case 3:
-            {
-                self.status = @"ING";
-            }
-                break;
-            case 4:
-            {
-                self.status = @"COMPLETE";
-            }
-                break;
-                
-            default:
-                break;
-        }
-    }
-    else if (item == 2) { // 声部筛选
-        self.thirdChooseIndex = chooseIndex;
-        [self.sortView.thirdButton setTitle:title forState:UIControlStateNormal];
-        if (chooseIndex == 1) {
-            self.subjectId = nil;
-            [self.sortView.thirdButton setTitle:@"全部声部" forState:UIControlStateNormal];
-        }
-        else {
-            NSDictionary *parm = self.subjectMessageArray[chooseIndex-1];
-            self.subjectId = [parm ks_stringValueForKey:@"subjectId"];
-        }
-    }
-    [self resetParamenter];
-    [self requestData];
-}
-
-
-- (void)hiddenPopView {
-    self.sortView.firstArrowUp = NO;
-    self.sortView.secondArrowUp = NO;
-    self.sortView.thirdArrowUp = NO;
-    [self.popView hiddenView];
-}
-
-#pragma mark - UITableViewDataSource
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return self.dataArray.count;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (self.selectIndex == 0) {
-        return 127.0f;
-    }
-    else {
-        return 164.0f;
-    }
-}
-
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    
-    if (self.selectIndex == 0) {
-        AccompanyLessonModel *model = self.dataArray[indexPath.row];
-        AccompanyCourseCell *cell = [tableView dequeueReusableCellWithIdentifier:@"AccompanyCourseCell"];
-        MJWeakSelf;
-        [cell configWithSource:model actionCallback:^(ACCOMPANY_TYPE type, AccompanyLessonModel * _Nonnull source) {
-            [weakSelf courseOperation:type sourceModel:source];
-        }];
-        return cell;
-    }
-    else {
-        LiveLessonModel *model = self.dataArray[indexPath.row];
-        MyLiveCourseCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MyLiveCourseCell"];
-        MJWeakSelf;
-        [cell configCellWithSource:model callback:^(NSString *targetId) {
-            [weakSelf chatAction:targetId];
-        }];
-        return cell;
-    }
-}
-
-- (void)courseOperation:(ACCOMPANY_TYPE)type sourceModel:(AccompanyLessonModel *)model {
-    switch (type) {
-        case ACCOMPANY_TYPE_CHAT: // 聊天
-        {
-            TUIChatConversationModel *converstaion = [[TUIChatConversationModel alloc] init];
-            converstaion.userID = model.imUserId;
-            KSChatConversationViewController *ctrl = [[KSChatConversationViewController alloc] init];
-            ctrl.conversation = converstaion;
-            [self.naviController pushViewController:ctrl animated:YES];
-        }
-            break;
-        case ACCOMPANY_TYPE_ADJUST: // 调整
-        {
-            [self showAdjustPicker:model];
-        }
-            break;
-        case ACCOMPANY_DETAIL:  // 陪练课详情
-        {
-            [self showAccompanyDetail:model];
-        }
-            break;
-
-        default:
-            break;
-    }
-}
-
-- (void)showAccompanyDetail:(AccompanyLessonModel *)model {
-    AccompanyDetailViewController *detailVC = [[AccompanyDetailViewController alloc] init];
-    detailVC.courseId = model.courseId;
-    detailVC.courseGroupId = model.courseGoupId;
-    detailVC.studentId = model.userId;
-    [self.naviController pushViewController:detailVC animated:YES];
-}
-
-- (void)showAdjustPicker:(AccompanyLessonModel *)model {
-    
-    KSFullDatePicker *picker = [[KSFullDatePicker alloc] initWithTitle:@"课时调整" date:[NSDate date] pickMode:KSDATEPICKER_MODE_DAY_TIME sureButtonColor:THEMECOLOR selectDateBlock:^(NSString *date) {
-        [self courseAdjustAction:model];
-    } cancleBlock:^{
-        
-    }];
-    [picker show];
-}
-
-- (void)courseAdjustAction:(AccompanyLessonModel *)model {
-    
-}
-
-- (void)chatAction:(NSString *)targetId {
-    if ([NSString isEmptyString:targetId]) {
-        [LOADING_MANAGER MBShowAUTOHidingInWindow:@"报名未结束,暂无群组"];
-        return;
-    }
-    TUIChatConversationModel *model = [[TUIChatConversationModel alloc] init];
-    model.groupID = targetId;
-    KSGroupConversationController *ctrl = [[KSGroupConversationController alloc] init];
-    ctrl.conversation = model;
-    [self.naviController pushViewController:ctrl animated:YES];
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    if (self.selectIndex == 0) { // 进入陪练课详情
-        AccompanyLessonModel *model = self.dataArray[indexPath.row];
-        [self showAccompanyDetail:model];
-    }
-    else { // 直播课程组详情
-        LiveLessonModel *model = self.dataArray[indexPath.row];
-        KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
-        NSString *url = [NSString stringWithFormat:@"%@/#/liveDetail?joinRoom=1&groupId=%@&classId=%@", WEBHOST, model.courseGroupId,model.courseId];
-        ctrl.url = url;
-        [self.naviController pushViewController:ctrl animated:YES];
-        
-    }
-}
-
-/**
- 设置没有数据时的显示
- 
- @param promptString 提示语
- @param imgName 图片名称
- @param view 显示在什么地方
- */
-- (void)setPromptString:(NSString *)promptString imageName:(NSString *)imgName inView:(UIView *)view {
-    if (self.promptView != nil) {
-        [self.promptView removeFromSuperview];
-    }
-    else {
-        self.promptView = [[StateView alloc]init];
-        self.promptView.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight - 300);
-    }
-    _promptPlaceView = view;
-    //当请求不到数据时 ,自定义提示view 将会出现;
-    self.promptView.imageName = imgName;
-    self.promptView.alpha = 0.0f;
-    [self.promptView setText:promptString];
-    [view addSubview:self.promptView];
-}
-
-// 结束刷新后调用方法
-- (void)changePromptLabelStateWithArray:(NSMutableArray *)array {
-    NSInteger count;
-    if (array.count) {
-        count = array.count;
-    } else {
-        count = 0;
-    }
-    
-    [UIView animateWithDuration:0.1 animations:^{
-        [[self promptView] setAlpha:count ? 0.0f :1.0f ] ;
-    }] ;
-    
-}
-
-- (BOOL)networkAvaiable {
-    return [self checkNetworkAvaiable];
-}
-
-- (BOOL)checkNetworkAvaiable {
-    BOOL isExistenceNetwork = YES;
-    Reachability *reach = [Reachability reachabilityWithHostName:@"www.apple.com"];
-    switch ([reach currentReachabilityStatus]) {
-        case NotReachable:
-            isExistenceNetwork = NO;
-            //NSLog(@"notReachable");
-            break;
-        case ReachableViaWiFi:
-            isExistenceNetwork = YES;
-            //NSLog(@"WIFI");
-            break;
-        case ReachableViaWWAN:
-            isExistenceNetwork = YES;
-            //NSLog(@"3G");
-            break;
-    }
-    return isExistenceNetwork;
-}
-#pragma mark ----- lazying
-- (NSDateFormatter *)dateFormatter {
-    if (!_dateFormatter) {
-        _dateFormatter = [NSObject getDateformatter];
-    }
-    return _dateFormatter;
-}
-
-- (void)setTeaherStatus:(NSString *)teaherStatus {
-    _teaherStatus = teaherStatus;
-    if ([teaherStatus isEqualToString:@"UNPAALY"]) { // 未申请
-        self.teacherAuthPass = NO;
-    }
-    else if ([teaherStatus isEqualToString:@"DOING"]) { // 审核中
-        self.teacherAuthPass = NO;
-    }
-    else if ([teaherStatus isEqualToString:@"UNPASS"]) {  // 不通过
-        self.teacherAuthPass = NO;
-    }
-    else  {
-        self.teacherAuthPass = YES;
-    }
-    
-    // 如果
-    if (self.selectIndex == 1) { // 直播课
-        if (self.liveFlag == NO) { // 无直播权限直接改成未通过
-            self.teacherAuthPass = NO;
-        }
-    }
-    if (self.teacherAuthPass == NO) {
-        [self showAuthView];
-    }
-    else {
-        [self hideAuthView];
-    }
-}
-
-- (void)configAuthDisplay {
-    [self.authView configDisplayMessage:[self getAuthDisplayMessage]];
-    if (self.selectIndex == 0) { // 陪练课
-        if ([self.teaherStatus isEqualToString:@"DOING"]) {
-            self.authView.sureButton.userInteractionEnabled = NO;
-            self.authView.sureButton.hidden = YES;
-        }
-        else {
-            self.authView.sureButton.userInteractionEnabled = YES;
-            self.authView.sureButton.hidden = NO;
-        }
-    }
-    else { // 直播课
-        if ([self.teaherStatus isEqualToString:@"DOING"]) {
-            self.authView.sureButton.userInteractionEnabled = NO;
-            self.authView.sureButton.hidden = YES;
-        }
-        else {
-            if ([self.teaherStatus isEqual:@"PASS"] && self.liveFlag == NO) {
-                [self.authView.sureButton setTitle:@"立即开通" forState:UIControlStateNormal];
-            }
-            else {
-                [self.authView.sureButton setTitle:@"去认证" forState:UIControlStateNormal];
-            }
-            self.authView.sureButton.userInteractionEnabled = YES;
-            self.authView.sureButton.hidden = NO;
-        }
-    }
-}
-- (void)showAuthView {
-    [self configAuthDisplay];
-    if ([self.subviews containsObject:self.authView]) {
-        [self bringSubviewToFront:self.authView];
-    }
-    else {
-        [self addSubview:self.authView];
-        [self.authView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.top.bottom.right.mas_equalTo(self);
-        }];
-    }
-}
-
-- (void)hideAuthView {
-    if ([self.subviews containsObject:self.authView]) {
-        [self.authView removeFromSuperview];
-        self.authView = nil;
-    }
-}
-
-- (AuthDisplayView *)authView {
-    if (!_authView) {
-        _authView = [AuthDisplayView shareInstance];
-        [_authView.imageView setImage:[UIImage imageNamed:[self getAuthDisplayImage]]];
-        [_authView configDisplayMessage:[self getAuthDisplayMessage]];
-        MJWeakSelf;
-        [_authView sureCallback:^{
-            [weakSelf authAction];
-        }];
-    }
-    return _authView;
-}
-
-- (NSString *)getAuthDisplayImage {
-    if (self.selectIndex == 0) {
-        return @"authTeacher_accompany";
-    }
-    else {
-        return @"authTeacher_Live";
-    }
-}
-
-- (NSString *)getAuthDisplayMessage {
-    if (self.selectIndex == 0) { // 陪练课
-        if ([self.teaherStatus isEqualToString:@"DOING"]) { // 审核中
-            return @"您已提交认证申请,请耐心等待审核结果~";
-        }
-        else {
-            return @"您还没有完成达人认证,认证后才可设置陪练课哦~";
-        }
-    }
-    else { // 直播课
-        if ([self.teaherStatus isEqualToString:@"DOING"]) { // 审核中
-            return @"您已提交认证申请,请耐心等待审核结果~";
-        }
-        else {
-            if ([self.teaherStatus isEqualToString:@"PASS"] && self.liveFlag == NO) { // 如果达人认证通过
-                return @"您尚未开通直播服务,开通后即可创建直播课程~";
-            }
-            return @"您还没有完成达人认证,认证后才可创建直播课哦~";
-        }
-    }
-    
-}
-
-- (void)authAction {
-    if (self.selectIndex == 0) {
-        KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-        webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/teacherCert"];
-        [self.naviController pushViewController:webCtrl animated:YES];
-    }
-    else  {
-        if ([self.teaherStatus isEqual:@"PASS"] && self.liveFlag == NO) { // 开通直播
-            KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-            webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/openLive"];
-            [self.naviController pushViewController:webCtrl animated:YES];
-        }
-        else {
-            KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-            webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/teacherCert"];
-            [self.naviController pushViewController:webCtrl animated:YES];
-        }
-    }
-}
-- (void)setSubjectList:(NSMutableArray *)subjectList {
-    _subjectList = subjectList;
-    self.thirdChooseIndex = 0;
-}
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end

+ 0 - 40
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonSearchView.h

@@ -1,40 +0,0 @@
-//
-//  MyLessonSearchView.h
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/4/12.
-//
-
-#import <UIKit/UIKit.h>
-
-typedef NS_ENUM(NSInteger, SORT_TYPE) {
-    SORT_TYPE_TIME = 1,   // 课程时间
-    SORT_TYPE_STATUS = 2, // 课程状态
-    SORT_TYPE_SUBJECT = 3,  // 声部筛选
-    SORT_TYPE_HIDDEN = 4, // 隐藏
-};
-
-typedef void(^SortActionBlock)(SORT_TYPE type);
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MyLessonSearchView : UIView
-
-@property (weak, nonatomic) IBOutlet UIButton *firstButton;
-@property (weak, nonatomic) IBOutlet UIButton *secondButton;
-@property (weak, nonatomic) IBOutlet UIButton *thirdButton;
-
-@property (nonatomic, assign) BOOL firstArrowUp;
-
-@property (nonatomic, assign) BOOL secondArrowUp;
-
-@property (nonatomic, assign) BOOL thirdArrowUp;
-
-+ (instancetype)shareInstance;
-
-- (void)sortAction:(SortActionBlock)block;
-
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 96
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonSearchView.m

@@ -1,96 +0,0 @@
-//
-//  MyLessonSearchView.m
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/4/12.
-//
-
-#import "MyLessonSearchView.h"
-
-@interface MyLessonSearchView ()
-
-@property (nonatomic, copy) SortActionBlock block;
-@property (weak, nonatomic) IBOutlet UIImageView *firstArrow;
-@property (weak, nonatomic) IBOutlet UIImageView *secondArrow;
-@property (weak, nonatomic) IBOutlet UIImageView *thirdArrow;
-
-@end
-
-
-@implementation MyLessonSearchView
-
-- (void)awakeFromNib {
-    [super awakeFromNib];
-    self.firstArrowUp = NO;
-    self.secondArrowUp = NO;
-    self.thirdArrowUp = NO;
-}
-
-+ (instancetype)shareInstance {
-    MyLessonSearchView *view = [[[NSBundle mainBundle] loadNibNamed:@"MyLessonSearchView" owner:nil options:nil] firstObject];
-    return view;
-}
-
-- (void)sortAction:(SortActionBlock)block {
-    if (block) {
-        self.block = block;
-    }
-}
-
-- (IBAction)buttonClickAction:(UIButton *)sender {
-    NSInteger index = sender.tag - 1000;
-    BOOL isHidden;
-    if (index == 1) {
-        self.firstArrowUp = !self.firstArrowUp;
-        self.secondArrowUp = NO;
-        self.thirdArrowUp = NO;
-        isHidden = !self.firstArrowUp;
-    }
-    else if (index == 2) {
-        self.secondArrowUp = !self.secondArrowUp;
-        self.firstArrowUp = NO;
-        self.thirdArrowUp = NO;
-        isHidden = !self.secondArrowUp;
-    }
-    else {
-        self.thirdArrowUp = !self.thirdArrowUp;
-        self.firstArrowUp = NO;
-        self.secondArrowUp = NO;
-        isHidden = !self.thirdArrowUp;
-    }
-    
-    if (self.block) {
-        if (isHidden) {
-            index = 4;
-        }
-        self.block(index);
-    }
-}
-
-- (void)setFirstArrowUp:(BOOL)firstArrowUp {
-    _firstArrowUp = firstArrowUp;
-    NSString *imageName = firstArrowUp ? @"sort_up" : @"sort_down";
-    [_firstArrow setImage:[UIImage imageNamed:imageName]];
-}
-
-- (void)setSecondArrowUp:(BOOL)secondArrowUp {
-    _secondArrowUp = secondArrowUp;
-    NSString *imageName = secondArrowUp ? @"sort_up" : @"sort_down";
-    [_secondArrow setImage:[UIImage imageNamed:imageName]];
-}
-
-- (void)setThirdArrowUp:(BOOL)thirdArrowUp {
-    _thirdArrowUp = thirdArrowUp;
-    NSString *imageName = thirdArrowUp ? @"sort_up" : @"sort_down";
-    [_thirdArrow setImage:[UIImage imageNamed:imageName]];
-}
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end

+ 0 - 142
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLessonSearchView.xib

@@ -1,142 +0,0 @@
-<?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">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
-        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="MyLessonSearchView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="88"/>
-            <autoresizingMask key="autoresizingMask"/>
-            <subviews>
-                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LpR-2y-gXZ">
-                    <rect key="frame" x="0.0" y="0.0" width="414" height="88"/>
-                    <subviews>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sav-8B-TD3">
-                            <rect key="frame" x="0.0" y="0.0" width="131.5" height="88"/>
-                            <subviews>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="vSU-NS-Qou">
-                                    <rect key="frame" x="109.5" y="38" width="12" height="12"/>
-                                </imageView>
-                                <button opaque="NO" tag="1001" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CSP-VE-Q55">
-                                    <rect key="frame" x="0.0" y="0.0" width="131.5" height="88"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                    <state key="normal" title="2022年04月">
-                                        <color key="titleColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                                    </state>
-                                    <connections>
-                                        <action selector="buttonClickAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="TaJ-ah-38O"/>
-                                    </connections>
-                                </button>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <constraints>
-                                <constraint firstAttribute="trailing" secondItem="CSP-VE-Q55" secondAttribute="trailing" id="0bd-hm-rCy"/>
-                                <constraint firstAttribute="bottom" secondItem="CSP-VE-Q55" secondAttribute="bottom" id="5ye-zJ-qJd"/>
-                                <constraint firstAttribute="trailing" secondItem="vSU-NS-Qou" secondAttribute="trailing" constant="10" id="g2D-zv-qIp"/>
-                                <constraint firstItem="CSP-VE-Q55" firstAttribute="top" secondItem="sav-8B-TD3" secondAttribute="top" id="lqg-EV-zPD"/>
-                                <constraint firstItem="vSU-NS-Qou" firstAttribute="centerY" secondItem="sav-8B-TD3" secondAttribute="centerY" id="vSN-3Z-GaR"/>
-                                <constraint firstItem="CSP-VE-Q55" firstAttribute="leading" secondItem="sav-8B-TD3" secondAttribute="leading" id="zIY-Ko-K7m"/>
-                            </constraints>
-                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EXN-FR-v0M">
-                            <rect key="frame" x="141.5" y="0.0" width="131" height="88"/>
-                            <subviews>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="OTv-DP-LWv">
-                                    <rect key="frame" x="99" y="38" width="12" height="12"/>
-                                </imageView>
-                                <button opaque="NO" tag="1002" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4ob-Ur-wiA">
-                                    <rect key="frame" x="0.0" y="0.0" width="131" height="88"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                    <state key="normal" title="课程状态">
-                                        <color key="titleColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                                    </state>
-                                    <connections>
-                                        <action selector="buttonClickAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="dy9-XT-PTc"/>
-                                    </connections>
-                                </button>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <constraints>
-                                <constraint firstAttribute="trailing" secondItem="OTv-DP-LWv" secondAttribute="trailing" constant="20" id="Agt-B1-juL"/>
-                                <constraint firstItem="4ob-Ur-wiA" firstAttribute="leading" secondItem="EXN-FR-v0M" secondAttribute="leading" id="GtX-9e-ehq"/>
-                                <constraint firstAttribute="trailing" secondItem="4ob-Ur-wiA" secondAttribute="trailing" id="YNZ-vD-gf4"/>
-                                <constraint firstItem="OTv-DP-LWv" firstAttribute="centerY" secondItem="EXN-FR-v0M" secondAttribute="centerY" id="b3Z-oq-v2w"/>
-                                <constraint firstAttribute="bottom" secondItem="4ob-Ur-wiA" secondAttribute="bottom" id="jwa-36-Cbd"/>
-                                <constraint firstItem="4ob-Ur-wiA" firstAttribute="top" secondItem="EXN-FR-v0M" secondAttribute="top" id="ljE-Zk-4Wc"/>
-                            </constraints>
-                        </view>
-                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tfS-Rc-iEN">
-                            <rect key="frame" x="282.5" y="0.0" width="131.5" height="88"/>
-                            <subviews>
-                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="2nN-nP-Pcx">
-                                    <rect key="frame" x="99.5" y="38" width="12" height="12"/>
-                                </imageView>
-                                <button opaque="NO" tag="1003" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cgC-dL-lRH">
-                                    <rect key="frame" x="0.0" y="0.0" width="131.5" height="88"/>
-                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                    <state key="normal" title="全部声部">
-                                        <color key="titleColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                                    </state>
-                                    <connections>
-                                        <action selector="buttonClickAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="nuc-JZ-JJe"/>
-                                    </connections>
-                                </button>
-                            </subviews>
-                            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                            <constraints>
-                                <constraint firstItem="2nN-nP-Pcx" firstAttribute="centerY" secondItem="tfS-Rc-iEN" secondAttribute="centerY" id="5EQ-2B-7AS"/>
-                                <constraint firstAttribute="trailing" secondItem="cgC-dL-lRH" secondAttribute="trailing" id="736-JC-2Pv"/>
-                                <constraint firstItem="cgC-dL-lRH" firstAttribute="top" secondItem="tfS-Rc-iEN" secondAttribute="top" id="Jda-N3-CeP"/>
-                                <constraint firstAttribute="trailing" secondItem="2nN-nP-Pcx" secondAttribute="trailing" constant="20" id="fhr-tv-oYh"/>
-                                <constraint firstAttribute="bottom" secondItem="cgC-dL-lRH" secondAttribute="bottom" id="i38-qz-i66"/>
-                                <constraint firstItem="cgC-dL-lRH" firstAttribute="leading" secondItem="tfS-Rc-iEN" secondAttribute="leading" id="zXE-H5-6j1"/>
-                            </constraints>
-                        </view>
-                    </subviews>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                    <constraints>
-                        <constraint firstItem="tfS-Rc-iEN" firstAttribute="leading" secondItem="EXN-FR-v0M" secondAttribute="trailing" constant="10" id="4dx-rG-JsD"/>
-                        <constraint firstItem="EXN-FR-v0M" firstAttribute="bottom" secondItem="sav-8B-TD3" secondAttribute="bottom" id="9F3-pd-MYs"/>
-                        <constraint firstItem="tfS-Rc-iEN" firstAttribute="width" secondItem="sav-8B-TD3" secondAttribute="width" id="CLF-fI-pzs"/>
-                        <constraint firstItem="EXN-FR-v0M" firstAttribute="top" secondItem="sav-8B-TD3" secondAttribute="top" id="FLx-ZH-cjQ"/>
-                        <constraint firstItem="tfS-Rc-iEN" firstAttribute="top" secondItem="sav-8B-TD3" secondAttribute="top" id="Hbw-pi-fCh"/>
-                        <constraint firstItem="sav-8B-TD3" firstAttribute="top" secondItem="LpR-2y-gXZ" secondAttribute="top" id="Ihc-cJ-1Oh"/>
-                        <constraint firstItem="tfS-Rc-iEN" firstAttribute="bottom" secondItem="sav-8B-TD3" secondAttribute="bottom" id="Xfd-4u-1IF"/>
-                        <constraint firstAttribute="bottom" secondItem="sav-8B-TD3" secondAttribute="bottom" id="bu2-X6-Yg6"/>
-                        <constraint firstItem="EXN-FR-v0M" firstAttribute="width" secondItem="sav-8B-TD3" secondAttribute="width" id="fPc-ee-c1N"/>
-                        <constraint firstAttribute="trailing" secondItem="tfS-Rc-iEN" secondAttribute="trailing" id="u1e-Ax-BTi"/>
-                        <constraint firstItem="sav-8B-TD3" firstAttribute="leading" secondItem="LpR-2y-gXZ" secondAttribute="leading" id="uCG-Vn-Bi5"/>
-                        <constraint firstItem="EXN-FR-v0M" firstAttribute="leading" secondItem="sav-8B-TD3" secondAttribute="trailing" constant="10" id="vlA-mz-du1"/>
-                    </constraints>
-                </view>
-            </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-            <constraints>
-                <constraint firstAttribute="trailing" secondItem="LpR-2y-gXZ" secondAttribute="trailing" id="TJN-ui-GfD"/>
-                <constraint firstItem="LpR-2y-gXZ" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="cRb-QE-c94"/>
-                <constraint firstItem="LpR-2y-gXZ" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="jZD-EQ-305"/>
-                <constraint firstAttribute="bottom" secondItem="LpR-2y-gXZ" secondAttribute="bottom" id="mqe-U8-IPW"/>
-            </constraints>
-            <nil key="simulatedTopBarMetrics"/>
-            <nil key="simulatedBottomBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <connections>
-                <outlet property="firstArrow" destination="vSU-NS-Qou" id="Kv5-mp-IhS"/>
-                <outlet property="firstButton" destination="CSP-VE-Q55" id="Lyn-Ga-7zx"/>
-                <outlet property="secondArrow" destination="OTv-DP-LWv" id="t4Z-hT-MB6"/>
-                <outlet property="secondButton" destination="4ob-Ur-wiA" id="DiD-8c-xf0"/>
-                <outlet property="thirdArrow" destination="2nN-nP-Pcx" id="VyH-DI-YOp"/>
-                <outlet property="thirdButton" destination="cgC-dL-lRH" id="ct4-B7-EIj"/>
-            </connections>
-            <point key="canvasLocation" x="131.8840579710145" y="-33.482142857142854"/>
-        </view>
-    </objects>
-    <resources>
-        <image name="sort_down" width="12" height="12"/>
-    </resources>
-</document>

+ 0 - 21
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLiveCourseCell.h

@@ -1,21 +0,0 @@
-//
-//  MyLiveCourseCell.h
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/4/12.
-//
-
-#import <UIKit/UIKit.h>
-#import "LiveLessonModel.h"
-
-typedef void(^LiveLessonChatAction)(NSString * _Nonnull targetId);
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MyLiveCourseCell : UITableViewCell
-
-- (void)configCellWithSource:(LiveLessonModel *)model callback:(LiveLessonChatAction)callback;
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 104
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLiveCourseCell.m

@@ -1,104 +0,0 @@
-//
-//  MyLiveCourseCell.m
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/4/12.
-//
-
-#import "MyLiveCourseCell.h"
-
-@interface MyLiveCourseCell ()
-
-@property (weak, nonatomic) IBOutlet UIImageView *courseCoverImage;
-
-@property (weak, nonatomic) IBOutlet UILabel *courseNameLabel;
-
-@property (weak, nonatomic) IBOutlet UILabel *subjectName;
-
-@property (weak, nonatomic) IBOutlet UILabel *descLabel;
-
-@property (weak, nonatomic) IBOutlet UILabel *timeLabel;
-
-@property (weak, nonatomic) IBOutlet UILabel *statusLabel;
-
-@property (weak, nonatomic) IBOutlet UIImageView *userAvatar;
-
-@property (weak, nonatomic) IBOutlet UILabel *teacherName;
-
-@property (nonatomic, strong) NSString *targetId;
-
-@property (nonatomic, copy) LiveLessonChatAction callback;
-@end
-
-@implementation MyLiveCourseCell
-
-- (void)awakeFromNib {
-    [super awakeFromNib];
-    // Initialization code
-    self.selectionStyle = UITableViewCellSelectionStyleNone;
-}
-
-- (void)configCellWithSource:(LiveLessonModel *)model callback:(LiveLessonChatAction)callback {
-    if (callback) {
-        self.callback = callback;
-    }
-    [self.courseCoverImage sd_setImageWithURL:[NSURL URLWithString:[model.backgroundPic getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:@"video_placeholder"]];
-    self.courseNameLabel.text = [NSString returnNoNullStringWithString:model.courseGroupName];
-    self.subjectName.text = [NSString returnNoNullStringWithString:model.subjectName];
-    self.descLabel.text = [NSString stringWithFormat:@"%.0f人",model.studentCount];
-    self.targetId = model.imGroupId;
-    // time
-    NSDateFormatter *formatter = [NSObject getDateformatter];
-    [formatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
-    NSDate *startDate = [formatter dateFromString:model.startTime];
-    NSDate *endDate = [formatter dateFromString:model.endTime];
-    
-    [formatter setDateFormat:@"yyyy/MM/dd HH:mm"];
-    NSString *courseBegin = [formatter stringFromDate:startDate];
-    [formatter setDateFormat:@"HH:mm"];
-    NSString *endTime = [formatter stringFromDate:endDate];
-    self.timeLabel.text = [NSString stringWithFormat:@"%@~%@",[NSString returnNoNullStringWithString:courseBegin], [NSString returnNoNullStringWithString:endTime]];
-    
-    [self.userAvatar sd_setImageWithURL:[NSURL URLWithString:[model.avatar getUrlEndcodeString]] placeholderImage:[UIImage imageNamed:TEACHER_AVATAR]];
-    // name
-    NSString *teacherName = @"";
-    if ([NSString isEmptyString:model.username]) {
-        teacherName = [NSString stringWithFormat:@"游客%@",model.userId];
-    }
-    else {
-        teacherName = model.username;
-    }
-    self.teacherName.text = teacherName;
-    //  课程状态
-    [self evaluateStatus:model.status];
-}
-
-- (void)evaluateStatus:(NSString *)status {
-    if ([status isEqualToString:@"ING"]) { // 进行中
-        self.statusLabel.text = @"进行中";
-        self.statusLabel.textColor = THEMECOLOR;
-    }
-    else if ([status isEqualToString:@"NOT_START"]) { // 为开始
-        self.statusLabel.text = @"未开始";
-        self.statusLabel.textColor = HexRGB(0xff802c);
-    }
-    else if ([status isEqualToString:@"COMPLETE"]) { // 已结束
-        self.statusLabel.text = @"已结束";
-        self.statusLabel.textColor = HexRGB(0x999999);
-    }
-}
-
-- (IBAction)chatAction:(id)sender {
-    if (self.callback) {
-        self.callback(self.targetId);
-    }
-}
-
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
-
-    // Configure the view for the selected state
-}
-
-@end

+ 0 - 225
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyLiveCourseCell.xib

@@ -1,225 +0,0 @@
-<?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" useSafeAreas="YES" colorMatched="YES">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
-        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <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"/>
-        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="164" id="KGk-i7-Jjw" customClass="MyLiveCourseCell">
-            <rect key="frame" x="0.0" y="0.0" width="396" height="164"/>
-            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="396" height="164"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9Mv-FD-03n">
-                        <rect key="frame" x="14" y="0.0" width="368" height="152"/>
-                        <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="video_placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="NWN-u6-1To">
-                                <rect key="frame" x="11" y="16" width="105" height="71"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="105" id="FfC-qz-2vt"/>
-                                    <constraint firstAttribute="height" constant="71" id="I46-Vb-KPv"/>
-                                </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="4"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                            </imageView>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LBQ-Z9-llI">
-                                <rect key="frame" x="15" y="71" width="24.5" height="13"/>
-                                <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="长笛" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MVn-fK-uc6">
-                                        <rect key="frame" x="3" y="0.0" width="18.5" height="13"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="13" id="Btd-rS-jYW"/>
-                                        </constraints>
-                                        <fontDescription key="fontDescription" type="system" pointSize="9"/>
-                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="calibratedRGB"/>
-                                <constraints>
-                                    <constraint firstItem="MVn-fK-uc6" firstAttribute="top" secondItem="LBQ-Z9-llI" secondAttribute="top" id="Ekt-B3-DZI"/>
-                                    <constraint firstItem="MVn-fK-uc6" firstAttribute="leading" secondItem="LBQ-Z9-llI" secondAttribute="leading" constant="3" id="jKQ-Sd-hzq"/>
-                                    <constraint firstAttribute="trailing" secondItem="MVn-fK-uc6" secondAttribute="trailing" constant="3" id="sCR-Uk-vBJ"/>
-                                    <constraint firstAttribute="bottom" secondItem="MVn-fK-uc6" secondAttribute="bottom" id="xyE-jf-hrH"/>
-                                </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="1"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                            </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z3n-pP-QqQ">
-                                <rect key="frame" x="10" y="102" width="348" height="1"/>
-                                <color key="backgroundColor" red="0.94901960780000005" green="0.94901960780000005" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="1" id="h6v-qm-9HE"/>
-                                </constraints>
-                            </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="从零开始学竖笛直播课" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9C1-zD-NKp">
-                                <rect key="frame" x="128" y="17" width="153" height="20"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="20" id="jZt-hb-zgs"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="15"/>
-                                <color key="textColor" red="0.1019607843" green="0.1019607843" blue="0.1019607843" 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="VrX-Hy-enc">
-                                <rect key="frame" x="314" y="111" width="43" height="20"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="20" id="nme-QD-dNX"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/>
-                                <color key="textColor" red="0.1764705882" green="0.78039215689999997" blue="0.66666666669999997" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nk8-cr-bIe">
-                                <rect key="frame" x="197" y="65" width="159" height="20"/>
-                                <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L8Z-vN-njT">
-                                        <rect key="frame" x="0.0" y="4.5" width="1" height="11"/>
-                                        <color key="backgroundColor" red="0.82745098039999998" green="0.82745098039999998" blue="0.82745098039999998" alpha="1" colorSpace="calibratedRGB"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="11" id="kC6-Sk-pFt"/>
-                                            <constraint firstAttribute="width" constant="1" id="sHX-nY-QUC"/>
-                                        </constraints>
-                                    </view>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="6人已购买" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z2r-ta-wPC">
-                                        <rect key="frame" x="7" y="2" width="63" height="16"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                        <color key="textColor" red="1" green="0.50196078430000002" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="20" id="6hD-Zm-lqn"/>
-                                    <constraint firstItem="Z2r-ta-wPC" firstAttribute="leading" secondItem="L8Z-vN-njT" secondAttribute="trailing" constant="6" id="DdG-Rm-I06"/>
-                                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Z2r-ta-wPC" secondAttribute="trailing" constant="2" id="Jyv-hq-k4o"/>
-                                    <constraint firstItem="L8Z-vN-njT" firstAttribute="centerY" secondItem="Nk8-cr-bIe" secondAttribute="centerY" id="VPS-kd-fiV"/>
-                                    <constraint firstItem="L8Z-vN-njT" firstAttribute="leading" secondItem="Nk8-cr-bIe" secondAttribute="leading" id="l6d-g2-l32"/>
-                                    <constraint firstItem="Z2r-ta-wPC" firstAttribute="centerY" secondItem="Nk8-cr-bIe" secondAttribute="centerY" id="npN-uI-5WD"/>
-                                </constraints>
-                            </view>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="course_time" translatesAutoresizingMaskIntoConstraints="NO" id="zwg-bj-X8b">
-                                <rect key="frame" x="11" y="114" width="16" height="16"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="16" id="D2y-TK-hj5"/>
-                                    <constraint firstAttribute="width" constant="16" id="jJm-KX-qcy"/>
-                                </constraints>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2021/09/17 14:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QUH-rb-n4x">
-                                <rect key="frame" x="34" y="114" width="105" height="16"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Kh-s4-xZJ">
-                                <rect key="frame" x="286" y="7" width="40" height="40"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="40" id="G8p-eG-zeE"/>
-                                    <constraint firstAttribute="width" constant="40" id="W6r-uH-v7W"/>
-                                </constraints>
-                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                <state key="normal" image="chat_chat"/>
-                                <connections>
-                                    <action selector="chatAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="sIl-Bo-eWo"/>
-                                </connections>
-                            </button>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="teacher_avatar" translatesAutoresizingMaskIntoConstraints="NO" id="iEI-Pi-SsV">
-                                <rect key="frame" x="128" y="65" width="20" height="20"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="20" id="LGY-r0-DDx"/>
-                                    <constraint firstAttribute="width" constant="20" id="g6E-PI-weR"/>
-                                </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                        <real key="value" value="10"/>
-                                    </userDefinedRuntimeAttribute>
-                                </userDefinedRuntimeAttributes>
-                            </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张老师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LBW-qh-fVG">
-                                <rect key="frame" x="153" y="67" width="40" height="16"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                                <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="9C1-zD-NKp" firstAttribute="leading" secondItem="NWN-u6-1To" secondAttribute="trailing" constant="12" id="9xV-WZ-Jeb"/>
-                            <constraint firstAttribute="trailing" secondItem="Nk8-cr-bIe" secondAttribute="trailing" constant="12" id="CVV-yo-0Sx"/>
-                            <constraint firstItem="Nk8-cr-bIe" firstAttribute="centerY" secondItem="LBW-qh-fVG" secondAttribute="centerY" id="DnD-r0-vUs"/>
-                            <constraint firstItem="zwg-bj-X8b" firstAttribute="leading" secondItem="9Mv-FD-03n" secondAttribute="leading" constant="11" id="Eg4-fY-s6L"/>
-                            <constraint firstItem="VrX-Hy-enc" firstAttribute="top" secondItem="Z3n-pP-QqQ" secondAttribute="bottom" constant="8" id="HJr-KG-LRz"/>
-                            <constraint firstItem="Z3n-pP-QqQ" firstAttribute="top" secondItem="NWN-u6-1To" secondAttribute="bottom" constant="15" id="HWE-Lc-PGR"/>
-                            <constraint firstAttribute="trailing" secondItem="VrX-Hy-enc" secondAttribute="trailing" constant="11" id="IuH-hK-LDm"/>
-                            <constraint firstItem="QUH-rb-n4x" firstAttribute="leading" secondItem="zwg-bj-X8b" secondAttribute="trailing" constant="7" id="Kv8-pd-LT7"/>
-                            <constraint firstItem="LBQ-Z9-llI" firstAttribute="bottom" secondItem="NWN-u6-1To" secondAttribute="bottom" constant="-3" id="Vgb-Du-6sJ"/>
-                            <constraint firstItem="LBW-qh-fVG" firstAttribute="centerY" secondItem="iEI-Pi-SsV" secondAttribute="centerY" id="VkB-XP-Qqs"/>
-                            <constraint firstItem="LBQ-Z9-llI" firstAttribute="leading" secondItem="NWN-u6-1To" secondAttribute="leading" constant="4" id="WaG-UB-4AU"/>
-                            <constraint firstItem="2Kh-s4-xZJ" firstAttribute="leading" secondItem="9C1-zD-NKp" secondAttribute="trailing" constant="5" id="Wf6-Mf-Upf"/>
-                            <constraint firstItem="zwg-bj-X8b" firstAttribute="top" secondItem="Z3n-pP-QqQ" secondAttribute="bottom" constant="11" id="YNp-yH-cDb"/>
-                            <constraint firstItem="LBW-qh-fVG" firstAttribute="leading" secondItem="iEI-Pi-SsV" secondAttribute="trailing" constant="5" id="YYw-wW-cP5"/>
-                            <constraint firstItem="NWN-u6-1To" firstAttribute="top" secondItem="9Mv-FD-03n" secondAttribute="top" constant="16" id="cGY-p8-lN7"/>
-                            <constraint firstItem="NWN-u6-1To" firstAttribute="leading" secondItem="9Mv-FD-03n" secondAttribute="leading" constant="11" id="cfe-2g-SQh"/>
-                            <constraint firstItem="Z3n-pP-QqQ" firstAttribute="leading" secondItem="9Mv-FD-03n" secondAttribute="leading" constant="10" id="hry-ZU-tVs"/>
-                            <constraint firstItem="9C1-zD-NKp" firstAttribute="top" secondItem="NWN-u6-1To" secondAttribute="top" constant="1" id="jfN-JM-ITb"/>
-                            <constraint firstItem="Nk8-cr-bIe" firstAttribute="leading" secondItem="LBW-qh-fVG" secondAttribute="trailing" constant="4" id="kex-gT-4CX"/>
-                            <constraint firstItem="2Kh-s4-xZJ" firstAttribute="centerY" secondItem="9C1-zD-NKp" secondAttribute="centerY" id="mRw-yl-KmV"/>
-                            <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="2Kh-s4-xZJ" secondAttribute="trailing" id="nNd-mX-E6C"/>
-                            <constraint firstAttribute="trailing" secondItem="Z3n-pP-QqQ" secondAttribute="trailing" constant="10" id="oVA-kc-t3T"/>
-                            <constraint firstItem="iEI-Pi-SsV" firstAttribute="leading" secondItem="9C1-zD-NKp" secondAttribute="leading" id="rer-Fd-tpS"/>
-                            <constraint firstItem="QUH-rb-n4x" firstAttribute="centerY" secondItem="zwg-bj-X8b" secondAttribute="centerY" id="uBT-wz-dHP"/>
-                            <constraint firstItem="iEI-Pi-SsV" firstAttribute="bottom" secondItem="NWN-u6-1To" secondAttribute="bottom" constant="-2" id="vkW-bd-hBZ"/>
-                        </constraints>
-                        <userDefinedRuntimeAttributes>
-                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
-                                <real key="value" value="10"/>
-                            </userDefinedRuntimeAttribute>
-                        </userDefinedRuntimeAttributes>
-                    </view>
-                </subviews>
-                <constraints>
-                    <constraint firstItem="9Mv-FD-03n" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="AO0-g2-drH"/>
-                    <constraint firstAttribute="bottom" secondItem="9Mv-FD-03n" secondAttribute="bottom" constant="12" id="VYf-HS-AeG"/>
-                    <constraint firstItem="9Mv-FD-03n" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="14" id="ZcW-pC-Pdu"/>
-                    <constraint firstAttribute="trailing" secondItem="9Mv-FD-03n" secondAttribute="trailing" constant="14" id="zxh-ku-GLf"/>
-                </constraints>
-            </tableViewCellContentView>
-            <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-            <connections>
-                <outlet property="courseCoverImage" destination="NWN-u6-1To" id="5H2-Pf-5WA"/>
-                <outlet property="courseNameLabel" destination="9C1-zD-NKp" id="dMl-ob-iwk"/>
-                <outlet property="descLabel" destination="Z2r-ta-wPC" id="DTT-W9-umA"/>
-                <outlet property="statusLabel" destination="VrX-Hy-enc" id="6M9-tY-aZT"/>
-                <outlet property="subjectName" destination="MVn-fK-uc6" id="XPI-bJ-IQA"/>
-                <outlet property="teacherName" destination="LBW-qh-fVG" id="9SD-jg-AaQ"/>
-                <outlet property="timeLabel" destination="QUH-rb-n4x" id="RV0-zl-r5M"/>
-                <outlet property="userAvatar" destination="iEI-Pi-SsV" id="UDN-vY-dOT"/>
-            </connections>
-            <point key="canvasLocation" x="186.95652173913044" y="118.52678571428571"/>
-        </tableViewCell>
-    </objects>
-    <resources>
-        <image name="chat_chat" width="19" height="18"/>
-        <image name="course_time" width="16" height="16"/>
-        <image name="teacher_avatar" width="150" height="150"/>
-        <image name="video_placeholder" width="103" height="72"/>
-        <systemColor name="systemBackgroundColor">
-            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-        </systemColor>
-    </resources>
-</document>

+ 0 - 22
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyMusicRoomBodyView.h

@@ -1,22 +0,0 @@
-//
-//  MyMusicRoomBodyView.h
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/6/14.
-//
-
-#import <KSJXBodyView.h>
-#import "StateView.h"
-#import "Reachability.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MyMusicRoomBodyView : KSJXBodyView
-
-@property (nonatomic, strong) NSString *teaherStatus;
-
-@property (nonatomic, strong) NSMutableArray *subjectList;
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 561
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyMusicRoomBodyView.m

@@ -1,561 +0,0 @@
-//
-//  MyMusicRoomBodyView.m
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/6/14.
-//
-
-#import "MyMusicRoomBodyView.h"
-#import "KSGroupConversationController.h"
-#import "MusicRoomCourseCell.h"
-#import "NewClassPopView.h"
-#import <KSFullDatePicker.h>
-#import "MyLessonSearchView.h"
-#import "MusicRoomViewController.h"
-#import <KSChoosePicker.h>
-#import "MusicRoomListModel.h"
-#import "AuthDisplayView.h"
-#import "KSBaseWKWebViewController.h"
-
-@interface MyMusicRoomBodyView ()<UITableViewDelegate,UITableViewDataSource>
-
-@property (nonatomic, strong) NSDateFormatter *dateFormatter;
-
-@property (nonatomic, copy) MyLessonSearchView *sortView;
-
-@property (nonatomic, strong) NewClassPopView *popView;
-
-@property (nonatomic, strong) NSMutableArray *dataArray;
-
-@property (nonatomic, strong) StateView *promptView;
-@property (nonatomic, strong) UIView *promptPlaceView;
-
-@property (nonatomic, assign) BOOL networkAvaiable; // 网络是否可用
-
-@property (nonatomic, assign) BOOL isLoadMore;
-@property (nonatomic, assign) NSInteger rows;
-@property (nonatomic, assign) NSInteger pages;
-
-@property (nonatomic, assign) NSInteger secondChooseIndex;
-
-@property (nonatomic, assign) NSInteger thirdChooseIndex;
-
-@property (nonatomic, strong) NSString *classDate;
-
-@property (nonatomic, strong) NSString *status;
-
-@property (nonatomic, strong) NSString *subjectId;
-
-@property (nonatomic, strong) NSMutableArray *subjectMessageArray;
-
-@property (nonatomic, strong) AuthDisplayView *authView;
-
-@property (nonatomic, assign) BOOL teacherAuthPass;  // 是否通过老师审核
-
-@end
-
-@implementation MyMusicRoomBodyView
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        self.backgroundColor = HexRGB(0xf8f9fc);
-        self.tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 0, frame.size.width, frame.size.height) style:UITableViewStylePlain];
-        self.tableView.backgroundColor = HexRGB(0xf8f9fc);
-        self.tableView.showsVerticalScrollIndicator = NO;
-
-        self.tableView.dataSource = self;
-        self.tableView.delegate = self;
-        self.tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-        [self addSubview:self.tableView];
-        
-        
-        UIView *headView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
-        headView.backgroundColor = HexRGB(0xf8f9fc);
-        self.tableView.tableHeaderView = headView;
-        
-        UIView *bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kScreenWidth, 10)];
-        bottomView.backgroundColor = HexRGB(0xf8f9fc);
-        self.tableView.tableFooterView = bottomView;
-        
-        [self.tableView registerNib:[UINib nibWithNibName:@"MusicRoomCourseCell" bundle:[NSBundle mainBundle]] forCellReuseIdentifier:@"MusicRoomCourseCell"];
-        [self.dateFormatter setDateFormat:@"yyyy-MM"];
-        
-        NSDate *currentDate = [NSDate date];
-        self.classDate = [self.dateFormatter stringFromDate:currentDate];
-        MJWeakSelf;
-        self.tableView.mj_header = [KSGifRefreshHeader headerWithRefreshingBlock:^{
-            [weakSelf resetParamenter];
-            [weakSelf requestData];
-        }];
-        self.tableView.mj_footer = [KSGifRefreshFooter footerWithRefreshingBlock:^{
-            if (weakSelf.isLoadMore) {
-                weakSelf.pages += 1;
-                [weakSelf requestData];
-            }
-            else {
-                [weakSelf.tableView.mj_footer endRefreshingWithNoMoreData];
-            }
-        }];
-    }
-    return self;
-}
-
-- (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.tableView.mj_header endRefreshing];
-        [self.tableView.mj_footer endRefreshing];
-    });
-}
-
-- (void)refreshAndRequestData {
-    [self resetParamenter];
-    [self requestData];
-}
-
-- (void)resetParamenter {
-    self.isLoadMore = YES;
-    self.pages = 1;
-    self.rows = 10;
-    
-    self.dataArray = [NSMutableArray array];
-    [self.tableView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无课程" imageName:@"empty_course" inView:self.tableView];
-    [self.tableView reloadData];
-}
-
-- (void)requestData {
-    [KSNetworkingManager musicRoomListRequest:KS_POST month:self.classDate status:self.status subjectId:self.subjectId page:self.pages rows:self.rows success:^(NSDictionary * _Nonnull dic) {
-        [self endRefresh];
-        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-            NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
-            for (NSDictionary *parm in sourceArray) {
-                MusicRoomListModel *model = [[MusicRoomListModel alloc] initWithDictionary:parm];
-                [self.dataArray addObject:model];
-            }
-            
-            if (sourceArray.count < self.rows) {
-                self.isLoadMore = NO;
-            }
-        }
-        else {
-            [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
-        }
-        [self.tableView reloadData];
-        [self changePromptLabelStateWithArray:self.dataArray];
-    } faliure:^(NSError * _Nonnull error) {
-        [self endRefresh];
-        if (self.networkAvaiable == NO) {
-            [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.tableView];
-        }
-        [self.dataArray removeAllObjects];
-        [self.tableView reloadData];
-        [self changePromptLabelStateWithArray:self.dataArray];
-    }];
-}
-
-- (void)beginRefreshImmediately {
-    [self.tableView.mj_header beginRefreshing];
-}
-
-- (void)beginFirstRefresh {
-    if (!self.isHeaderRefreshed) {
-        [self beginRefreshImmediately];
-    }
-}
-- (void)selectCellAtIndexPath:(NSIndexPath *)indexPath {
-    
-    if (self.lastSelectedIndexPath == indexPath) {
-        return;
-    }
-    if (self.lastSelectedIndexPath != nil) {
-        UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:self.lastSelectedIndexPath];
-        [cell setSelected:NO animated:NO];
-    }
-    UITableViewCell *cell = [self.tableView cellForRowAtIndexPath:indexPath];
-    [cell setSelected:YES animated:NO];
-    self.lastSelectedIndexPath = indexPath;
-}
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    self.tableView.frame = self.bounds;
-    CGFloat topHeight = 55.0f;
-    self.tableView.frame = CGRectMake(0, topHeight, self.bounds.size.width, self.bounds.size.height - topHeight);
-    if (!_sortView) {
-        _sortView = [MyLessonSearchView shareInstance];
-        _sortView.frame = CGRectMake(0, 0, kScreenWidth, 55);
-        MJWeakSelf;
-        [_sortView sortAction:^(SORT_TYPE type) {
-            [weakSelf sortWithType:type];
-        }];
-        [self.dateFormatter setDateFormat:@"yyyy年M月"];
-        NSDate *currentDate = [NSDate date];
-        [self.sortView.firstButton setTitle:[self.dateFormatter stringFromDate:currentDate] forState:UIControlStateNormal];
-        [self addSubview:self.sortView];
-    }
-    if (self.teacherAuthPass == NO) {
-        [self showAuthView];
-    }
-    else {
-        [self hideAuthView];
-    }
-}
-
-- (void)sortWithType:(SORT_TYPE)type {
-    
-    if (type == SORT_TYPE_TIME) { // time
-        [self showPickerView];
-    }
-    else if (type == SORT_TYPE_STATUS) { // 状态
-        [self.popView refreshWithSourceArray:@[@"全部",@"未开始",@"进行中",@"已结束"] preChooseIndex:_secondChooseIndex inView:self actionItem:1];
-    }
-    else if (type == SORT_TYPE_SUBJECT) {
-        if (self.subjectList.count) {
-            NSMutableArray *nameArray = [NSMutableArray array];
-            [nameArray addObject:@"全部"];
-            for (NSDictionary *parm in self.subjectList) {
-                [nameArray addObject:[parm ks_stringValueForKey:@"subjectName"]];
-            }
-            MJWeakSelf;
-            KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"声部筛选" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
-                if (chooseIndex == 0) {
-                    [weakSelf.sortView.thirdButton setTitle:@"全部声部" forState:UIControlStateNormal];
-                    weakSelf.subjectId = nil;
-                }
-                else {
-                    [weakSelf.sortView.thirdButton setTitle:returnValue forState:UIControlStateNormal];
-                    NSDictionary *parm = self.subjectList[chooseIndex-1];
-                    weakSelf.subjectId = [parm ks_stringValueForKey:@"subjectId"];
-                }
-                self.sortView.thirdArrowUp = NO;
-                [weakSelf refreshAndRequestData];
-            } cancel:^{
-                self.sortView.thirdArrowUp = NO;
-            }];
-            [picker showPicker];
-        }
-        else {
-            self.sortView.thirdArrowUp = NO;
-        }
-
-    }
-    else {
-        [self hiddenPopView];
-    }
-}
-
-- (void)showPickerView {
-    KSFullDatePicker *picker = [[KSFullDatePicker alloc] initWithTitle:@"" date:[NSDate date] pickMode:KSDATEPICKER_MODE_YEAR_MONTH sureButtonColor:THEMECOLOR selectDateBlock:^(NSString *date) {
-        
-        self.classDate = date;
-        NSString *displayTime = [self getTimeDisplay:date];
-        [self.sortView.firstButton setTitle:displayTime forState:UIControlStateNormal];
-        [self resetPickerStatus];
-        // 请求数据
-        [self refreshAndRequestData];
-    } cancleBlock:^{
-        [self resetPickerStatus];
-    }];
-    [picker show];
-}
-
-
-- (NSString *)getTimeDisplay:(NSString *)chooseMonth {
-    [self.dateFormatter setDateFormat:@"yyyy-MM"];
-    NSDate *chooseDate = [self.dateFormatter dateFromString:chooseMonth];
-    [self.dateFormatter setDateFormat:@"yyyy年M月"];
-    NSString *displayTime = [self.dateFormatter stringFromDate:chooseDate];
-    return displayTime;
-}
-- (void)resetPickerStatus {
-    self.sortView.firstArrowUp = NO;
-}
-
-- (NewClassPopView *)popView {
-    if (!_popView) {
-        MJWeakSelf;
-        _popView = [[NewClassPopView alloc] initWithFrame:CGRectMake(0, 55, kScreenWidth, kScreenHeight - 55 - kNaviBarHeight - iPhoneXSafeBottomMargin) tableColor:HexRGB(0xf8f9fc) chooseCallback:^(NSString * _Nonnull sortStr, NSInteger chooseIndex, NSInteger item) {
-            if (chooseIndex != 0) {
-                // 回调
-                [weakSelf sortWithChooseIndex:chooseIndex item:item title:sortStr];
-            }
-            [weakSelf hiddenPopView];
-        }];
-    }
-    return _popView;
-}
-
-- (void)sortWithChooseIndex:(NSInteger)chooseIndex item:(NSInteger)item title:(NSString *)title {
-    if (item == 0) { //
-    }
-    else if (item == 1) { // 课程状态
-        self.secondChooseIndex = chooseIndex;
-        self.thirdChooseIndex = 0;
-        [self.sortView.secondButton setTitle:title forState:UIControlStateNormal];
-        switch (chooseIndex) {
-            case 1:
-            {
-                self.status = nil;
-                [self.sortView.secondButton setTitle:@"课程状态" forState:UIControlStateNormal];
-            }
-                break;
-            case 2:
-            {
-                self.status = @"NOT_START";
-            }
-                break;
-            case 3:
-            {
-                self.status = @"ING";
-            }
-                break;
-            case 4:
-            {
-                self.status = @"COMPLETE";
-            }
-                break;
-                
-            default:
-                break;
-        }
-    }
-    else if (item == 2) { // 声部筛选
-        self.thirdChooseIndex = chooseIndex;
-        [self.sortView.thirdButton setTitle:title forState:UIControlStateNormal];
-        if (chooseIndex == 1) {
-            self.subjectId = nil;
-            [self.sortView.thirdButton setTitle:@"全部声部" forState:UIControlStateNormal];
-        }
-        else {
-            NSDictionary *parm = self.subjectMessageArray[chooseIndex-1];
-            self.subjectId = [parm ks_stringValueForKey:@"subjectId"];
-        }
-    }
-    [self resetParamenter];
-    [self requestData];
-}
-
-
-- (void)hiddenPopView {
-    self.sortView.firstArrowUp = NO;
-    self.sortView.secondArrowUp = NO;
-    self.sortView.thirdArrowUp = NO;
-    [self.popView hiddenView];
-}
-
-#pragma mark - UITableViewDataSource
-- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return self.dataArray.count;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return 127.0f;
-}
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-    MusicRoomListModel *model = self.dataArray[indexPath.row];
-    MusicRoomCourseCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MusicRoomCourseCell"];
-    MJWeakSelf;
-    [cell configWithSource:model beforeTime:0 callback:^(NSString * _Nonnull targetId) {
-        [weakSelf chatAction:targetId];
-    }];
-    return cell;
-}
-
-- (void)showMusicRoomDetail:(MusicRoomListModel *)model {
-    MusicRoomViewController *detailVC = [[MusicRoomViewController alloc] init];
-    detailVC.courseId = model.courseId;
-    [self.naviController pushViewController:detailVC animated:YES];
-}
-
-- (void)chatAction:(NSString *)targetId {
-    if ([NSString isEmptyString:targetId]) {
-        [LOADING_MANAGER MBShowAUTOHidingInWindow:@"报名未结束,暂无群组"];
-        return;
-    }
-    TUIChatConversationModel *model = [[TUIChatConversationModel alloc] init];
-    model.groupID = targetId;
-    KSGroupConversationController *ctrl = [[KSGroupConversationController alloc] init];
-    ctrl.conversation = model;
-    [self.naviController pushViewController:ctrl animated:YES];
-}
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-    // 琴房课详情
-    MusicRoomListModel *model = self.dataArray[indexPath.row];
-    [self showMusicRoomDetail:model];
-}
-
-/**
- 设置没有数据时的显示
- 
- @param promptString 提示语
- @param imgName 图片名称
- @param view 显示在什么地方
- */
-- (void)setPromptString:(NSString *)promptString imageName:(NSString *)imgName inView:(UIView *)view {
-    if (self.promptView != nil) {
-        [self.promptView removeFromSuperview];
-    }
-    else {
-        self.promptView = [[StateView alloc]init];
-        self.promptView.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight - 300);
-    }
-    _promptPlaceView = view;
-    //当请求不到数据时 ,自定义提示view 将会出现;
-    self.promptView.imageName = imgName;
-    self.promptView.alpha = 0.0f;
-    [self.promptView setText:promptString];
-    [view addSubview:self.promptView];
-}
-
-// 结束刷新后调用方法
-- (void)changePromptLabelStateWithArray:(NSMutableArray *)array {
-    NSInteger count;
-    if (array.count) {
-        count = array.count;
-    } else {
-        count = 0;
-    }
-    
-    [UIView animateWithDuration:0.1 animations:^{
-        [[self promptView] setAlpha:count ? 0.0f :1.0f ] ;
-    }] ;
-    
-}
-
-- (BOOL)networkAvaiable {
-    return [self checkNetworkAvaiable];
-}
-
-- (BOOL)checkNetworkAvaiable {
-    BOOL isExistenceNetwork = YES;
-    Reachability *reach = [Reachability reachabilityWithHostName:@"www.apple.com"];
-    switch ([reach currentReachabilityStatus]) {
-        case NotReachable:
-            isExistenceNetwork = NO;
-            //NSLog(@"notReachable");
-            break;
-        case ReachableViaWiFi:
-            isExistenceNetwork = YES;
-            //NSLog(@"WIFI");
-            break;
-        case ReachableViaWWAN:
-            isExistenceNetwork = YES;
-            //NSLog(@"3G");
-            break;
-    }
-    return isExistenceNetwork;
-}
-#pragma mark ----- lazying
-- (NSDateFormatter *)dateFormatter {
-    if (!_dateFormatter) {
-        _dateFormatter = [NSObject getDateformatter];
-    }
-    return _dateFormatter;
-}
-
-- (void)setSubjectList:(NSMutableArray *)subjectList {
-    _subjectList = subjectList;
-    self.thirdChooseIndex = 0;
-}
-
-- (void)setTeaherStatus:(NSString *)teaherStatus {
-    _teaherStatus = teaherStatus;
-    if ([teaherStatus isEqualToString:@"UNPAALY"]) { // 未申请
-        self.teacherAuthPass = NO;
-    }
-    else if ([teaherStatus isEqualToString:@"DOING"]) { // 审核中
-        self.teacherAuthPass = NO;
-    }
-    else if ([teaherStatus isEqualToString:@"UNPASS"]) {  // 不通过
-        self.teacherAuthPass = NO;
-    }
-    else  {
-        self.teacherAuthPass = YES;
-    }
-    
-    if (self.teacherAuthPass == NO) {
-        [self showAuthView];
-    }
-    else {
-        [self hideAuthView];
-    }
-}
-
-- (void)configAuthDisplay {
-    [self.authView configDisplayMessage:[self getAuthDisplayMessage]];
-    if ([self.teaherStatus isEqualToString:@"DOING"]) {
-        self.authView.sureButton.userInteractionEnabled = NO;
-        self.authView.sureButton.hidden = YES;
-    }
-    else {
-        self.authView.sureButton.userInteractionEnabled = YES;
-        self.authView.sureButton.hidden = NO;
-    }
-}
-
-- (void)showAuthView {
-    [self configAuthDisplay];
-    if ([self.subviews containsObject:self.authView]) {
-        [self bringSubviewToFront:self.authView];
-    }
-    else {
-        [self addSubview:self.authView];
-        [self.authView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.top.bottom.right.mas_equalTo(self);
-        }];
-    }
-}
-
-- (void)hideAuthView {
-    if ([self.subviews containsObject:self.authView]) {
-        [self.authView removeFromSuperview];
-        self.authView = nil;
-    }
-}
-
-- (AuthDisplayView *)authView {
-    if (!_authView) {
-        _authView = [AuthDisplayView shareInstance];
-        [_authView.imageView setImage:[UIImage imageNamed:[self getAuthDisplayImage]]];
-        [_authView configDisplayMessage:[self getAuthDisplayMessage]];
-        MJWeakSelf;
-        [_authView sureCallback:^{
-            [weakSelf authAction];
-        }];
-    }
-    return _authView;
-}
-
-- (NSString *)getAuthDisplayImage {
-    return @"authTeacher_accompany";
-}
-
-- (NSString *)getAuthDisplayMessage {
-    
-    if ([self.teaherStatus isEqualToString:@"DOING"]) { // 审核中
-        return @"您已提交认证申请,请耐心等待审核结果~";
-    }
-    else {
-        return @"您还没有完成达人认证,认证后才可设置琴房课哦~";
-    }
-    
-}
-
-- (void)authAction {
-    KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-    webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/teacherCert"];
-    [self.naviController pushViewController:webCtrl animated:YES];
-}
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end

+ 0 - 22
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoCourseBodyView.h

@@ -1,22 +0,0 @@
-//
-//  MyVideoCourseBodyView.h
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/4/18.
-//
-
-#import <kSJXCollectionView.h>
-#import "StateView.h"
-#import "Reachability.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MyVideoCourseBodyView : kSJXCollectionView
-
-@property (nonatomic, strong) NSString *teaherStatus;
-
-@property (nonatomic, strong) NSMutableArray *subjectList;
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 396
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoCourseBodyView.m

@@ -1,396 +0,0 @@
-//
-//  MyVideoCourseBodyView.m
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/4/18.
-//
-
-#import "MyVideoCourseBodyView.h"
-#import "VideoCourseCell.h"
-#import "VideoCourseModel.h"
-#import "KSBaseWKWebViewController.h"
-#import "AuthDisplayView.h"
-#import "MyVideoSearchView.h"
-#import <KSChoosePicker.h>
-
-@interface MyVideoCourseBodyView ()<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
-
-@property (nonatomic, strong) NSMutableArray *dataArray;
-
-@property (nonatomic, strong) StateView *promptView;
-@property (nonatomic, strong) UIView *promptPlaceView;
-
-@property (nonatomic, assign) BOOL networkAvaiable; // 网络是否可用
-
-@property (nonatomic, assign) BOOL isLoadMore;
-@property (nonatomic, assign) NSInteger rows;
-@property (nonatomic, assign) NSInteger pages;
-
-@property (nonatomic, strong) NSString *audioStatus;
-
-@property (nonatomic, strong) NSString *searchKey;
-
-@property (nonatomic, strong) AuthDisplayView *authView;
-
-@property (nonatomic, copy) MyVideoSearchView *sortView;
-
-@property (nonatomic, assign) BOOL authStatus;
-
-@end
-
-@implementation MyVideoCourseBodyView
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    self = [super initWithFrame:frame];
-    if (self) {
-        self.backgroundColor = HexRGB(0xf8f9fc);
-        UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
-        layout.sectionInset = UIEdgeInsetsMake(0, 14, 12, 14);
-        
-        self.collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 0, frame.size.width, frame.size.height) collectionViewLayout:layout];
-        self.collectionView.backgroundColor = HexRGB(0xf8f9fc);
-        self.collectionView.delegate = self;
-        self.collectionView.dataSource = self;
-        self.collectionView.showsVerticalScrollIndicator = NO;
-        self.collectionView.showsHorizontalScrollIndicator = NO;
-        [self.collectionView registerNib:[UINib nibWithNibName:@"VideoCourseCell" bundle:[NSBundle mainBundle]] forCellWithReuseIdentifier:@"VideoCourseCell"];
-        [self addSubview:self.collectionView];
-        MJWeakSelf;
-        self.collectionView.mj_header = [KSGifRefreshHeader headerWithRefreshingBlock:^{
-            [weakSelf resetParamenter];
-            [weakSelf requestData];
-        }];
-        self.collectionView.mj_footer = [KSGifRefreshFooter footerWithRefreshingBlock:^{
-            if (weakSelf.isLoadMore) {
-                weakSelf.pages += 1;
-                [weakSelf requestData];
-            }
-            else {
-                [weakSelf.collectionView.mj_footer endRefreshingWithNoMoreData];
-            }
-        }];
-    }
-    return self;
-}
-
-- (void)endRefresh {
-    @weakObj(self);
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        @strongObj(self);
-        [self.collectionView.mj_header endRefreshing];
-        [self.collectionView.mj_footer endRefreshing];
-    });
-}
-
-- (void)refreshAndRequestData {
-    [self resetParamenter];
-    [self requestData];
-}
-
-- (void)resetParamenter {
-    self.isLoadMore = YES;
-    self.pages = 1;
-    self.rows = 10;
-    self.audioStatus = @"PASS";
-    self.dataArray = [NSMutableArray array];
-    [self.collectionView.mj_footer resetNoMoreData];
-    [self setPromptString:@"暂无课程" imageName:@"empty_course" inView:self.collectionView];
-    [self.collectionView reloadData];
-}
-
-- (void)requestData {
-    [KSNetworkingManager videoLessonListRequest:KS_POST lessonSubject:self.searchKey auditStatus:self.audioStatus pageNo:self.pages pageSize:self.rows success:^(NSDictionary * _Nonnull dic) {
-        [self endRefresh];
-        if ([dic ks_integerValueForKey:@"code"] == 200 && [dic ks_boolValueForKey:@"status"]) {
-            NSArray *sourceArray = [[dic ks_dictionaryValueForKey:@"data"] ks_arrayValueForKey:@"rows"];
-            for (NSDictionary *parm in sourceArray) {
-                VideoCourseModel *model = [[VideoCourseModel alloc] initWithDictionary:parm];
-                [self.dataArray addObject:model];
-            }
-            
-            if (sourceArray.count < self.rows) {
-                self.isLoadMore = NO;
-            }
-        }
-        else {
-            [LOADING_MANAGER MBShowAUTOHidingInWindow:MESSAGEKEY];
-        }
-        [self.collectionView reloadData];
-        [self changePromptLabelStateWithArray:self.dataArray];
-    } faliure:^(NSError * _Nonnull error) {
-        [self endRefresh];
-        if (self.networkAvaiable == NO) {
-            [self setPromptString:@"暂无网络" imageName:@"no_networking" inView:self.collectionView];
-        }
-        [self.dataArray removeAllObjects];
-        [self.collectionView reloadData];
-        [self changePromptLabelStateWithArray:self.dataArray];
-    }];
-}
-
-- (void)beginRefreshImmediately {
-    [self.collectionView.mj_header beginRefreshing];
-}
-
-- (void)selectCellAtIndexPath:(NSIndexPath *)indexPath {
-    
-    if (self.lastSelectedIndexPath == indexPath) {
-        return;
-    }
-    if (self.lastSelectedIndexPath != nil) {
-        UICollectionViewCell *cell = [self.collectionView cellForItemAtIndexPath:self.lastSelectedIndexPath];
-        [cell setSelected:NO];
-    }
-    UICollectionViewCell *cell = [self.collectionView cellForItemAtIndexPath:indexPath];
-    [cell setSelected:YES];
-    self.lastSelectedIndexPath = indexPath;
-}
-
-- (void)layoutSubviews {
-    [super layoutSubviews];
-    CGFloat topHeight = 50.0f;
-    self.collectionView.frame = CGRectMake(0, topHeight, self.bounds.size.width, self.bounds.size.height - topHeight);
-    if (!_sortView) {
-        _sortView = [MyVideoSearchView shareInstance];
-        _sortView.frame = CGRectMake(0, 0, kScreenWidth, 50);
-        MJWeakSelf;
-        [_sortView sortAction:^{
-            [weakSelf showSortView];
-        }];
-
-        [self addSubview:self.sortView];
-    }
-    if (self.authStatus == NO) {
-        [self showAuthView];
-    }
-    else {
-        [self hideAuthView];
-    }
-}
-
-- (void)showSortView {
-    if (self.subjectList.count) {
-        NSMutableArray *nameArray = [NSMutableArray array];
-        [nameArray addObject:@"全部"];
-        for (NSDictionary *parm in self.subjectList) {
-            [nameArray addObject:[parm ks_stringValueForKey:@"subjectName"]];
-        }
-        MJWeakSelf;
-        KSChoosePicker *picker = [[KSChoosePicker alloc] initWithTitle:@"声部筛选" sourceData:nameArray lastChooseIndex:0 sureButtonColor:THEMECOLOR chooseReturnWithBlock:^(NSString * _Nonnull returnValue, NSInteger chooseIndex) {
-            if (chooseIndex == 0) {
-                weakSelf.sortView.sortTitleLabel.text = @"全部声部";
-                weakSelf.searchKey = nil;
-            }
-            else {
-                weakSelf.sortView.sortTitleLabel.text = returnValue;
-                NSDictionary *parm = self.subjectList[chooseIndex-1];
-                weakSelf.searchKey = [parm ks_stringValueForKey:@"subjectId"];
-            }
-            self.sortView.arrowUp = NO;
-            [weakSelf refreshAndRequestData];
-        } cancel:^{
-            self.sortView.arrowUp = NO;
-        }];
-        [picker showPicker];
-    }
-    else {
-        [LOADING_MANAGER MBShowAUTOHidingInWindow:@"无声部信息"];
-        self.sortView.arrowUp = NO;
-    }
-}
-
-- (void)beginFirstRefresh {
-    if (!self.isHeaderRefreshed) {
-        [self beginRefreshImmediately];
-    }
-}
-#pragma mark ----- collection view
-- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
-    return 1;
-}
-- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
-    return self.dataArray.count;
-}
-
-- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
-    VideoCourseCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"VideoCourseCell" forIndexPath:indexPath];
-    
-    VideoCourseModel *model = [self.dataArray objectAtIndex:indexPath.row];
-    [cell configSourceModel:model groupStatus:VIDEOGRROUP_STATUS_ING hideBottomView:YES];
-    return cell;
-}
-
-
-- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
-    VideoCourseModel *model = [self.dataArray objectAtIndex:indexPath.row];
-    NSString *url = [NSString stringWithFormat:@"%@%@%@", WEBHOST, @"/#/videoDetail?groupId=",model.internalBaseClassIdentifier];
-    KSBaseWKWebViewController *ctrl = [[KSBaseWKWebViewController alloc] init];
-    ctrl.url = url;
-    [self.naviController pushViewController:ctrl animated:YES];
-}
-
-- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-    return CGSizeMake((kScreenWidth - 28 - 11) / 2.0f, 210);
-}
-/**
- 设置没有数据时的显示
- 
- @param promptString 提示语
- @param imgName 图片名称
- @param view 显示在什么地方
- */
-- (void)setPromptString:(NSString *)promptString imageName:(NSString *)imgName inView:(UIView *)view {
-    if (self.promptView != nil) {
-        [self.promptView removeFromSuperview];
-    }
-    else {
-        self.promptView = [[StateView alloc]init];
-        self.promptView.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight - 300);
-    }
-    _promptPlaceView = view;
-    //当请求不到数据时 ,自定义提示view 将会出现;
-    self.promptView.imageName = imgName;
-    self.promptView.alpha = 0.0f;
-    [self.promptView setText:promptString];
-    [view addSubview:self.promptView];
-}
-
-// 结束刷新后调用方法
-- (void)changePromptLabelStateWithArray:(NSMutableArray *)array {
-    NSInteger count;
-    if (array.count) {
-        count = array.count;
-    } else {
-        count = 0;
-    }
-    
-    [UIView animateWithDuration:0.1 animations:^{
-        [[self promptView] setAlpha:count ? 0.0f :1.0f ] ;
-        
-    }] ;
-    
-}
-
-- (BOOL)networkAvaiable {
-    return [self checkNetworkAvaiable];
-}
-
-- (BOOL)checkNetworkAvaiable {
-    BOOL isExistenceNetwork = YES;
-    Reachability *reach = [Reachability reachabilityWithHostName:@"www.apple.com"];
-    switch ([reach currentReachabilityStatus]) {
-        case NotReachable:
-            isExistenceNetwork = NO;
-            //NSLog(@"notReachable");
-            break;
-        case ReachableViaWiFi:
-            isExistenceNetwork = YES;
-            //NSLog(@"WIFI");
-            break;
-        case ReachableViaWWAN:
-            isExistenceNetwork = YES;
-            //NSLog(@"3G");
-            break;
-    }
-    return isExistenceNetwork;
-}
-
-
-
-- (NSMutableArray *)dataArray {
-    if (!_dataArray) {
-        _dataArray = [NSMutableArray array];
-    }
-    return _dataArray;
-}
-
-- (void)setTeaherStatus:(NSString *)teaherStatus {
-    _teaherStatus = teaherStatus;
-    
-    if ([teaherStatus isEqualToString:@"PASS"]) {
-        self.authStatus = YES;
-    }
-    else {
-        self.authStatus = NO;
-    }
-    
-    if (self.authStatus == NO) {
-        [self showAuthView];
-    }
-    else {
-        [self hideAuthView];
-    }
-}
-
-- (void)configAuthDisplay {
-    [self.authView configDisplayMessage:[self getAuthDisplayMessage]];
-    if ([self.teaherStatus isEqualToString:@"DOING"]) {
-        self.authView.sureButton.userInteractionEnabled = NO;
-        self.authView.sureButton.hidden = YES;
-    }
-    else {
-        self.authView.sureButton.userInteractionEnabled = YES;
-        self.authView.sureButton.hidden = NO;
-    }
-}
-
-- (void)showAuthView {
-    [self configAuthDisplay];
-    if ([self.subviews containsObject:self.authView]) {
-        [self bringSubviewToFront:self.authView];
-    }
-    else {
-        [self addSubview:self.authView];
-        [self.authView mas_makeConstraints:^(MASConstraintMaker *make) {
-            make.left.top.bottom.right.mas_equalTo(self);
-        }];
-    }
-}
-
-- (void)hideAuthView {
-    if ([self.subviews containsObject:self.authView]) {
-        [self.authView removeFromSuperview];
-        self.authView = nil;
-    }
-}
-
-- (AuthDisplayView *)authView {
-    if (!_authView) {
-        _authView = [AuthDisplayView shareInstance];
-        [_authView.imageView setImage:[UIImage imageNamed:[self getAuthDisplayImage]]];
-        [_authView configDisplayMessage:[self getAuthDisplayMessage]];
-        MJWeakSelf;
-        [_authView sureCallback:^{
-            [weakSelf authAction];
-        }];
-    }
-    return _authView;
-}
-
-- (NSString *)getAuthDisplayImage {
-    return @"authTeacher_accompany";
-}
-
-- (NSString *)getAuthDisplayMessage {
-    if ([self.teaherStatus isEqualToString:@"DOING"]) {
-        return @"您已提交认证申请,请耐心等待审核结果~";
-    }
-    else {
-        return @"您还没有完成达人认证,认证后才可创建视频课哦~";
-    }
-}
-
-- (void)authAction {
-    KSBaseWKWebViewController *webCtrl = [[KSBaseWKWebViewController alloc] init];
-    webCtrl.url = [NSString stringWithFormat:@"%@%@", WEBHOST, @"/#/teacherCert"];
-    [self.naviController pushViewController:webCtrl animated:YES];
-}
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end

+ 0 - 26
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoSearchView.h

@@ -1,26 +0,0 @@
-//
-//  MyVideoSearchView.h
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/4/18.
-//
-
-#import <UIKit/UIKit.h>
-
-typedef void(^VideoSearchCallback)(void);
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MyVideoSearchView : UIView
-
-@property (weak, nonatomic) IBOutlet UILabel *sortTitleLabel;
-
-@property (nonatomic, assign) BOOL arrowUp;
-
-+ (instancetype)shareInstance;
-
-- (void)sortAction:(VideoSearchCallback)callback;
-
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 56
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoSearchView.m

@@ -1,56 +0,0 @@
-//
-//  MyVideoSearchView.m
-//  KulexiuForTeacher
-//
-//  Created by 王智 on 2022/4/18.
-//
-
-#import "MyVideoSearchView.h"
-
-@interface MyVideoSearchView ()
-
-@property (weak, nonatomic) IBOutlet UIImageView *arrowImage;
-
-@property (nonatomic, copy) VideoSearchCallback callback;
-
-@end
-
-@implementation MyVideoSearchView
-
-- (void)awakeFromNib {
-    [super awakeFromNib];
-    self.arrowUp = NO;
-}
-
-+ (instancetype)shareInstance {
-    MyVideoSearchView *view = [[[NSBundle mainBundle] loadNibNamed:@"MyVideoSearchView" owner:nil options:nil] firstObject];
-    return view;
-}
-
-- (void)sortAction:(VideoSearchCallback)callback {
-    if (callback) {
-        self.callback = callback;
-    }
-}
-
-- (void)setArrowUp:(BOOL)arrowUp {
-    _arrowUp = arrowUp;
-    NSString *imageName = arrowUp ? @"sort_up" : @"sort_down";
-    [_arrowImage setImage:[UIImage imageNamed:imageName]];
-}
-
-- (IBAction)buttonClickAction:(id)sender {
-    if (self.callback) {
-        self.callback();
-    }
-}
-
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
-}
-*/
-
-@end

+ 0 - 59
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MyVideoSearchView.xib

@@ -1,59 +0,0 @@
-<?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">
-    <device id="retina6_1" orientation="portrait" appearance="light"/>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
-        <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="MyVideoSearchView">
-            <rect key="frame" x="0.0" y="0.0" width="414" height="68"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全部声部" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="83Y-CJ-rl9">
-                    <rect key="frame" x="14" y="24" width="57.5" height="20"/>
-                    <constraints>
-                        <constraint firstAttribute="height" constant="20" id="jz6-Eh-bv8"/>
-                    </constraints>
-                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="sort_down" translatesAutoresizingMaskIntoConstraints="NO" id="Qnv-gf-35O">
-                    <rect key="frame" x="77.5" y="31" width="8" height="6"/>
-                </imageView>
-                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RSG-G5-NY6">
-                    <rect key="frame" x="14" y="17" width="71.5" height="34"/>
-                    <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                    <connections>
-                        <action selector="buttonClickAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="UD9-7X-fvK"/>
-                    </connections>
-                </button>
-            </subviews>
-            <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-            <constraints>
-                <constraint firstItem="83Y-CJ-rl9" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="2Qn-zI-ggO"/>
-                <constraint firstItem="Qnv-gf-35O" firstAttribute="centerY" secondItem="RSG-G5-NY6" secondAttribute="centerY" id="40q-wN-1Mw"/>
-                <constraint firstItem="Qnv-gf-35O" firstAttribute="leading" secondItem="83Y-CJ-rl9" secondAttribute="trailing" constant="6" id="4jV-hI-8XX"/>
-                <constraint firstItem="Qnv-gf-35O" firstAttribute="centerY" secondItem="83Y-CJ-rl9" secondAttribute="centerY" id="6Hz-mC-791"/>
-                <constraint firstItem="83Y-CJ-rl9" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="centerY" id="DwU-ME-nbE"/>
-                <constraint firstItem="Qnv-gf-35O" firstAttribute="trailing" secondItem="RSG-G5-NY6" secondAttribute="trailing" id="Ssn-xe-f1k"/>
-                <constraint firstItem="83Y-CJ-rl9" firstAttribute="leading" secondItem="RSG-G5-NY6" secondAttribute="leading" id="aAw-eb-8kF"/>
-            </constraints>
-            <nil key="simulatedTopBarMetrics"/>
-            <nil key="simulatedBottomBarMetrics"/>
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
-            <connections>
-                <outlet property="arrowImage" destination="Qnv-gf-35O" id="daH-V6-SNb"/>
-                <outlet property="sortTitleLabel" destination="83Y-CJ-rl9" id="d1k-0Z-mv0"/>
-            </connections>
-            <point key="canvasLocation" x="131.8840579710145" y="-108.48214285714285"/>
-        </view>
-    </objects>
-    <resources>
-        <image name="sort_down" width="8" height="6"/>
-    </resources>
-</document>

+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MusicRoomCourseCell.h → KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/PopView/MusicRoomCourseCell.h


+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MusicRoomCourseCell.m → KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/PopView/MusicRoomCourseCell.m


+ 0 - 0
KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/MusicRoomCourseCell.xib → KulexiuForTeacher/KulexiuForTeacher/Module/Home/MyCourse/View/PopView/MusicRoomCourseCell.xib