HF_Q 4 年 前
コミット
f68296a2d2
共有51 個のファイルを変更した2585 個の追加332 個の削除を含む
  1. 98 6
      smartRhino.xcodeproj/project.pbxproj
  2. BIN
      smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/UserInterfaceState.xcuserstate
  3. BIN
      smartRhino/Assets.xcassets/首页/Book_alert_close.imageset/Book_alert_close@2x.png
  4. BIN
      smartRhino/Assets.xcassets/首页/Book_alert_close.imageset/Book_alert_close@3x.png
  5. 22 0
      smartRhino/Assets.xcassets/首页/Book_alert_close.imageset/Contents.json
  6. BIN
      smartRhino/Assets.xcassets/首页/Book_close_btn.imageset/Book_close_btn@2x.png
  7. BIN
      smartRhino/Assets.xcassets/首页/Book_close_btn.imageset/Book_close_btn@3x.png
  8. 22 0
      smartRhino/Assets.xcassets/首页/Book_close_btn.imageset/Contents.json
  9. BIN
      smartRhino/Assets.xcassets/首页/Book_close_gray.imageset/Book_close_gray@2x.png
  10. BIN
      smartRhino/Assets.xcassets/首页/Book_close_gray.imageset/Book_close_gray@3x.png
  11. 22 0
      smartRhino/Assets.xcassets/首页/Book_close_gray.imageset/Contents.json
  12. BIN
      smartRhino/Assets.xcassets/首页/Book_huan_Btn.imageset/Book_huan_Btn@2x.png
  13. BIN
      smartRhino/Assets.xcassets/首页/Book_huan_Btn.imageset/Book_huan_Btn@3x.png
  14. 22 0
      smartRhino/Assets.xcassets/首页/Book_huan_Btn.imageset/Contents.json
  15. BIN
      smartRhino/Assets.xcassets/首页/Book_payalert_bg.imageset/Book_payalert_bg@2x.png
  16. BIN
      smartRhino/Assets.xcassets/首页/Book_payalert_bg.imageset/Book_payalert_bg@3x.png
  17. 22 0
      smartRhino/Assets.xcassets/首页/Book_payalert_bg.imageset/Contents.json
  18. 12 0
      smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/MyTDTopic.storyboard
  19. 1 0
      smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/MyTDTopicDetailVC.h
  20. 2 0
      smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/MyTDTopicDetailVC.m
  21. 451 89
      smartRhino/Project/VCModel/Home/VC/BookStore/BookStore.storyboard
  22. 19 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookAlertModel.h
  23. 13 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookAlertModel.m
  24. 27 26
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookContentNavVC.m
  25. 1 1
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookPlayListVC.m
  26. 7 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookStoreHome.m
  27. 4 4
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWeiCousreVC.h
  28. 617 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWCDetailVC.m
  29. 17 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWeiCourseListVC.h
  30. 118 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWeiCourseListVC.m
  31. 0 135
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWeiCousreVC.m
  32. 26 35
      smartRhino/Project/VCModel/Home/VC/BookStore/View/BookContentCell.xib
  33. 2 0
      smartRhino/Project/VCModel/Home/VC/BookStore/View/BookContentLeftCell.h
  34. 21 8
      smartRhino/Project/VCModel/Home/VC/BookStore/View/BookContentLeftCell.m
  35. 29 15
      smartRhino/Project/VCModel/Home/VC/BookStore/View/BookContentLeftCell.xib
  36. 26 0
      smartRhino/Project/VCModel/Home/VC/BookStore/View/PayBookAlertCell.h
  37. 41 0
      smartRhino/Project/VCModel/Home/VC/BookStore/View/PayBookAlertCell.m
  38. 60 0
      smartRhino/Project/VCModel/Home/VC/BookStore/View/PayBookAlertCell.xib
  39. 37 5
      smartRhino/Project/VCModel/Home/VC/HomeViewController.m
  40. 32 0
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCell.h
  41. 93 0
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCell.m
  42. 244 0
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCell.xib
  43. 18 0
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCollectCell.h
  44. 18 0
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCollectCell.m
  45. 48 0
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCollectCell.xib
  46. 12 3
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCell.h
  47. 94 2
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCell.m
  48. 182 3
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCell.xib
  49. 18 0
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCollectCell.h
  50. 26 0
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCollectCell.m
  51. 61 0
      smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCollectCell.xib

+ 98 - 6
smartRhino.xcodeproj/project.pbxproj

@@ -835,8 +835,12 @@
 		EB6E84D6246FB90300BE0524 /* HomeUserPrivilegeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB6E84D4246FB90300BE0524 /* HomeUserPrivilegeCell.xib */; };
 		EB6E84DA246FD1BF00BE0524 /* HomeWeiCousreCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6E84D8246FD1BF00BE0524 /* HomeWeiCousreCell.m */; };
 		EB6E84DB246FD1BF00BE0524 /* HomeWeiCousreCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB6E84D9246FD1BF00BE0524 /* HomeWeiCousreCell.xib */; };
-		EB6E84DF246FD67100BE0524 /* BookWeiCousreVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6E84DE246FD67100BE0524 /* BookWeiCousreVC.m */; };
 		EB6E84E2246FDF2400BE0524 /* BookPlayListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6E84E1246FDF2400BE0524 /* BookPlayListVC.m */; };
+		EB6F001F247381FD00808484 /* HomeProblemTopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6F001D247381FD00808484 /* HomeProblemTopCell.m */; };
+		EB6F0020247381FD00808484 /* HomeProblemTopCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB6F001E247381FD00808484 /* HomeProblemTopCell.xib */; };
+		EB6F002424738F0100808484 /* HomeProblemTopCollectCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6F002224738F0100808484 /* HomeProblemTopCollectCell.m */; };
+		EB6F002524738F0100808484 /* HomeProblemTopCollectCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB6F002324738F0100808484 /* HomeProblemTopCollectCell.xib */; };
+		EB6F002D2473B19300808484 /* BookWeiCourseListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6F002C2473B19300808484 /* BookWeiCourseListVC.m */; };
 		EB71EEFC240E565B0089B1A6 /* FlowAttachmentsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB71EEFB240E565B0089B1A6 /* FlowAttachmentsModel.m */; };
 		EB77B293239F9A4F0050A3C0 /* ChatNewRowVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB77B292239F9A4F0050A3C0 /* ChatNewRowVC.m */; };
 		EB77B297239FCAF90050A3C0 /* ChatNewRowCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB77B295239FCAF90050A3C0 /* ChatNewRowCell.m */; };
@@ -1182,6 +1186,20 @@
 		EBF2D56323C2FB8F00EC35C4 /* MHConstant.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF2D56223C2FB8F00EC35C4 /* MHConstant.m */; };
 		EBF64A76241C73510074FD55 /* WorkFlowFecordSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF64A75241C73510074FD55 /* WorkFlowFecordSearchVC.m */; };
 		EBF64A79241C810A0074FD55 /* FecordSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF64A78241C810A0074FD55 /* FecordSearchVC.m */; };
+		EBF71753247229FB00ED1838 /* PayBookAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBF71750247229FA00ED1838 /* PayBookAlert.xib */; };
+		EBF71754247229FB00ED1838 /* PayBookAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF71752247229FB00ED1838 /* PayBookAlert.m */; };
+		EBF7175724722D4B00ED1838 /* BookWCDetailVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF7175624722D4B00ED1838 /* BookWCDetailVC.m */; };
+		EBF7175B2472355700ED1838 /* PayBookAlertCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF717592472355700ED1838 /* PayBookAlertCell.m */; };
+		EBF7175C2472355700ED1838 /* PayBookAlertCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBF7175A2472355700ED1838 /* PayBookAlertCell.xib */; };
+		EBF7175F247237DF00ED1838 /* BookAlertModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF7175E247237DF00ED1838 /* BookAlertModel.m */; };
+		EBF7176724723CBA00ED1838 /* BookCardPayAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF7176224723CB900ED1838 /* BookCardPayAlert.m */; };
+		EBF7176824723CBA00ED1838 /* BookCardPayAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBF7176324723CB900ED1838 /* BookCardPayAlert.xib */; };
+		EBF7177224725B7A00ED1838 /* BookCardPayAlertCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF7177024725B7900ED1838 /* BookCardPayAlertCell.m */; };
+		EBF7177324725B7A00ED1838 /* BookCardPayAlertCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBF7177124725B7A00ED1838 /* BookCardPayAlertCell.xib */; };
+		EBF7177724725EDF00ED1838 /* BookLoginPayAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF7177524725EDE00ED1838 /* BookLoginPayAlert.m */; };
+		EBF7177824725EDF00ED1838 /* BookLoginPayAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBF7177624725EDE00ED1838 /* BookLoginPayAlert.xib */; };
+		EBF7177C24726A4500ED1838 /* HomeWeiCousreCollectCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF7177A24726A4500ED1838 /* HomeWeiCousreCollectCell.m */; };
+		EBF7177D24726A4500ED1838 /* HomeWeiCousreCollectCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBF7177B24726A4500ED1838 /* HomeWeiCousreCollectCell.xib */; };
 		EBFA3765240391A900A584FC /* WebDetailCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBFA3764240391A900A584FC /* WebDetailCell.m */; };
 		EBFA5EF4246E374A00915D5F /* HomeMusicCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBFA5EF2246E374A00915D5F /* HomeMusicCell.m */; };
 		EBFA5EF5246E374A00915D5F /* HomeMusicCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBFA5EF3246E374A00915D5F /* HomeMusicCell.xib */; };
@@ -2670,10 +2688,16 @@
 		EB6E84D7246FD1BF00BE0524 /* HomeWeiCousreCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeWeiCousreCell.h; sourceTree = "<group>"; };
 		EB6E84D8246FD1BF00BE0524 /* HomeWeiCousreCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeWeiCousreCell.m; sourceTree = "<group>"; };
 		EB6E84D9246FD1BF00BE0524 /* HomeWeiCousreCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeWeiCousreCell.xib; sourceTree = "<group>"; };
-		EB6E84DD246FD67100BE0524 /* BookWeiCousreVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookWeiCousreVC.h; sourceTree = "<group>"; };
-		EB6E84DE246FD67100BE0524 /* BookWeiCousreVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookWeiCousreVC.m; sourceTree = "<group>"; };
 		EB6E84E0246FDF2400BE0524 /* BookPlayListVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookPlayListVC.h; sourceTree = "<group>"; };
 		EB6E84E1246FDF2400BE0524 /* BookPlayListVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookPlayListVC.m; sourceTree = "<group>"; };
+		EB6F001C247381FD00808484 /* HomeProblemTopCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeProblemTopCell.h; sourceTree = "<group>"; };
+		EB6F001D247381FD00808484 /* HomeProblemTopCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeProblemTopCell.m; sourceTree = "<group>"; };
+		EB6F001E247381FD00808484 /* HomeProblemTopCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeProblemTopCell.xib; sourceTree = "<group>"; };
+		EB6F002124738F0100808484 /* HomeProblemTopCollectCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeProblemTopCollectCell.h; sourceTree = "<group>"; };
+		EB6F002224738F0100808484 /* HomeProblemTopCollectCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeProblemTopCollectCell.m; sourceTree = "<group>"; };
+		EB6F002324738F0100808484 /* HomeProblemTopCollectCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeProblemTopCollectCell.xib; sourceTree = "<group>"; };
+		EB6F002B2473B19300808484 /* BookWeiCourseListVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookWeiCourseListVC.h; sourceTree = "<group>"; };
+		EB6F002C2473B19300808484 /* BookWeiCourseListVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookWeiCourseListVC.m; sourceTree = "<group>"; };
 		EB71EEFA240E565B0089B1A6 /* FlowAttachmentsModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FlowAttachmentsModel.h; sourceTree = "<group>"; };
 		EB71EEFB240E565B0089B1A6 /* FlowAttachmentsModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FlowAttachmentsModel.m; sourceTree = "<group>"; };
 		EB77B291239F9A4F0050A3C0 /* ChatNewRowVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChatNewRowVC.h; sourceTree = "<group>"; };
@@ -3236,6 +3260,28 @@
 		EBF64A75241C73510074FD55 /* WorkFlowFecordSearchVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WorkFlowFecordSearchVC.m; sourceTree = "<group>"; };
 		EBF64A77241C810A0074FD55 /* FecordSearchVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FecordSearchVC.h; sourceTree = "<group>"; };
 		EBF64A78241C810A0074FD55 /* FecordSearchVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FecordSearchVC.m; sourceTree = "<group>"; };
+		EBF71750247229FA00ED1838 /* PayBookAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PayBookAlert.xib; sourceTree = "<group>"; };
+		EBF71751247229FB00ED1838 /* PayBookAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PayBookAlert.h; sourceTree = "<group>"; };
+		EBF71752247229FB00ED1838 /* PayBookAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PayBookAlert.m; sourceTree = "<group>"; };
+		EBF7175524722D4B00ED1838 /* BookWCDetailVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookWCDetailVC.h; sourceTree = "<group>"; };
+		EBF7175624722D4B00ED1838 /* BookWCDetailVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookWCDetailVC.m; sourceTree = "<group>"; };
+		EBF717582472355700ED1838 /* PayBookAlertCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PayBookAlertCell.h; sourceTree = "<group>"; };
+		EBF717592472355700ED1838 /* PayBookAlertCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PayBookAlertCell.m; sourceTree = "<group>"; };
+		EBF7175A2472355700ED1838 /* PayBookAlertCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PayBookAlertCell.xib; sourceTree = "<group>"; };
+		EBF7175D247237DF00ED1838 /* BookAlertModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookAlertModel.h; sourceTree = "<group>"; };
+		EBF7175E247237DF00ED1838 /* BookAlertModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookAlertModel.m; sourceTree = "<group>"; };
+		EBF7176024723CB900ED1838 /* BookCardPayAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookCardPayAlert.h; sourceTree = "<group>"; };
+		EBF7176224723CB900ED1838 /* BookCardPayAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BookCardPayAlert.m; sourceTree = "<group>"; };
+		EBF7176324723CB900ED1838 /* BookCardPayAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BookCardPayAlert.xib; sourceTree = "<group>"; };
+		EBF7176F24725B7900ED1838 /* BookCardPayAlertCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookCardPayAlertCell.h; sourceTree = "<group>"; };
+		EBF7177024725B7900ED1838 /* BookCardPayAlertCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BookCardPayAlertCell.m; sourceTree = "<group>"; };
+		EBF7177124725B7A00ED1838 /* BookCardPayAlertCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BookCardPayAlertCell.xib; sourceTree = "<group>"; };
+		EBF7177424725EDE00ED1838 /* BookLoginPayAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookLoginPayAlert.h; sourceTree = "<group>"; };
+		EBF7177524725EDE00ED1838 /* BookLoginPayAlert.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BookLoginPayAlert.m; sourceTree = "<group>"; };
+		EBF7177624725EDE00ED1838 /* BookLoginPayAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = BookLoginPayAlert.xib; sourceTree = "<group>"; };
+		EBF7177924726A4500ED1838 /* HomeWeiCousreCollectCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeWeiCousreCollectCell.h; sourceTree = "<group>"; };
+		EBF7177A24726A4500ED1838 /* HomeWeiCousreCollectCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeWeiCousreCollectCell.m; sourceTree = "<group>"; };
+		EBF7177B24726A4500ED1838 /* HomeWeiCousreCollectCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeWeiCousreCollectCell.xib; sourceTree = "<group>"; };
 		EBFA3763240391A900A584FC /* WebDetailCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WebDetailCell.h; sourceTree = "<group>"; };
 		EBFA3764240391A900A584FC /* WebDetailCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = WebDetailCell.m; sourceTree = "<group>"; };
 		EBFA5EF1246E374A00915D5F /* HomeMusicCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeMusicCell.h; sourceTree = "<group>"; };
@@ -5368,6 +5414,15 @@
 				EB6E84D7246FD1BF00BE0524 /* HomeWeiCousreCell.h */,
 				EB6E84D8246FD1BF00BE0524 /* HomeWeiCousreCell.m */,
 				EB6E84D9246FD1BF00BE0524 /* HomeWeiCousreCell.xib */,
+				EBF7177924726A4500ED1838 /* HomeWeiCousreCollectCell.h */,
+				EBF7177A24726A4500ED1838 /* HomeWeiCousreCollectCell.m */,
+				EBF7177B24726A4500ED1838 /* HomeWeiCousreCollectCell.xib */,
+				EB6F001C247381FD00808484 /* HomeProblemTopCell.h */,
+				EB6F001D247381FD00808484 /* HomeProblemTopCell.m */,
+				EB6F001E247381FD00808484 /* HomeProblemTopCell.xib */,
+				EB6F002124738F0100808484 /* HomeProblemTopCollectCell.h */,
+				EB6F002224738F0100808484 /* HomeProblemTopCollectCell.m */,
+				EB6F002324738F0100808484 /* HomeProblemTopCollectCell.xib */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -6861,6 +6916,8 @@
 				EB1E0F81246D0FF300D4C3DE /* BookContentTopModel.m */,
 				EB1E0F83246D100200D4C3DE /* BookContentModel.h */,
 				EB1E0F84246D100200D4C3DE /* BookContentModel.m */,
+				EBF7175D247237DF00ED1838 /* BookAlertModel.h */,
+				EBF7175E247237DF00ED1838 /* BookAlertModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -6876,10 +6933,12 @@
 				EB415153246C071300030371 /* BookAllLookVC.m */,
 				EB1E0F75246CE49100D4C3DE /* BookContentNavVC.h */,
 				EB1E0F76246CE49100D4C3DE /* BookContentNavVC.m */,
-				EB6E84DD246FD67100BE0524 /* BookWeiCousreVC.h */,
-				EB6E84DE246FD67100BE0524 /* BookWeiCousreVC.m */,
 				EB6E84E0246FDF2400BE0524 /* BookPlayListVC.h */,
 				EB6E84E1246FDF2400BE0524 /* BookPlayListVC.m */,
+				EBF7175524722D4B00ED1838 /* BookWCDetailVC.h */,
+				EBF7175624722D4B00ED1838 /* BookWCDetailVC.m */,
+				EB6F002B2473B19300808484 /* BookWeiCourseListVC.h */,
+				EB6F002C2473B19300808484 /* BookWeiCourseListVC.m */,
 			);
 			path = VC;
 			sourceTree = "<group>";
@@ -6887,6 +6946,18 @@
 		EB415137246BC5D800030371 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				EBF7177424725EDE00ED1838 /* BookLoginPayAlert.h */,
+				EBF7177524725EDE00ED1838 /* BookLoginPayAlert.m */,
+				EBF7177624725EDE00ED1838 /* BookLoginPayAlert.xib */,
+				EBF7176F24725B7900ED1838 /* BookCardPayAlertCell.h */,
+				EBF7177024725B7900ED1838 /* BookCardPayAlertCell.m */,
+				EBF7177124725B7A00ED1838 /* BookCardPayAlertCell.xib */,
+				EBF7176024723CB900ED1838 /* BookCardPayAlert.h */,
+				EBF7176224723CB900ED1838 /* BookCardPayAlert.m */,
+				EBF7176324723CB900ED1838 /* BookCardPayAlert.xib */,
+				EBF71751247229FB00ED1838 /* PayBookAlert.h */,
+				EBF71752247229FB00ED1838 /* PayBookAlert.m */,
+				EBF71750247229FA00ED1838 /* PayBookAlert.xib */,
 				EB41513F246BCD6C00030371 /* BookHomeCell.h */,
 				EB415140246BCD6C00030371 /* BookHomeCell.m */,
 				EB415141246BCD6C00030371 /* BookHomeCell.xib */,
@@ -6905,6 +6976,9 @@
 				EB1E0F8B246D4A9700D4C3DE /* BookContentTopCell.h */,
 				EB1E0F8C246D4A9700D4C3DE /* BookContentTopCell.m */,
 				EB1E0F8D246D4A9700D4C3DE /* BookContentTopCell.xib */,
+				EBF717582472355700ED1838 /* PayBookAlertCell.h */,
+				EBF717592472355700ED1838 /* PayBookAlertCell.m */,
+				EBF7175A2472355700ED1838 /* PayBookAlertCell.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -7853,6 +7927,8 @@
 				324D962E23A24E3700C7D9E8 /* FindShareTypeCell.xib in Resources */,
 				EB8E2CEC239666A900CDFBDA /* checked@3x.png in Resources */,
 				C79C6D3C23BF16C500BE4156 /* MeetingDetailsTimeCell.xib in Resources */,
+				EBF7177D24726A4500ED1838 /* HomeWeiCousreCollectCell.xib in Resources */,
+				EBF7177324725B7A00ED1838 /* BookCardPayAlertCell.xib in Resources */,
 				C7799F1D23AB99C500270988 /* WorkFlowPersonnelListHeadView.xib in Resources */,
 				C7D6BC8B235DA1CE00770E7C /* MyPaperTableViewCell.xib in Resources */,
 				EBB83E4F23B35FD300A8C4BC /* ChangeTopicCell.xib in Resources */,
@@ -7938,12 +8014,14 @@
 				C7D6BCAF235DA1CE00770E7C /* BlacklistTableViewCell.xib in Resources */,
 				EB8E2D27239666A900CDFBDA /* pin-red.png in Resources */,
 				EB8E2D6A239666A900CDFBDA /* chatbar_audio_blue@3x.png in Resources */,
+				EB6F0020247381FD00808484 /* HomeProblemTopCell.xib in Resources */,
 				C78373F723A9F5430096AFE2 /* HistoricalWorkFlowListCell.xib in Resources */,
 				C7D6BCBD235DA1CE00770E7C /* LoginViewController.xib in Resources */,
 				EB8E2D28239666A900CDFBDA /* closed@2x.png in Resources */,
 				EB3EAFE223A22EBF00C38AB4 /* TDGroup.storyboard in Resources */,
 				EB8E2CDB239666A900CDFBDA /* close_gray@3x.png in Resources */,
 				324F176B239B3B4D0025CAE7 /* NoticeSelectCell.xib in Resources */,
+				EBF71753247229FB00ED1838 /* PayBookAlert.xib in Resources */,
 				EBDE08C424582BA6005D426C /* CommonListCell.xib in Resources */,
 				C7D6BC90235DA1CE00770E7C /* MyClubApplicationTableViewCell.xib in Resources */,
 				EB415143246BCD6C00030371 /* BookHomeCell.xib in Resources */,
@@ -7988,6 +8066,7 @@
 				C622708E236C09FC00E2E3BF /* mj_sun_black@3x.png in Resources */,
 				C6227090236C09FC00E2E3BF /* mj_air@3x.png in Resources */,
 				EBFC605C23FE52EE00A6874B /* HomeCommentView.xib in Resources */,
+				EBF7175C2472355700ED1838 /* PayBookAlertCell.xib in Resources */,
 				EB8E2D65239666A900CDFBDA /* chatbar_photo_blue@3x.png in Resources */,
 				C69A8DF023743B9B0098FA26 /* ChatMsgDetailChatInfoCell.xib in Resources */,
 				C7938E572364446B00746248 /* ClickOKCell.xib in Resources */,
@@ -8107,7 +8186,9 @@
 				EB8E2CE2239666A900CDFBDA /* uncheck@2x.png in Resources */,
 				EB2E470323A47B9000CAF0D3 /* NewRowUserCell.xib in Resources */,
 				EB8E2D3D239666A900CDFBDA /* icon_022.gif in Resources */,
+				EB6F002524738F0100808484 /* HomeProblemTopCollectCell.xib in Resources */,
 				C75049F3236027DA0096B15B /* HomeContentCell.xib in Resources */,
+				EBF7177824725EDF00ED1838 /* BookLoginPayAlert.xib in Resources */,
 				C7AB8437235EA93B00F2363F /* SWQRCode.bundle in Resources */,
 				C6226FDC236C08F700E2E3BF /* My_Center.storyboard in Resources */,
 				324D962623A245A100C7D9E8 /* MyFavoriteViewCell.xib in Resources */,
@@ -8151,6 +8232,7 @@
 				C6F2E1A5236C4554009E6903 /* ShowGenderAlertView.xib in Resources */,
 				EB8E2D9C239666A900CDFBDA /* msg_file@2x.png in Resources */,
 				C7D6BCB2235DA1CE00770E7C /* AccountAndSecurityViewController.xib in Resources */,
+				EBF7176824723CBA00ED1838 /* BookCardPayAlert.xib in Resources */,
 				C62215682371147A006F5D7F /* MoreAppCell.xib in Resources */,
 				EB8E2D6D239666A900CDFBDA /* chatbar_face_blue@2x.png in Resources */,
 				EB6E84D1246F99A200BE0524 /* HomeSchoolCell.xib in Resources */,
@@ -8286,6 +8368,7 @@
 				C6F2E1A0236C3C32009E6903 /* EditUserNickVC.m in Sources */,
 				C76B01282387B9C400AD6E28 /* WorkFilterModel.m in Sources */,
 				EB6E84D5246FB90300BE0524 /* HomeUserPrivilegeCell.m in Sources */,
+				EBF7177724725EDF00ED1838 /* BookLoginPayAlert.m in Sources */,
 				C7E125AA23793AA60067F275 /* JpushTool.m in Sources */,
 				C625AA66236D99170010E967 /* ChatMsgListVC.m in Sources */,
 				EB38514224652EB000E28172 /* TDGroupLabelVC.m in Sources */,
@@ -8296,7 +8379,6 @@
 				C7D6BBA5235DA18A00770E7C /* GTMNSString+HTML.m in Sources */,
 				C59D0C3A23825DE1007D0760 /* NSObject+YYAddForARC.m in Sources */,
 				EB12500A23CC359400143436 /* RichFileCell.m in Sources */,
-				EB6E84DF246FD67100BE0524 /* BookWeiCousreVC.m in Sources */,
 				C59D0C3223825DE1007D0760 /* NSArray+YYAdd.m in Sources */,
 				C7D6BC96235DA1CE00770E7C /* PersonalCertificationViewController.m in Sources */,
 				C6F2E19D236C3444009E6903 /* UtilsTools.m in Sources */,
@@ -8407,7 +8489,9 @@
 				EB1E0F73246CD5A300D4C3DE /* BookAllLookCell.m in Sources */,
 				EB96B89823BF56C800EE09D7 /* TDGroupInfoListCell.m in Sources */,
 				C59D0A442382468A007D0760 /* JSONModelArray.m in Sources */,
+				EB6F001F247381FD00808484 /* HomeProblemTopCell.m in Sources */,
 				C7F61628238C068A008AF22D /* AppUserModel.m in Sources */,
+				EBF7175B2472355700ED1838 /* PayBookAlertCell.m in Sources */,
 				EBF2D55A23C2E92A00EC35C4 /* MHTopic.m in Sources */,
 				C69A8E1C23753A150098FA26 /* CalenderHeaderView.m in Sources */,
 				C7AB8441235EE65600F2363F /* WorkListCell.m in Sources */,
@@ -8440,6 +8524,7 @@
 				EBEC966C23D69CC5001115FE /* MyFavoriteCell.m in Sources */,
 				EB8E2CFA239666A900CDFBDA /* MWTapDetectingImageView.m in Sources */,
 				C7D6BCBE235DA1CE00770E7C /* BindMobileViewController.m in Sources */,
+				EBF7175724722D4B00ED1838 /* BookWCDetailVC.m in Sources */,
 				EBF2D55D23C2E9AC00EC35C4 /* MHCommentReply.m in Sources */,
 				C770406D23AC9F7300BFF1B0 /* MeetingListModel.m in Sources */,
 				C70B6D6623CEBB6A008D5C48 /* ZFReOrderTableView.m in Sources */,
@@ -8479,6 +8564,7 @@
 				EBB6887A23C9C0C300E24DD9 /* MMBaseRichContentCell.m in Sources */,
 				C6F2E1E1236D126B009E6903 /* UIColor+XTExtension.m in Sources */,
 				C75F9F28236861A9002867A2 /* CommentSubModel.m in Sources */,
+				EBF7177224725B7A00ED1838 /* BookCardPayAlertCell.m in Sources */,
 				C7974A1F236BFBD0004D5470 /* WorkFLowCell.m in Sources */,
 				C59D0C0C23825DE1007D0760 /* YYAnimatedImageView.m in Sources */,
 				EBF2D56323C2FB8F00EC35C4 /* MHConstant.m in Sources */,
@@ -8514,6 +8600,7 @@
 				EB8E2CD5239666A800CDFBDA /* EMConversationHelper.m in Sources */,
 				C7D6BC9F235DA1CE00770E7C /* MyDetailModel.m in Sources */,
 				C76745132373A6C4001675FA /* SKUCollectionCell.m in Sources */,
+				EBF71754247229FB00ED1838 /* PayBookAlert.m in Sources */,
 				C59D0C1B23825DE1007D0760 /* YYTextRunDelegate.m in Sources */,
 				C708DC062371A46D005CC822 /* WorkFlowSearchView.m in Sources */,
 				327E376523A9D9C900842F47 /* CreateNoteBookCell.m in Sources */,
@@ -8585,6 +8672,7 @@
 				C76DB43E236ACF5700369F5C /* MyTDTopicModelSub.m in Sources */,
 				EB1BA21323FFD6E500202452 /* H6ViewController.m in Sources */,
 				EB8E2D54239666A900CDFBDA /* EMAudioRecordHelper.mm in Sources */,
+				EBF7177C24726A4500ED1838 /* HomeWeiCousreCollectCell.m in Sources */,
 				C7AB8444235EF18E00F2363F /* SearchDetailViewCell.m in Sources */,
 				C7D6BCCE235DDF3F00770E7C /* DrawerCell.m in Sources */,
 				C768AFB62379778F00E0A066 /* MyTableView.m in Sources */,
@@ -8785,6 +8873,7 @@
 				C625AA7E236FB9080010E967 /* UIView+Extension.m in Sources */,
 				EBAACA932406730C00F44B67 /* MyFavoriteSearchVC.m in Sources */,
 				C59D0C0323825DE1007D0760 /* YYSpriteSheetImage.m in Sources */,
+				EBF7175F247237DF00ED1838 /* BookAlertModel.m in Sources */,
 				C78373F623A9F5430096AFE2 /* HistoricalWorkFlowListCell.m in Sources */,
 				C625AAC1237003EE0010E967 /* ShowNewGroupAlert.m in Sources */,
 				C59D0C1923825DE1007D0760 /* YYTextDebugOption.m in Sources */,
@@ -8912,8 +9001,10 @@
 				C7938E562364446B00746248 /* ClickOKCell.m in Sources */,
 				C59D0C0023825DE1007D0760 /* YYMemoryCache.m in Sources */,
 				C7D6BBB0235DA18A00770E7C /* BaseViewController.m in Sources */,
+				EB6F002424738F0100808484 /* HomeProblemTopCollectCell.m in Sources */,
 				C62215922372A32B006F5D7F /* NoticeUnreadCell.m in Sources */,
 				C59D0C4823825DE1007D0760 /* YYKeychain.m in Sources */,
+				EBF7176724723CBA00ED1838 /* BookCardPayAlert.m in Sources */,
 				C7D6BB41235DA18A00770E7C /* SearchTypeSection.m in Sources */,
 				C5598D1F23865E7400BC7185 /* AddressBookGroupsModel.m in Sources */,
 				C6F2E1DA236D126B009E6903 /* NSString+Tools.m in Sources */,
@@ -9046,6 +9137,7 @@
 				C72F3902236DADDC00933828 /* FeedBackVC.m in Sources */,
 				EB8E2D18239666A900CDFBDA /* EMAlertController.m in Sources */,
 				C7954B4B237E799200EDC479 /* Addressbookgroup.m in Sources */,
+				EB6F002D2473B19300808484 /* BookWeiCourseListVC.m in Sources */,
 				EB0FA5D0241F6DBD00BF8558 /* HomeScrCell.m in Sources */,
 				C7404E77238E1BCF00DB19AC /* MyApprovalFileCell.m in Sources */,
 				EB820AD523BC48CF00B96C6C /* ChatMoveModel.m in Sources */,

BIN
smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/UserInterfaceState.xcuserstate


BIN
smartRhino/Assets.xcassets/首页/Book_alert_close.imageset/Book_alert_close@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_alert_close.imageset/Book_alert_close@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_alert_close.imageset/Contents.json

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

BIN
smartRhino/Assets.xcassets/首页/Book_close_btn.imageset/Book_close_btn@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_close_btn.imageset/Book_close_btn@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_close_btn.imageset/Contents.json

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

BIN
smartRhino/Assets.xcassets/首页/Book_close_gray.imageset/Book_close_gray@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_close_gray.imageset/Book_close_gray@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_close_gray.imageset/Contents.json

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

BIN
smartRhino/Assets.xcassets/首页/Book_huan_Btn.imageset/Book_huan_Btn@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_huan_Btn.imageset/Book_huan_Btn@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_huan_Btn.imageset/Contents.json

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

BIN
smartRhino/Assets.xcassets/首页/Book_payalert_bg.imageset/Book_payalert_bg@2x.png


BIN
smartRhino/Assets.xcassets/首页/Book_payalert_bg.imageset/Book_payalert_bg@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/首页/Book_payalert_bg.imageset/Contents.json

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

+ 12 - 0
smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/MyTDTopic.storyboard

@@ -558,15 +558,25 @@
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
+                                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cix-Oo-wg8">
+                                                <rect key="frame" x="360" y="0.0" width="44" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="44" id="TTG-8K-42W"/>
+                                                </constraints>
+                                                <state key="normal" image="home_music_icon"/>
+                                            </button>
                                         </subviews>
                                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstItem="ogw-Jp-00F" firstAttribute="top" secondItem="Nmk-kJ-EpI" secondAttribute="top" id="35h-xS-xxz"/>
+                                            <constraint firstAttribute="trailing" secondItem="cix-Oo-wg8" secondAttribute="trailing" constant="10" id="Bgr-Rq-J8T"/>
                                             <constraint firstItem="ogw-Jp-00F" firstAttribute="leading" secondItem="Nmk-kJ-EpI" secondAttribute="trailing" id="Hbj-Kc-ucQ"/>
                                             <constraint firstItem="yMl-n2-VaV" firstAttribute="centerX" secondItem="giH-qQ-oYO" secondAttribute="centerX" id="K3M-d2-puy"/>
+                                            <constraint firstItem="cix-Oo-wg8" firstAttribute="top" secondItem="giH-qQ-oYO" secondAttribute="top" id="PPj-G5-Eln"/>
                                             <constraint firstAttribute="height" constant="44" id="PWf-fH-uvI"/>
                                             <constraint firstItem="Nmk-kJ-EpI" firstAttribute="leading" secondItem="giH-qQ-oYO" secondAttribute="leading" id="VOw-Qh-c8N"/>
                                             <constraint firstAttribute="bottom" secondItem="Nmk-kJ-EpI" secondAttribute="bottom" id="agf-gs-lED"/>
+                                            <constraint firstAttribute="bottom" secondItem="cix-Oo-wg8" secondAttribute="bottom" id="iJj-fQ-3su"/>
                                             <constraint firstItem="yMl-n2-VaV" firstAttribute="centerY" secondItem="giH-qQ-oYO" secondAttribute="centerY" id="p9E-WQ-Deo"/>
                                             <constraint firstItem="ogw-Jp-00F" firstAttribute="bottom" secondItem="Nmk-kJ-EpI" secondAttribute="bottom" id="vun-vU-gsi"/>
                                         </constraints>
@@ -878,6 +888,7 @@
                         <outlet property="commentCountL" destination="uga-ik-mXW" id="LlT-w6-wbh"/>
                         <outlet property="commentNumberLabel" destination="uga-ik-mXW" id="pyB-Mj-4Nb"/>
                         <outlet property="commentScrollBtn" destination="wKT-qF-Nmw" id="NFD-Yj-uLe"/>
+                        <outlet property="musicBtn" destination="cix-Oo-wg8" id="J99-yk-z76"/>
                         <outlet property="shareButton" destination="gJ7-0m-Qei" id="BZT-ub-PNp"/>
                         <outlet property="shareCountL" destination="Mgv-Zu-uNm" id="6o8-8g-igd"/>
                         <outlet property="shareImgV" destination="k6n-sb-jAd" id="jJn-8p-Nta"/>
@@ -968,6 +979,7 @@
         <image name="back_black_icon" width="11" height="20"/>
         <image name="chatmsg_right_add_icon" width="15.666666984558105" height="15.666666984558105"/>
         <image name="chatmsg_right_edit_icon" width="15" height="17"/>
+        <image name="home_music_icon" width="25" height="25"/>
         <image name="icon_share" width="19" height="17"/>
         <image name="menu_black_icon" width="16.666666030883789" height="14.666666984558105"/>
         <image name="zan_no" width="14" height="14.5"/>

+ 1 - 0
smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/MyTDTopicDetailVC.h

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 +(MyTDTopicDetailVC *)initMyTDTopicDetailVC;
 @property (nonatomic, copy) void(^deleteTopicBlock)(void);
 @property (nonatomic, assign) BOOL         isComment;
+@property (nonatomic, assign) BOOL         isMusic;
 @property (assign, nonatomic) CollectModelType  type;
 @property (assign, nonatomic) NSInteger  Id;
 @property (strong, nonatomic) NSURL     *URL;

+ 2 - 0
smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/MyTDTopicDetailVC.m

@@ -69,6 +69,7 @@
 @property (weak, nonatomic) IBOutlet UIView *ReplayView;
 @property (weak, nonatomic) IBOutlet UIButton *ReplayBtn;
 @property (weak, nonatomic) IBOutlet UIView *BottomView;
+@property (weak, nonatomic) IBOutlet UIButton *musicBtn;
 
 @property (nonatomic, strong) TextInputView *commentInputView;
 @property (assign, nonatomic) NSInteger countComment;
@@ -95,6 +96,7 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
+    self.musicBtn.hidden = !self.isMusic;
     WS(weakSelf);
     switch (self.type) {
         case CollectModel_InterMail:

+ 451 - 89
smartRhino/Project/VCModel/Home/VC/BookStore/BookStore.storyboard

@@ -359,6 +359,7 @@
         <!--Book Content NavVC-->
         <scene sceneID="yQT-ue-5Rm">
             <objects>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="kLd-si-DdZ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
                 <viewController storyboardIdentifier="BookContentNavVC" id="hJI-SY-M4N" customClass="BookContentNavVC" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="A6a-7S-1Uq">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
@@ -520,98 +521,9 @@
                         <outlet property="showBtn" destination="ixV-1L-FUX" id="Ow6-tr-Lj0"/>
                     </connections>
                 </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="kLd-si-DdZ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="-968.11594202898561" y="827.44565217391312"/>
         </scene>
-        <!--Book Wei CousreVC-->
-        <scene sceneID="pvk-ck-4WO">
-            <objects>
-                <viewController storyboardIdentifier="BookWeiCousreVC" id="dO4-pd-Ocl" customClass="BookWeiCousreVC" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="cN8-Wb-7OE">
-                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XPf-VC-y0l">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="230"/>
-                                <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="230" id="Wfs-dq-IRa"/>
-                                </constraints>
-                            </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lab-6M-4Kn" customClass="WQNavigationBar">
-                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
-                                <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XkC-fA-obE">
-                                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
-                                        <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vq6-TY-RS5">
-                                                <rect key="frame" x="0.0" y="0.0" width="50" height="44"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="width" constant="50" id="D0e-VS-Fh2"/>
-                                                    <constraint firstAttribute="height" constant="44" id="fMZ-uL-DlN"/>
-                                                </constraints>
-                                                <state key="normal" image="back_white_icon"/>
-                                                <connections>
-                                                    <action selector="backAction:" destination="dO4-pd-Ocl" eventType="touchUpInside" id="igf-V4-RBS"/>
-                                                </connections>
-                                            </button>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3dC-rq-2NM">
-                                                <rect key="frame" x="50" y="0.0" width="35" height="44"/>
-                                                <constraints>
-                                                    <constraint firstAttribute="height" constant="44" id="YMv-5n-QEe"/>
-                                                    <constraint firstAttribute="width" constant="35" id="dkp-FF-q0T"/>
-                                                </constraints>
-                                                <state key="normal" image="menu_white_icon"/>
-                                                <connections>
-                                                    <action selector="menuAction:" destination="dO4-pd-Ocl" eventType="touchUpInside" id="gyo-yT-VOl"/>
-                                                </connections>
-                                            </button>
-                                        </subviews>
-                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                        <constraints>
-                                            <constraint firstAttribute="bottom" secondItem="vq6-TY-RS5" secondAttribute="bottom" id="JdN-Sy-J1L"/>
-                                            <constraint firstItem="3dC-rq-2NM" firstAttribute="top" secondItem="vq6-TY-RS5" secondAttribute="top" id="PSO-cB-6Uw"/>
-                                            <constraint firstItem="3dC-rq-2NM" firstAttribute="leading" secondItem="vq6-TY-RS5" secondAttribute="trailing" id="TJT-SQ-S7U"/>
-                                            <constraint firstAttribute="height" constant="44" id="bFB-ZD-MeN"/>
-                                            <constraint firstItem="vq6-TY-RS5" firstAttribute="leading" secondItem="XkC-fA-obE" secondAttribute="leading" id="w1x-Mb-2Zb"/>
-                                            <constraint firstItem="3dC-rq-2NM" firstAttribute="bottom" secondItem="vq6-TY-RS5" secondAttribute="bottom" id="xBP-mD-ZR0"/>
-                                        </constraints>
-                                    </view>
-                                </subviews>
-                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <constraints>
-                                    <constraint firstItem="XkC-fA-obE" firstAttribute="leading" secondItem="TRJ-Kh-aT1" secondAttribute="leading" id="7D6-Nd-9NB"/>
-                                    <constraint firstItem="TRJ-Kh-aT1" firstAttribute="bottom" secondItem="XkC-fA-obE" secondAttribute="bottom" id="Ubh-Sb-2yA"/>
-                                    <constraint firstItem="XkC-fA-obE" firstAttribute="trailing" secondItem="TRJ-Kh-aT1" secondAttribute="trailing" id="vNS-xt-dPL"/>
-                                    <constraint firstAttribute="height" constant="64" id="ytT-zi-KHP"/>
-                                </constraints>
-                                <viewLayoutGuide key="safeArea" id="TRJ-Kh-aT1"/>
-                                <connections>
-                                    <outlet property="height" destination="ytT-zi-KHP" id="cwA-8J-Osx"/>
-                                </connections>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <constraints>
-                            <constraint firstItem="XPf-VC-y0l" firstAttribute="top" secondItem="OUo-Er-6PT" secondAttribute="top" id="5hc-1a-1EY"/>
-                            <constraint firstItem="lab-6M-4Kn" firstAttribute="leading" secondItem="OUo-Er-6PT" secondAttribute="leading" id="Cs2-r5-ZbK"/>
-                            <constraint firstItem="lab-6M-4Kn" firstAttribute="top" secondItem="cN8-Wb-7OE" secondAttribute="top" id="E26-vl-T2A"/>
-                            <constraint firstItem="lab-6M-4Kn" firstAttribute="trailing" secondItem="OUo-Er-6PT" secondAttribute="trailing" id="G9g-XL-46y"/>
-                            <constraint firstItem="XPf-VC-y0l" firstAttribute="leading" secondItem="OUo-Er-6PT" secondAttribute="leading" id="Yzp-fL-12N"/>
-                            <constraint firstItem="XPf-VC-y0l" firstAttribute="trailing" secondItem="OUo-Er-6PT" secondAttribute="trailing" id="aDk-YG-Ozt"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="OUo-Er-6PT"/>
-                    </view>
-                    <navigationItem key="navigationItem" id="bEq-gQ-dna"/>
-                    <connections>
-                        <outlet property="VideoView" destination="XPf-VC-y0l" id="APp-Og-PFy"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="4bd-gv-bAx" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-252.17391304347828" y="827.44565217391312"/>
-        </scene>
         <!--Book Play ListVC-->
         <scene sceneID="Hg3-X5-17h">
             <objects>
@@ -724,14 +636,464 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="B7K-N4-Nzq" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
+            <point key="canvasLocation" x="-252" y="827"/>
+        </scene>
+        <!--BookWC DetailVC-->
+        <scene sceneID="zBY-yi-8YF">
+            <objects>
+                <viewController storyboardIdentifier="BookWCDetailVC" id="0Ab-aM-dLm" customClass="BookWCDetailVC" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="O0G-1f-CBo">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sbn-6r-BAf">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="230"/>
+                                <color key="backgroundColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="230" id="LJR-SG-ZSp"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xrB-JM-o9C" customClass="WQNavigationBar">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bqa-Ye-giA">
+                                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
+                                        <subviews>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0HC-e7-mgO">
+                                                <rect key="frame" x="0.0" y="0.0" width="50" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="44" id="8Gh-D7-uUx"/>
+                                                    <constraint firstAttribute="width" constant="50" id="fDq-Tu-yrb"/>
+                                                </constraints>
+                                                <state key="normal" image="back_white_icon"/>
+                                                <connections>
+                                                    <action selector="backAction:" destination="0Ab-aM-dLm" eventType="touchUpInside" id="KJw-fm-U0V"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oe9-eF-EES">
+                                                <rect key="frame" x="50" y="0.0" width="35" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="35" id="XuP-fy-dOt"/>
+                                                    <constraint firstAttribute="height" constant="44" id="acG-E9-jcV"/>
+                                                </constraints>
+                                                <state key="normal" image="menu_white_icon"/>
+                                                <connections>
+                                                    <action selector="menuAction:" destination="0Ab-aM-dLm" eventType="touchUpInside" id="khl-ko-LxS"/>
+                                                </connections>
+                                            </button>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="44" id="1pS-da-Axp"/>
+                                            <constraint firstItem="0HC-e7-mgO" firstAttribute="leading" secondItem="bqa-Ye-giA" secondAttribute="leading" id="2jm-Bf-QGO"/>
+                                            <constraint firstItem="oe9-eF-EES" firstAttribute="leading" secondItem="0HC-e7-mgO" secondAttribute="trailing" id="4Dc-7f-0x2"/>
+                                            <constraint firstAttribute="bottom" secondItem="0HC-e7-mgO" secondAttribute="bottom" id="oeS-JN-VmH"/>
+                                            <constraint firstItem="oe9-eF-EES" firstAttribute="bottom" secondItem="0HC-e7-mgO" secondAttribute="bottom" id="qrY-RS-aR1"/>
+                                            <constraint firstItem="oe9-eF-EES" firstAttribute="top" secondItem="0HC-e7-mgO" secondAttribute="top" id="vv1-lI-aO9"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstItem="bqa-Ye-giA" firstAttribute="leading" secondItem="d9H-SO-LNl" secondAttribute="leading" id="DXn-CT-8CK"/>
+                                    <constraint firstItem="bqa-Ye-giA" firstAttribute="trailing" secondItem="d9H-SO-LNl" secondAttribute="trailing" id="Y3K-nE-ueN"/>
+                                    <constraint firstAttribute="height" constant="64" id="gj2-ju-c5Q"/>
+                                    <constraint firstItem="d9H-SO-LNl" firstAttribute="bottom" secondItem="bqa-Ye-giA" secondAttribute="bottom" id="j1s-vA-a09"/>
+                                </constraints>
+                                <viewLayoutGuide key="safeArea" id="d9H-SO-LNl"/>
+                                <connections>
+                                    <outlet property="height" destination="gj2-ju-c5Q" id="FOs-oc-dfH"/>
+                                </connections>
+                            </view>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="MEU-cA-SNK">
+                                <rect key="frame" x="0.0" y="230" width="414" height="448"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            </tableView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2dM-5h-T17">
+                                <rect key="frame" x="0.0" y="678" width="414" height="58"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9CR-p8-J6J">
+                                        <rect key="frame" x="0.0" y="0.0" width="414" height="0.66666666666666663"/>
+                                        <color key="backgroundColor" red="0.8980392157" green="0.8980392157" blue="0.8980392157" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="0.5" id="59E-gM-wfr"/>
+                                            <constraint firstAttribute="height" constant="0.5" id="8rl-yW-49g"/>
+                                        </constraints>
+                                    </view>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JJu-Ge-4qk">
+                                        <rect key="frame" x="20" y="8" width="177" height="42"/>
+                                        <subviews>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="说点什么..." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BMh-iI-tSu">
+                                                <rect key="frame" x="10" y="14" width="60" height="14.333333333333336"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fik-SP-MqQ">
+                                                <rect key="frame" x="140.66666666666666" y="5" width="0.33333333333334281" height="32"/>
+                                                <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="0.5" id="ayq-OD-Z1h"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dPb-au-Qd1">
+                                                <rect key="frame" x="141" y="5" width="31" height="32"/>
+                                                <subviews>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="评论" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pDY-Qk-FLq">
+                                                        <rect key="frame" x="0.0" y="0.0" width="31" height="32"/>
+                                                        <fontDescription key="fontDescription" type="system" pointSize="8"/>
+                                                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
+                                                        <nil key="highlightedColor"/>
+                                                    </label>
+                                                </subviews>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="bottom" secondItem="pDY-Qk-FLq" secondAttribute="bottom" id="AB5-1w-ab0"/>
+                                                    <constraint firstAttribute="trailing" secondItem="pDY-Qk-FLq" secondAttribute="trailing" id="YXZ-Xr-3xS"/>
+                                                    <constraint firstItem="pDY-Qk-FLq" firstAttribute="top" secondItem="dPb-au-Qd1" secondAttribute="top" id="heI-J4-Qmz"/>
+                                                    <constraint firstAttribute="width" constant="31" id="q9E-vo-oY9"/>
+                                                    <constraint firstItem="pDY-Qk-FLq" firstAttribute="leading" secondItem="dPb-au-Qd1" secondAttribute="leading" id="xbu-TJ-TYf"/>
+                                                </constraints>
+                                            </view>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Ug-Dv-M4e">
+                                                <rect key="frame" x="0.0" y="0.0" width="141" height="42"/>
+                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <state key="normal">
+                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                </state>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pzk-xl-EkR">
+                                                <rect key="frame" x="141" y="0.0" width="36" height="42"/>
+                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <state key="normal">
+                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                </state>
+                                            </button>
+                                        </subviews>
+                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                        <constraints>
+                                            <constraint firstItem="3Ug-Dv-M4e" firstAttribute="top" secondItem="JJu-Ge-4qk" secondAttribute="top" id="1BT-0J-knC"/>
+                                            <constraint firstItem="BMh-iI-tSu" firstAttribute="centerY" secondItem="JJu-Ge-4qk" secondAttribute="centerY" id="1te-LW-18S"/>
+                                            <constraint firstAttribute="bottom" secondItem="Pzk-xl-EkR" secondAttribute="bottom" id="3ZK-gm-Tky"/>
+                                            <constraint firstAttribute="bottom" secondItem="3Ug-Dv-M4e" secondAttribute="bottom" id="F6m-sp-Mte"/>
+                                            <constraint firstAttribute="bottom" secondItem="dPb-au-Qd1" secondAttribute="bottom" constant="5" id="LwZ-xa-reY"/>
+                                            <constraint firstItem="Pzk-xl-EkR" firstAttribute="leading" secondItem="fik-SP-MqQ" secondAttribute="trailing" id="WVf-4I-wXV"/>
+                                            <constraint firstItem="dPb-au-Qd1" firstAttribute="leading" secondItem="fik-SP-MqQ" secondAttribute="trailing" id="arO-qV-qEp"/>
+                                            <constraint firstItem="BMh-iI-tSu" firstAttribute="leading" secondItem="JJu-Ge-4qk" secondAttribute="leading" constant="10" id="efl-x9-Rk9"/>
+                                            <constraint firstItem="3Ug-Dv-M4e" firstAttribute="leading" secondItem="JJu-Ge-4qk" secondAttribute="leading" id="jAx-XN-UTa"/>
+                                            <constraint firstAttribute="bottom" secondItem="fik-SP-MqQ" secondAttribute="bottom" constant="5" id="nZb-Dn-9Qe"/>
+                                            <constraint firstAttribute="trailing" secondItem="dPb-au-Qd1" secondAttribute="trailing" constant="5" id="s76-uq-Eqw"/>
+                                            <constraint firstAttribute="trailing" secondItem="Pzk-xl-EkR" secondAttribute="trailing" id="xFP-Z8-pc8"/>
+                                            <constraint firstItem="fik-SP-MqQ" firstAttribute="trailing" secondItem="3Ug-Dv-M4e" secondAttribute="trailing" id="xTA-tb-7vM"/>
+                                            <constraint firstItem="fik-SP-MqQ" firstAttribute="top" secondItem="JJu-Ge-4qk" secondAttribute="top" constant="5" id="xsQ-sZ-76F"/>
+                                            <constraint firstItem="dPb-au-Qd1" firstAttribute="top" secondItem="JJu-Ge-4qk" secondAttribute="top" constant="5" id="y0T-8o-7t9"/>
+                                            <constraint firstItem="Pzk-xl-EkR" firstAttribute="top" secondItem="JJu-Ge-4qk" secondAttribute="top" id="zeq-ex-hTE"/>
+                                        </constraints>
+                                    </view>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pjA-bK-jJC" userLabel="First">
+                                        <rect key="frame" x="217" y="0.0" width="187" height="58"/>
+                                        <subviews>
+                                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" baselineRelativeArrangement="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bzP-py-hLq">
+                                                <rect key="frame" x="0.0" y="0.0" width="187" height="58"/>
+                                                <subviews>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xj5-0Z-cSp">
+                                                        <rect key="frame" x="0.0" y="0.0" width="62.333333333333336" height="58"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zan_no" translatesAutoresizingMaskIntoConstraints="NO" id="caZ-EV-t2e">
+                                                                <rect key="frame" x="12.333333333333343" y="20" width="18" height="18"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="width" secondItem="caZ-EV-t2e" secondAttribute="height" multiplier="1:1" id="hdO-D7-UvC"/>
+                                                                    <constraint firstAttribute="width" constant="18" id="xma-Fp-OCD"/>
+                                                                </constraints>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9KT-ef-Bdk">
+                                                                <rect key="frame" x="35.333333333333343" y="12" width="0.0" height="0.0"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                                <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aSK-oW-CZo">
+                                                                <rect key="frame" x="0.0" y="0.0" width="62.333333333333336" height="58"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="caZ-EV-t2e" firstAttribute="centerX" secondItem="Xj5-0Z-cSp" secondAttribute="centerX" constant="-10" id="M5s-gk-6lh"/>
+                                                            <constraint firstItem="aSK-oW-CZo" firstAttribute="top" secondItem="Xj5-0Z-cSp" secondAttribute="top" id="MK1-RU-yzu"/>
+                                                            <constraint firstItem="aSK-oW-CZo" firstAttribute="leading" secondItem="Xj5-0Z-cSp" secondAttribute="leading" id="Wzn-C3-hWk"/>
+                                                            <constraint firstItem="caZ-EV-t2e" firstAttribute="centerY" secondItem="Xj5-0Z-cSp" secondAttribute="centerY" id="X6o-FY-qfD"/>
+                                                            <constraint firstItem="9KT-ef-Bdk" firstAttribute="trailing" secondItem="caZ-EV-t2e" secondAttribute="trailing" constant="5" id="cWm-Lg-QTg"/>
+                                                            <constraint firstItem="caZ-EV-t2e" firstAttribute="top" secondItem="Xj5-0Z-cSp" secondAttribute="top" constant="20" id="eds-31-Y4n"/>
+                                                            <constraint firstAttribute="trailing" secondItem="aSK-oW-CZo" secondAttribute="trailing" id="rsK-aT-c9C"/>
+                                                            <constraint firstItem="9KT-ef-Bdk" firstAttribute="top" secondItem="caZ-EV-t2e" secondAttribute="top" constant="-8" id="x9m-4z-mBb"/>
+                                                            <constraint firstAttribute="bottom" secondItem="aSK-oW-CZo" secondAttribute="bottom" id="yBq-8V-f6o"/>
+                                                        </constraints>
+                                                    </view>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="x5f-M0-I53">
+                                                        <rect key="frame" x="62.333333333333314" y="0.0" width="62.333333333333343" height="58"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="收藏五角星" translatesAutoresizingMaskIntoConstraints="NO" id="6Hw-LW-oUZ">
+                                                                <rect key="frame" x="11.666666666666686" y="20" width="19" height="18"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FzQ-cy-LrB">
+                                                                <rect key="frame" x="35.666666666666686" y="12" width="0.0" height="0.0"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                                <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OEp-oA-x8U">
+                                                                <rect key="frame" x="0.0" y="0.0" width="62.333333333333336" height="58"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="6Hw-LW-oUZ" firstAttribute="centerX" secondItem="x5f-M0-I53" secondAttribute="centerX" constant="-10" id="1HV-k6-cUH"/>
+                                                            <constraint firstItem="OEp-oA-x8U" firstAttribute="top" secondItem="x5f-M0-I53" secondAttribute="top" id="1pO-XG-ns0"/>
+                                                            <constraint firstAttribute="bottom" secondItem="OEp-oA-x8U" secondAttribute="bottom" id="2IT-PT-xWO"/>
+                                                            <constraint firstItem="FzQ-cy-LrB" firstAttribute="trailing" secondItem="6Hw-LW-oUZ" secondAttribute="trailing" constant="5" id="4F2-sf-Q71"/>
+                                                            <constraint firstAttribute="trailing" secondItem="OEp-oA-x8U" secondAttribute="trailing" id="Agz-EN-lid"/>
+                                                            <constraint firstItem="OEp-oA-x8U" firstAttribute="leading" secondItem="x5f-M0-I53" secondAttribute="leading" id="FVT-3b-eaM"/>
+                                                            <constraint firstItem="6Hw-LW-oUZ" firstAttribute="top" secondItem="x5f-M0-I53" secondAttribute="top" constant="20" id="VOs-LY-EvZ"/>
+                                                            <constraint firstItem="6Hw-LW-oUZ" firstAttribute="centerY" secondItem="x5f-M0-I53" secondAttribute="centerY" id="Zd9-cY-6dc"/>
+                                                            <constraint firstItem="FzQ-cy-LrB" firstAttribute="top" secondItem="6Hw-LW-oUZ" secondAttribute="top" constant="-8" id="znQ-64-zy4"/>
+                                                        </constraints>
+                                                    </view>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VTO-F9-zeq">
+                                                        <rect key="frame" x="124.66666666666667" y="0.0" width="62.333333333333329" height="58"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_share" translatesAutoresizingMaskIntoConstraints="NO" id="Tdr-c3-AYC">
+                                                                <rect key="frame" x="11.666666666666629" y="20" width="19" height="18"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2IK-03-X7G">
+                                                                <rect key="frame" x="38.666666666666629" y="12" width="0.0" height="0.0"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="10"/>
+                                                                <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bLP-pE-VLL">
+                                                                <rect key="frame" x="0.0" y="0.0" width="62.333333333333336" height="58"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="bottom" secondItem="bLP-pE-VLL" secondAttribute="bottom" id="7fs-PA-jZB"/>
+                                                            <constraint firstItem="Tdr-c3-AYC" firstAttribute="centerX" secondItem="VTO-F9-zeq" secondAttribute="centerX" constant="-10" id="9vB-0d-uPy"/>
+                                                            <constraint firstItem="Tdr-c3-AYC" firstAttribute="top" secondItem="VTO-F9-zeq" secondAttribute="top" constant="20" id="F5E-Xa-XfL"/>
+                                                            <constraint firstAttribute="trailing" secondItem="bLP-pE-VLL" secondAttribute="trailing" id="MFx-D2-p5R"/>
+                                                            <constraint firstItem="Tdr-c3-AYC" firstAttribute="centerY" secondItem="VTO-F9-zeq" secondAttribute="centerY" id="Pw6-Hc-YB5"/>
+                                                            <constraint firstItem="2IK-03-X7G" firstAttribute="top" secondItem="Tdr-c3-AYC" secondAttribute="top" constant="-8" id="k9Z-ra-I2o"/>
+                                                            <constraint firstItem="2IK-03-X7G" firstAttribute="trailing" secondItem="Tdr-c3-AYC" secondAttribute="trailing" constant="8" id="myl-6V-n1q"/>
+                                                            <constraint firstItem="bLP-pE-VLL" firstAttribute="leading" secondItem="VTO-F9-zeq" secondAttribute="leading" id="wg9-ui-WDX"/>
+                                                            <constraint firstItem="bLP-pE-VLL" firstAttribute="top" secondItem="VTO-F9-zeq" secondAttribute="top" id="xEY-7i-Wfk"/>
+                                                        </constraints>
+                                                    </view>
+                                                </subviews>
+                                            </stackView>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstItem="bzP-py-hLq" firstAttribute="leading" secondItem="pjA-bK-jJC" secondAttribute="leading" id="2ZJ-ke-usB"/>
+                                            <constraint firstAttribute="bottom" secondItem="bzP-py-hLq" secondAttribute="bottom" id="AHn-W8-tfy"/>
+                                            <constraint firstItem="bzP-py-hLq" firstAttribute="top" secondItem="pjA-bK-jJC" secondAttribute="top" id="JWg-ca-L20"/>
+                                            <constraint firstAttribute="trailing" secondItem="bzP-py-hLq" secondAttribute="trailing" id="Rw0-2e-3yH"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="58" id="4Rc-f1-naD"/>
+                                    <constraint firstItem="pjA-bK-jJC" firstAttribute="top" secondItem="2dM-5h-T17" secondAttribute="top" id="E7J-QG-zpn"/>
+                                    <constraint firstAttribute="trailing" secondItem="9CR-p8-J6J" secondAttribute="trailing" id="Kcb-hl-0Qn"/>
+                                    <constraint firstAttribute="bottom" secondItem="JJu-Ge-4qk" secondAttribute="bottom" constant="8" id="Ni7-2i-MW5"/>
+                                    <constraint firstItem="9CR-p8-J6J" firstAttribute="leading" secondItem="2dM-5h-T17" secondAttribute="leading" id="Pr3-bt-Heq"/>
+                                    <constraint firstItem="JJu-Ge-4qk" firstAttribute="width" secondItem="2dM-5h-T17" secondAttribute="width" multiplier="0.5" constant="-30" id="Qjg-tc-ECs"/>
+                                    <constraint firstItem="pjA-bK-jJC" firstAttribute="leading" secondItem="JJu-Ge-4qk" secondAttribute="trailing" constant="20" id="Vax-4f-dqm"/>
+                                    <constraint firstAttribute="bottom" secondItem="pjA-bK-jJC" secondAttribute="bottom" id="ZSm-sN-OQt"/>
+                                    <constraint firstItem="JJu-Ge-4qk" firstAttribute="leading" secondItem="2dM-5h-T17" secondAttribute="leading" constant="20" id="cDS-UV-bBY"/>
+                                    <constraint firstAttribute="trailing" secondItem="pjA-bK-jJC" secondAttribute="trailing" constant="10" id="nUR-OZ-hgd"/>
+                                    <constraint firstItem="9CR-p8-J6J" firstAttribute="top" secondItem="2dM-5h-T17" secondAttribute="top" id="qJ4-rQ-FlZ"/>
+                                    <constraint firstItem="JJu-Ge-4qk" firstAttribute="top" secondItem="2dM-5h-T17" secondAttribute="top" constant="8" id="uFg-YK-Oay"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="2dM-5h-T17" firstAttribute="top" secondItem="MEU-cA-SNK" secondAttribute="bottom" id="7Rd-eV-D2p"/>
+                            <constraint firstItem="Sbn-6r-BAf" firstAttribute="trailing" secondItem="T4b-mX-xfA" secondAttribute="trailing" id="C88-6v-Ei1"/>
+                            <constraint firstItem="T4b-mX-xfA" firstAttribute="trailing" secondItem="MEU-cA-SNK" secondAttribute="trailing" id="CT4-J9-5yy"/>
+                            <constraint firstItem="xrB-JM-o9C" firstAttribute="trailing" secondItem="T4b-mX-xfA" secondAttribute="trailing" id="I87-eQ-6d6"/>
+                            <constraint firstItem="2dM-5h-T17" firstAttribute="leading" secondItem="T4b-mX-xfA" secondAttribute="leading" id="RdX-AJ-mx4"/>
+                            <constraint firstItem="MEU-cA-SNK" firstAttribute="top" secondItem="Sbn-6r-BAf" secondAttribute="bottom" id="XTS-iM-rPU"/>
+                            <constraint firstItem="xrB-JM-o9C" firstAttribute="top" secondItem="O0G-1f-CBo" secondAttribute="top" id="a7q-LJ-fz8"/>
+                            <constraint firstItem="MEU-cA-SNK" firstAttribute="leading" secondItem="T4b-mX-xfA" secondAttribute="leading" id="aTh-MD-Vf2"/>
+                            <constraint firstItem="2dM-5h-T17" firstAttribute="bottom" secondItem="T4b-mX-xfA" secondAttribute="bottom" id="fAd-za-w72"/>
+                            <constraint firstItem="2dM-5h-T17" firstAttribute="trailing" secondItem="T4b-mX-xfA" secondAttribute="trailing" id="gd2-bb-DC4"/>
+                            <constraint firstItem="xrB-JM-o9C" firstAttribute="leading" secondItem="T4b-mX-xfA" secondAttribute="leading" id="icm-dj-RLF"/>
+                            <constraint firstItem="Sbn-6r-BAf" firstAttribute="top" secondItem="T4b-mX-xfA" secondAttribute="top" id="p4d-tP-xhy"/>
+                            <constraint firstItem="Sbn-6r-BAf" firstAttribute="leading" secondItem="T4b-mX-xfA" secondAttribute="leading" id="ywN-7g-Qvo"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="T4b-mX-xfA"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="KwL-Yf-QDJ"/>
+                    <connections>
+                        <outlet property="BottomView" destination="2dM-5h-T17" id="7tu-oX-2L8"/>
+                        <outlet property="TalkView" destination="JJu-Ge-4qk" id="axA-vA-GEl"/>
+                        <outlet property="VideoView" destination="Sbn-6r-BAf" id="Lgt-KY-hej"/>
+                        <outlet property="collectButton" destination="OEp-oA-x8U" id="fIN-1I-sVC"/>
+                        <outlet property="collectImgV" destination="6Hw-LW-oUZ" id="aMK-X9-NYH"/>
+                        <outlet property="collectL" destination="FzQ-cy-LrB" id="bvl-QX-qiF"/>
+                        <outlet property="commentButton" destination="3Ug-Dv-M4e" id="bGb-u4-9q6"/>
+                        <outlet property="commentCountL" destination="pDY-Qk-FLq" id="ysM-Mn-bj3"/>
+                        <outlet property="commentScrollBtn" destination="Pzk-xl-EkR" id="Ci1-hl-Tg2"/>
+                        <outlet property="shareButton" destination="bLP-pE-VLL" id="Np7-uZ-sSW"/>
+                        <outlet property="shareCountL" destination="2IK-03-X7G" id="6DE-fB-WMV"/>
+                        <outlet property="shareImgV" destination="Tdr-c3-AYC" id="2ak-3z-TwQ"/>
+                        <outlet property="tableView" destination="MEU-cA-SNK" id="hzN-vq-fKR"/>
+                        <outlet property="zanButton" destination="aSK-oW-CZo" id="O52-vr-cCR"/>
+                        <outlet property="zanCountL" destination="9KT-ef-Bdk" id="Q7j-LN-llY"/>
+                        <outlet property="zanImgV" destination="caZ-EV-t2e" id="iXh-oc-FFt"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="tfr-n5-aBQ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
             <point key="canvasLocation" x="458" y="827"/>
         </scene>
+        <!--Book Wei Course ListVC-->
+        <scene sceneID="Wfs-PV-Rq0">
+            <objects>
+                <viewController storyboardIdentifier="BookWeiCourseListVC" id="j14-sC-JUg" customClass="BookWeiCourseListVC" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="JF0-pU-ruc">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="88V-hJ-g5e" customClass="WQNavigationBar">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fQq-Yl-n25">
+                                        <rect key="frame" x="0.0" y="20" width="414" height="44"/>
+                                        <subviews>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Wxw-mb-rNB">
+                                                <rect key="frame" x="0.0" y="0.0" width="50" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="50" id="0xT-sK-qn0"/>
+                                                    <constraint firstAttribute="height" constant="44" id="A80-UC-4s7"/>
+                                                </constraints>
+                                                <state key="normal" image="back_black_icon"/>
+                                                <connections>
+                                                    <action selector="backAction:" destination="j14-sC-JUg" eventType="touchUpInside" id="PRU-iv-hnj"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aNN-Fn-clJ">
+                                                <rect key="frame" x="50" y="0.0" width="35" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="35" id="ACZ-ht-1aK"/>
+                                                    <constraint firstAttribute="height" constant="44" id="rFx-d8-NYV"/>
+                                                </constraints>
+                                                <state key="normal" image="menu_black_icon"/>
+                                                <connections>
+                                                    <action selector="menuAction:" destination="j14-sC-JUg" eventType="touchUpInside" id="ymq-WB-RCF"/>
+                                                </connections>
+                                            </button>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="微  课" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="J9C-DU-7Mo">
+                                                <rect key="frame" x="184" y="11.666666666666668" width="46" height="21.000000000000004"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstItem="J9C-DU-7Mo" firstAttribute="centerX" secondItem="fQq-Yl-n25" secondAttribute="centerX" id="2Yj-x4-9lI"/>
+                                            <constraint firstAttribute="height" constant="44" id="965-3N-Zec"/>
+                                            <constraint firstItem="aNN-Fn-clJ" firstAttribute="top" secondItem="Wxw-mb-rNB" secondAttribute="top" id="JkY-UY-h4t"/>
+                                            <constraint firstItem="J9C-DU-7Mo" firstAttribute="centerY" secondItem="Wxw-mb-rNB" secondAttribute="centerY" id="UIk-du-j0H"/>
+                                            <constraint firstItem="aNN-Fn-clJ" firstAttribute="leading" secondItem="Wxw-mb-rNB" secondAttribute="trailing" id="Xv1-TT-mhd"/>
+                                            <constraint firstItem="Wxw-mb-rNB" firstAttribute="leading" secondItem="fQq-Yl-n25" secondAttribute="leading" id="mcC-r9-C6r"/>
+                                            <constraint firstItem="aNN-Fn-clJ" firstAttribute="bottom" secondItem="Wxw-mb-rNB" secondAttribute="bottom" id="q7k-j9-JoW"/>
+                                            <constraint firstAttribute="bottom" secondItem="Wxw-mb-rNB" secondAttribute="bottom" id="woP-9B-8n2"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstItem="fQq-Yl-n25" firstAttribute="trailing" secondItem="OFc-ne-92i" secondAttribute="trailing" id="EzH-rn-d0X"/>
+                                    <constraint firstItem="OFc-ne-92i" firstAttribute="bottom" secondItem="fQq-Yl-n25" secondAttribute="bottom" id="hvv-0O-eWS"/>
+                                    <constraint firstAttribute="height" constant="64" id="m2n-Vy-waZ"/>
+                                    <constraint firstItem="fQq-Yl-n25" firstAttribute="leading" secondItem="OFc-ne-92i" secondAttribute="leading" id="zGq-FD-e4E"/>
+                                </constraints>
+                                <viewLayoutGuide key="safeArea" id="OFc-ne-92i"/>
+                                <connections>
+                                    <outlet property="height" destination="m2n-Vy-waZ" id="8uV-SO-5gq"/>
+                                </connections>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oW3-nG-TfH">
+                                <rect key="frame" x="0.0" y="64" width="414" height="40"/>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="jPg-Cf-di9"/>
+                                </constraints>
+                            </view>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="huj-97-wP6">
+                                <rect key="frame" x="0.0" y="104" width="80" height="632"/>
+                                <color key="backgroundColor" red="0.92156862745098034" green="0.92156862745098034" blue="0.92156862745098034" alpha="1" colorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="80" id="aeX-mX-57K"/>
+                                </constraints>
+                            </tableView>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Yxd-Gf-hH9">
+                                <rect key="frame" x="80" y="104" width="334" height="632"/>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="Brz-rD-XBo" firstAttribute="trailing" secondItem="Yxd-Gf-hH9" secondAttribute="trailing" id="5GD-sx-g6K"/>
+                            <constraint firstItem="huj-97-wP6" firstAttribute="leading" secondItem="Brz-rD-XBo" secondAttribute="leading" id="5XP-GH-Gem"/>
+                            <constraint firstItem="oW3-nG-TfH" firstAttribute="leading" secondItem="Brz-rD-XBo" secondAttribute="leading" id="Fr9-oH-Kt0"/>
+                            <constraint firstItem="88V-hJ-g5e" firstAttribute="leading" secondItem="Brz-rD-XBo" secondAttribute="leading" id="S6A-ji-cxV"/>
+                            <constraint firstItem="oW3-nG-TfH" firstAttribute="trailing" secondItem="Brz-rD-XBo" secondAttribute="trailing" id="SFD-Hz-M5n"/>
+                            <constraint firstItem="88V-hJ-g5e" firstAttribute="top" secondItem="JF0-pU-ruc" secondAttribute="top" id="WYY-vw-aIH"/>
+                            <constraint firstItem="88V-hJ-g5e" firstAttribute="trailing" secondItem="Brz-rD-XBo" secondAttribute="trailing" id="Z7d-IL-iVN"/>
+                            <constraint firstItem="oW3-nG-TfH" firstAttribute="top" secondItem="88V-hJ-g5e" secondAttribute="bottom" id="c3V-J0-EZz"/>
+                            <constraint firstItem="Brz-rD-XBo" firstAttribute="bottom" secondItem="huj-97-wP6" secondAttribute="bottom" id="kHN-o1-uL6"/>
+                            <constraint firstItem="Yxd-Gf-hH9" firstAttribute="top" secondItem="oW3-nG-TfH" secondAttribute="bottom" id="kbp-CZ-LiI"/>
+                            <constraint firstItem="Yxd-Gf-hH9" firstAttribute="leading" secondItem="huj-97-wP6" secondAttribute="trailing" id="s9S-rV-7Uq"/>
+                            <constraint firstItem="Yxd-Gf-hH9" firstAttribute="bottom" secondItem="Brz-rD-XBo" secondAttribute="bottom" id="uYo-5J-Y7l"/>
+                            <constraint firstItem="huj-97-wP6" firstAttribute="top" secondItem="oW3-nG-TfH" secondAttribute="bottom" id="xYa-t7-itt"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="Brz-rD-XBo"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="QIt-Cz-Efj"/>
+                    <connections>
+                        <outlet property="HeadView" destination="oW3-nG-TfH" id="R5g-dD-u3t"/>
+                        <outlet property="leftTableV" destination="huj-97-wP6" id="RDx-rG-wVW"/>
+                        <outlet property="rightTableV" destination="Yxd-Gf-hH9" id="7T6-DL-WYW"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ggb-Zt-nFk" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1151" y="827"/>
+        </scene>
     </scenes>
     <resources>
         <image name="Book_shaisuan_right" width="17" height="15.666666984558105"/>
         <image name="back_black_icon" width="11" height="20"/>
         <image name="back_white_icon" width="9.6666669845581055" height="17.666666030883789"/>
+        <image name="icon_share" width="19" height="17"/>
         <image name="menu_black_icon" width="16.666666030883789" height="14.666666984558105"/>
         <image name="menu_white_icon" width="17" height="15.666666984558105"/>
+        <image name="zan_no" width="14" height="14.5"/>
+        <image name="收藏五角星" width="19" height="18.333333969116211"/>
     </resources>
 </document>

+ 19 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookAlertModel.h

@@ -0,0 +1,19 @@
+//
+//  BookAlertModel.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/18.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookAlertModel : BaseModel
+@property (nonatomic, copy) NSString             * title;
+@property (nonatomic, copy) NSString             * subtitle;
+@property (nonatomic, assign) BOOL                 isSelect;
+@end
+
+NS_ASSUME_NONNULL_END

+ 13 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookAlertModel.m

@@ -0,0 +1,13 @@
+//
+//  BookAlertModel.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/18.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BookAlertModel.h"
+
+@implementation BookAlertModel
+
+@end

+ 27 - 26
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookContentNavVC.m

@@ -178,32 +178,33 @@
 
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    if (tableView == self.leftTableV) {
-        return 62.f;
-    }else if(tableView == self.middleTableV){
-        return 62.f;
-    }else{
-        BookContentLeftModel * model = [self.dataArray objectAtIndex:self.leftRow];
-        BookContentLeftModel * subModel = [model.dataArray objectAtIndex:self.middleRow];
-        BookContentModel * cModel = [subModel.dataArray objectAtIndex:indexPath.row];
-        switch (cModel.type) {
-            case BookContentBook:
-                return 120.f;
-                break;
-            case BookContentVideo:
-                return 110.f;
-                break;
-            case BookContentCourse:
-                return 110.f;
-                break;
-            case BookContentMusic:
-                return 88.f;
-                break;
-            default:
-                return UITableViewAutomaticDimension;
-                break;
-        }
-    }
+//    if (tableView == self.leftTableV) {
+//        return UITableViewAutomaticDimension;
+//    }else if(tableView == self.middleTableV){
+//        return UITableViewAutomaticDimension;
+//    }else{
+//        BookContentLeftModel * model = [self.dataArray objectAtIndex:self.leftRow];
+//        BookContentLeftModel * subModel = [model.dataArray objectAtIndex:self.middleRow];
+//        BookContentModel * cModel = [subModel.dataArray objectAtIndex:indexPath.row];
+//        switch (cModel.type) {
+//            case BookContentBook:
+//                return 120.f;
+//                break;
+//            case BookContentVideo:
+//                return 110.f;
+//                break;
+//            case BookContentCourse:
+//                return 110.f;
+//                break;
+//            case BookContentMusic:
+//                return 88.f;
+//                break;
+//            default:
+//                return UITableViewAutomaticDimension;
+//                break;
+//        }
+//    }
+    return UITableViewAutomaticDimension;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {

+ 1 - 1
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookPlayListVC.m

@@ -36,7 +36,7 @@
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell:tableView indexPath:indexPath];
+    HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell0:tableView indexPath:indexPath];
     return cell;
 }
 @end

+ 7 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookStoreHome.m

@@ -37,6 +37,7 @@
 #import "BookMingVC.h"
 #import "BookAllLookVC.h"
 #import "BookContentNavVC.h"
+#import "BookWeiCourseListVC.h"
 
 @interface BookStoreHome ()<UITableViewDelegate,UITableViewDataSource,UICollectionViewDelegate,UICollectionViewDataSource>
 @property (weak, nonatomic) IBOutlet UITableView *tableView;
@@ -464,6 +465,12 @@
             vc.titleStr = model.title;
             [self.navigationController pushViewController:vc animated:YES];
         }break;
+        case 3:
+        {
+            BookWeiCourseListVC * vc = [BookWeiCourseListVC initBookWeiCourseListVC];
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
         default:
             break;
     }

+ 4 - 4
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWeiCousreVC.h

@@ -1,8 +1,8 @@
 //
-//  BookWeiCousreVC.h
+//  BookWCDetailVC.h
 //  smartRhino
 //
-//  Created by niuzhen on 2020/5/16.
+//  Created by niuzhen on 2020/5/18.
 //  Copyright © 2020 tederen. All rights reserved.
 //
 
@@ -10,8 +10,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface BookWeiCousreVC : BaseViewController
-+(BookWeiCousreVC *)initBookWeiCousreVC;
+@interface BookWCDetailVC : BaseViewController
++(BookWCDetailVC *)initBookWCDetailVC;
 @end
 
 NS_ASSUME_NONNULL_END

+ 617 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWCDetailVC.m

@@ -0,0 +1,617 @@
+//
+//  BookWCDetailVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/18.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BookWCDetailVC.h"
+#import "PayBookAlert.h"
+#import "BookCardPayAlert.h"
+#import "BookLoginPayAlert.h"
+#import "HomeWeiCousreCell.h"
+#import "BookPlayListVC.h"
+#import "MHTopicCell.h"
+#import "MHTopic.h"
+#import "MHTopicFrame.h"
+#import "NoteBookDetailCell.h"
+
+@interface BookWCDetailVC ()<UITableViewDelegate,UITableViewDataSource,MHTopicCellDelegate>
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIView *VideoView;
+@property (weak, nonatomic) IBOutlet UIButton *commentButton;
+@property (weak, nonatomic) IBOutlet UIButton *commentScrollBtn;
+
+@property (weak, nonatomic) IBOutlet UIButton *zanButton;
+@property (weak, nonatomic) IBOutlet UIButton *collectButton;
+@property (weak, nonatomic) IBOutlet UIButton *shareButton;
+@property (weak, nonatomic) IBOutlet UILabel *commentCountL;
+@property (weak, nonatomic) IBOutlet UIImageView *zanImgV;
+@property (weak, nonatomic) IBOutlet UILabel *zanCountL;
+@property (weak, nonatomic) IBOutlet UIImageView *collectImgV;
+@property (weak, nonatomic) IBOutlet UILabel *collectL;
+@property (weak, nonatomic) IBOutlet UIImageView *shareImgV;
+@property (weak, nonatomic) IBOutlet UILabel *shareCountL;
+@property (weak, nonatomic) IBOutlet UIView *BottomView;
+@property (weak, nonatomic) IBOutlet UIView *TalkView;
+
+@property (strong,nonatomic) UIView         *desView;
+@property (strong,nonatomic) UIView         *listView;
+@property (strong,nonatomic) UILabel        *contentL;
+@property (nonatomic, strong) UIView        *buyView;
+@property (nonatomic, strong) NSMutableArray        *commentArray;
+@end
+
+@implementation BookWCDetailVC
++(BookWCDetailVC *)initBookWCDetailVC{
+    BookWCDetailVC *controller = [StoryboardManager.shared.Book instantiateViewControllerWithIdentifier:@"BookWCDetailVC"];
+    return controller;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    [self setBuyViewCard];
+    [self setBuyViewLogin];
+    [self setBuyViewData];
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    [self addCusView];
+    [self getData];
+    self.TalkView.layer.cornerRadius = 5.f;
+    self.TalkView.layer.borderWidth = 0.5f;
+    self.TalkView.layer.borderColor = UIColorHex(0xCCCCCC).CGColor;
+    self.TalkView.layer.masksToBounds = YES;
+    self.commentCountL.text = [NSString stringWithFormat:@"82\n评 论"];
+}
+
+#pragma mark - UITableViewDelegate
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    return 4;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    switch (section) {
+        case 0:
+            return 1;
+            break;
+        case 1:
+            return 1;
+            break;
+        case 2:
+            return 3;
+            break;
+        default:
+            return self.commentArray.count + 1;
+            break;
+    }
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    switch (indexPath.section) {
+        case 0:
+            return UITableViewAutomaticDimension;
+            break;
+        case 1:
+            return 110.f;
+            break;
+        case 2:
+            return UITableViewAutomaticDimension;
+            break;
+        default:
+            {
+                if (indexPath.row == 0) {
+                    return 43.f;
+                }
+                MHTopicFrame *topicFrame = self.commentArray[indexPath.row];
+                if (topicFrame.tableViewFrame.size.height == 0) {
+                    return topicFrame.height + topicFrame.tableViewFrame.size.height;
+                }else{
+                    return topicFrame.height + topicFrame.tableViewFrame.size.height;
+                }
+            }
+            break;
+    }
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    switch (section) {
+        case 1:
+            return 32.f;
+            break;
+        case 2:
+            return 50.f;
+            break;
+        default:
+            return 0.01f;
+            break;
+    }
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
+{
+    switch (section) {
+        case 2:
+            return 48.f;
+            break;
+        default:
+            return 0.01f;
+            break;
+    }
+}
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    switch (section) {
+        case 1:
+        {
+            UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 32)];
+            UILabel * label = [UILabel new];
+            label.text = @"播放列表";
+            label.textColor = UIColorHex(0x222222);
+            label.font = [UIFont systemFontOfSize:16];
+            UILabel * subL = [UILabel new];
+            subL.text = @"查看全部";
+            subL.textColor = UIColorHex(0x666666);
+            subL.font = [UIFont systemFontOfSize:15];
+            UIImageView * imgV = [UIImageView new];
+            imgV.image = IMG(@"Book_rightjian_icon");
+            [view addSubview:label];
+            [view addSubview:subL];
+            [view addSubview:imgV];
+            [label mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.left.mas_offset(15);
+                make.bottom.mas_equalTo(view);
+            }];
+            [imgV mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.right.mas_offset(-15);
+                make.centerY.mas_equalTo(label);
+            }];
+            [subL mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.right.mas_equalTo(imgV.mas_left).offset(-4);
+                make.centerY.mas_equalTo(label);
+            }];
+            WS(weakSelf);
+            UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+                BookPlayListVC * vc = [BookPlayListVC initBookPlayListVC];
+                [weakSelf.navigationController pushViewController:vc animated:YES];
+            }];
+            [view addGestureRecognizer:tap];
+            return view;
+        }
+            break;
+        case 2:
+        {
+            UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 32)];
+            UILabel * label = [UILabel new];
+            label.text = @"为你推荐";
+            label.textColor = UIColorHex(0x222222);
+            label.font = [UIFont systemFontOfSize:16];
+            [view addSubview:label];
+            [label mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.left.mas_offset(15);
+                make.bottom.mas_equalTo(view);
+            }];
+            return view;
+        }
+            break;
+        default:
+            return [UIView new];
+            break;
+    }
+}
+- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
+{
+    switch (section) {
+        case 2:
+        {
+            UIView * view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 50)];
+            UIButton * btn = [UIButton new];
+            [btn setTitle:@"换一批" forState:UIControlStateNormal];
+            [btn setTitleColor:UIColorHex(0x0F8AE3) forState:UIControlStateNormal];
+            btn.titleLabel.font = [UIFont systemFontOfSize:14];
+            [view addSubview:btn];
+            [btn mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.centerY.mas_equalTo(view);
+                make.left.mas_equalTo(view.mas_centerX).offset(-8);
+            }];
+            UIImageView * imgV = [UIImageView new];
+            imgV.image = IMG(@"Book_huan_Btn");
+            [view addSubview:imgV];
+            [imgV mas_makeConstraints:^(MASConstraintMaker *make) {
+                make.centerY.mas_equalTo(btn);
+                make.right.mas_equalTo(btn.mas_left).offset(-4);
+            }];
+            return view;
+        }
+            break;
+        default:
+            return [UIView new];
+            break;
+    }
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    switch (indexPath.section) {
+        case 0:
+        {
+            HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell2:tableView indexPath:indexPath];
+            WS(weakSelf);
+            UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseOut animations:^{
+                        weakSelf.desView.hidden = NO;
+                        [weakSelf.desView mas_remakeConstraints:^(MASConstraintMaker *make) {
+                            make.top.mas_equalTo(weakSelf.VideoView.mas_bottom);
+                            make.left.right.mas_equalTo(weakSelf.view);
+                            if (@available(iOS 11.0, *)) {
+                                make.bottom.equalTo(weakSelf.view.mas_safeAreaLayoutGuideBottom);
+                            } else {
+                                make.bottom.equalTo(weakSelf.view.mas_bottom);
+                            }
+                        }];
+                    } completion:^(BOOL finished) {
+                        [weakSelf.desView bringSubviewToFront:weakSelf.view];
+                    }];
+                });
+            }];
+            [cell.jianjieL addGestureRecognizer:tap];
+            cell.jianjieL.userInteractionEnabled = YES;
+            return cell;
+        }
+            break;
+        case 1:
+        {
+            HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell1:tableView indexPath:indexPath];
+            [cell setCollData];
+            return cell;
+        }
+            break;
+        case 2:
+        {
+            HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell0:tableView indexPath:indexPath];
+            if (indexPath.row == 2) {
+                cell.lineV.hidden = YES;
+            }
+            return cell;
+        }
+            break;
+        default:
+        {
+            if (indexPath.row == 0) {
+                NoteBookDetailCell *cell = [NoteBookDetailCell  configCell3:tableView indexPath:indexPath];
+//                cell.commentSortBtn.hidden = self.commentArray.count == 0 ? YES : NO;
+                [cell.commentSortBtn setAction:^{
+//                    weakSelf.isSort = !weakSelf.isSort;
+//                    cell.commentSortBtn.selected = !cell.commentSortBtn.isSelected;
+//                    [weakSelf sortCommentList];
+//                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//                        weakSelf.isScrComment = YES;
+//                        [weakSelf scrollToCommentViewTop];
+//                    });
+                }];
+                return cell;
+            }else{
+                            MHTopicCell *cell = [MHTopicCell cellWithTableView:tableView];
+                            cell.backgroundColor = [UIColor whiteColor];
+                            MHTopicFrame *topicFrame = self.commentArray[indexPath.row];
+                            cell.topicFrame = topicFrame;
+                            cell.createTimeLabel.text = [NSString stringWithFormat:@"%@ %@",topicFrame.topic.FloorCount,topicFrame.topic.CreatedTime];
+                            [cell.thumbBtn setAction:^{
+                //                [weakSelf gotoZanCommentHanderModel:topicFrame.topic indexPath:indexPath];
+                            }];
+                            cell.replyContentBlock = ^{
+                //                [weakSelf replyCommentName:topicFrame.topic.Name andId:[NSString stringWithFormat:@"%ld",(long)topicFrame.topic.Id]];
+                                //                if (topicFrame.topic.UserId != [AppUserModel sharedAppUserModel].Id) {
+                                //                    [weakSelf replyCommentName:topicFrame.topic.Name andId:[NSString stringWithFormat:@"%ld",(long)topicFrame.topic.Id]];
+                                //                }
+                            };
+                            __block MHTopicCell * bCell = cell;
+                            cell.longBlock = ^{
+                //                weakSelf.commentId = topicFrame.topic.Id;
+                //                weakSelf.commentStr = topicFrame.topic.Content;
+                //                weakSelf.isSelf = topicFrame.topic.UserId == [AppUserModel sharedAppUserModel].Id;
+                //                if (weakSelf.isSelf) {
+                //                    [weakSelf longDeleteSelf:bCell];
+                //                }
+                            };
+                //            cell.longSubBlock = ^(NSInteger commentId,UILabel * label,NSString * Content) {
+                //                weakSelf.commentId = commentId;
+                //                weakSelf.commentStr = Content;
+                //                [weakSelf longDeleteSubCell:label];
+                //            };
+                            cell.delegate = self;
+                            return cell;
+            }
+        }
+            break;
+    }
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+}
+- (void)getData
+{
+    WS(weakSelf);
+    self.commentArray = [NSMutableArray array];
+    NSDictionary * paraDict = @{@"ArticleId":@(522),
+                                @"TypeValue":@(0),//话题 1
+                                @"Page":@(1),
+                                @"PerPage":@(20),
+                                @"sort":@"asc"
+    };
+    [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_Comment_List) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+        NSLog(@"评论数据列表%@",responseObject);
+        if ([responseObject[@"Items"] isKindOfClass:[NSArray class]]) {
+            for (NSDictionary * dict in responseObject[@"Items"]) {
+                MHTopic * topic = [MHTopic modelWithDictionary:dict];
+                if ([[dict objectForKey:@"TopicCommentReplyResults"] isKindOfClass:[NSArray class]]) {
+                    NSMutableArray * subArray = [NSMutableArray array];
+                    for (NSDictionary * subDict in dict[@"TopicCommentReplyResults"]) {
+                        MHComment * commentModel = [MHComment modelWithDictionary:subDict];
+                        [subArray addObject:commentModel];
+                    }
+                    topic.CommentReplyResults = [NSMutableArray arrayWithArray:subArray];
+                }
+                [weakSelf.commentArray addObject:[weakSelf _topicFrameWithTopic:topic]];
+            }
+        }
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [weakSelf.tableView reloadData];
+        });
+    } failure:^(NSError * _Nonnull error) {
+//        SHOWERROR([ZYCTool handerResultData:error]);
+    }];
+}
+- (MHTopicFrame *)_topicFrameWithTopic:(MHTopic *)topic
+{
+    MHTopicFrame *topicFrame = [[MHTopicFrame alloc] init];
+    // 传递微博模型数据,计算所有子控件的frame
+    topicFrame.topic = topic;
+    
+    return topicFrame;
+}
+- (UIView *)buyView
+{
+    if (!_buyView) {
+        _buyView = [UIView new];
+    }
+    return _buyView;
+}
+- (UIView *)desView
+{
+    if (!_desView) {
+        _desView = [UIView new];
+        _desView.backgroundColor = [UIColor whiteColor];
+        _desView.hidden = YES;
+    }
+    return _desView;
+}
+- (void)addCusView
+{
+    [self.view addSubview:self.desView];
+    [self.desView addSubview:self.listView];
+    [self.desView addSubview:self.contentL];
+    [self.desView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(self.view);
+        make.top.mas_equalTo(self.BottomView.mas_bottom);
+        if (@available(iOS 11.0, *)) {
+            make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom);
+        } else {
+            make.bottom.equalTo(self.view.mas_bottom);
+        }
+    }];
+    [self.listView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.left.right.mas_equalTo(self.desView);
+        make.height.mas_offset(52);
+    }];
+    [self.contentL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.listView.mas_bottom);
+        make.left.mas_offset(15);
+        make.right.mas_offset(-15);
+    }];
+    UILabel * jianL = [UILabel new];
+    jianL.text = @"课程简介";
+    jianL.font = [UIFont systemFontOfSize:16];
+    jianL.textColor = UIColorHex(0x222222);
+    [self.listView addSubview:jianL];
+    [jianL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_offset(15);
+        make.centerY.mas_equalTo(self.listView);
+    }];
+    UIImageView * imagV = [UIImageView new];
+    imagV.image = IMG(@"Home_down_icon");
+    [self.listView addSubview:imagV];
+    [imagV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.right.mas_offset(-15);
+        make.centerY.mas_equalTo(self.listView);
+    }];
+    WS(weakSelf);
+    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [UIView animateWithDuration:0.2 delay:0 options:UIViewAnimationOptionCurveEaseIn animations:^{
+                [weakSelf.desView mas_remakeConstraints:^(MASConstraintMaker *make) {
+                    make.left.right.mas_equalTo(weakSelf.view);
+                    if (@available(iOS 11.0, *)) {
+                        make.top.bottom.equalTo(weakSelf.view.mas_safeAreaLayoutGuideBottom);
+                    } else {
+                        make.top.bottom.equalTo(weakSelf.view.mas_bottom);
+                    }
+                }];
+            } completion:^(BOOL finished) {
+                weakSelf.desView.hidden = YES;
+            }];
+        });
+    }];
+    [self.listView addGestureRecognizer:tap];
+    self.listView.userInteractionEnabled = YES;
+    self.contentL.text = @"由全国工商管理专业学位研究生教育指导委员会主办的2019年京津冀地区,MBA教育培养院校工作交流会在北京举行。 北大王宽诚讲席教授、国发院BiMBA商学院院长陈春花, 国发院助理院长、 BiMBA 商学院常务副院长范保群,国发院助理院长、BiMBA商学院MBA中心主任刘长艳,BiMBA商学院MBA中心副主任马宏莉出席。本文根据陈春花教授的演讲整理。";
+}
+- (UIView *)listView
+{
+    if (!_listView) {
+        _listView = [UIView new];
+        _listView.backgroundColor = [UIColor whiteColor];
+    }
+    return _listView;
+}
+- (UILabel *)contentL
+{
+    if (!_contentL) {
+        _contentL = [UILabel new];
+        _contentL.numberOfLines = 0;
+        _contentL.font = [UIFont systemFontOfSize:17];
+        _contentL.textColor = UIColorHex(0x0A0A0A);
+    }
+    return _contentL;
+}
+- (void)setBuyViewCard
+{
+    UIView * view = [UIView new];
+    [self.view addSubview:view];
+    [view bringSubviewToFront:self.VideoView];
+    [view mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_offset(15);
+        make.right.mas_offset(-15);
+        make.height.mas_offset(28);
+        make.bottom.mas_equalTo(self.VideoView.mas_bottom).offset(-70);
+    }];
+    UIButton * closeBtn = [UIButton new];
+    [view addSubview:closeBtn];
+    [closeBtn setImage:IMG(@"Book_close_btn") forState:UIControlStateNormal];
+    [closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.right.bottom.mas_equalTo(view);
+        make.width.mas_offset(28);
+    }];
+    UIButton * buyBtn = [UIButton new];
+    [view addSubview:buyBtn];
+    [buyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(view);
+        make.size.mas_offset(CGSizeMake(57, 17));
+        make.right.mas_equalTo(closeBtn.mas_left).offset(5);
+    }];
+    [buyBtn setTitle:@"无限卡购买" forState:UIControlStateNormal];
+    buyBtn.titleLabel.font = [UIFont systemFontOfSize:10];
+    [buyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [buyBtn setBackgroundColor:UIColorHex(0x277CF3)];
+    buyBtn.layer.cornerRadius = 8.5f;
+    buyBtn.layer.masksToBounds = YES;
+    UILabel * textL = [UILabel new];
+    textL.text = @"无限卡购买";
+    textL.font = [UIFont systemFontOfSize:12];
+    textL.textAlignment = NSTextAlignmentLeft;
+    textL.textColor = UIColorHex(0xFFFFFF);
+    [view addSubview:textL];
+    [textL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_offset(8);
+        make.centerY.mas_equalTo(view);
+        make.right.mas_equalTo(buyBtn.mas_left).offset(8);
+    }];
+    view.layer.cornerRadius = 2.f;
+    view.layer.masksToBounds = YES;
+    view.backgroundColor = [UIColor blackColor];
+    view.alpha = 0.9;
+    [buyBtn setAction:^{
+        [[BookCardPayAlert share] show];
+    }];
+}
+- (void)setBuyViewLogin
+{
+    UIView * view = [UIView new];
+    [self.view addSubview:view];
+    [view bringSubviewToFront:self.VideoView];
+    [view mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_offset(15);
+        make.right.mas_offset(-15);
+        make.height.mas_offset(28);
+        make.bottom.mas_equalTo(self.VideoView.mas_bottom).offset(-105);
+    }];
+    UIButton * closeBtn = [UIButton new];
+    [view addSubview:closeBtn];
+    [closeBtn setImage:IMG(@"Book_close_btn") forState:UIControlStateNormal];
+    [closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.right.bottom.mas_equalTo(view);
+        make.width.mas_offset(28);
+    }];
+    UIButton * buyBtn = [UIButton new];
+    [view addSubview:buyBtn];
+    [buyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(view);
+        make.size.mas_offset(CGSizeMake(57, 17));
+        make.right.mas_equalTo(closeBtn.mas_left).offset(5);
+    }];
+    [buyBtn setTitle:@"登录购买" forState:UIControlStateNormal];
+    buyBtn.titleLabel.font = [UIFont systemFontOfSize:10];
+    [buyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [buyBtn setBackgroundColor:UIColorHex(0x277CF3)];
+    buyBtn.layer.cornerRadius = 8.5f;
+    buyBtn.layer.masksToBounds = YES;
+    UILabel * textL = [UILabel new];
+    textL.text = @"登录购买";
+    textL.font = [UIFont systemFontOfSize:12];
+    textL.textAlignment = NSTextAlignmentLeft;
+    textL.textColor = UIColorHex(0xFFFFFF);
+    [view addSubview:textL];
+    [textL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_offset(8);
+        make.centerY.mas_equalTo(view);
+        make.right.mas_equalTo(buyBtn.mas_left).offset(8);
+    }];
+    view.layer.cornerRadius = 2.f;
+    view.layer.masksToBounds = YES;
+    view.backgroundColor = [UIColor blackColor];
+    view.alpha = 0.9;
+    [buyBtn setAction:^{
+        [[BookLoginPayAlert share] show];
+    }];
+}
+- (void)setBuyViewData
+{
+    [self.view addSubview:self.buyView];
+    [self.buyView bringSubviewToFront:self.VideoView];
+    [self.buyView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_offset(15);
+        make.right.mas_offset(-15);
+        make.height.mas_offset(28);
+        make.bottom.mas_equalTo(self.VideoView.mas_bottom).offset(-35);
+    }];
+    UIButton * closeBtn = [UIButton new];
+    [self.buyView addSubview:closeBtn];
+    [closeBtn setImage:IMG(@"Book_close_btn") forState:UIControlStateNormal];
+    [closeBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.right.bottom.mas_equalTo(self.buyView);
+        make.width.mas_offset(28);
+    }];
+    UIButton * buyBtn = [UIButton new];
+    [self.buyView addSubview:buyBtn];
+    [buyBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(self.buyView);
+        make.size.mas_offset(CGSizeMake(57, 17));
+        make.right.mas_equalTo(closeBtn.mas_left).offset(5);
+    }];
+    [buyBtn setTitle:@"立即购买" forState:UIControlStateNormal];
+    buyBtn.titleLabel.font = [UIFont systemFontOfSize:10];
+    [buyBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+    [buyBtn setBackgroundColor:UIColorHex(0x277CF3)];
+    buyBtn.layer.cornerRadius = 8.5f;
+    buyBtn.layer.masksToBounds = YES;
+    UILabel * textL = [UILabel new];
+    textL.text = @"试看10分钟,应版权方要求本课程需购买观看";
+    textL.font = [UIFont systemFontOfSize:12];
+    textL.textAlignment = NSTextAlignmentLeft;
+    textL.textColor = UIColorHex(0xFFFFFF);
+    [self.buyView addSubview:textL];
+    [textL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_offset(8);
+        make.centerY.mas_equalTo(self.buyView);
+        make.right.mas_equalTo(buyBtn.mas_left).offset(8);
+    }];
+    self.buyView.layer.cornerRadius = 2.f;
+    self.buyView.layer.masksToBounds = YES;
+    self.buyView.backgroundColor = [UIColor blackColor];
+    self.buyView.alpha = 0.9;
+    [buyBtn setAction:^{
+        [[PayBookAlert share] show];
+    }];
+}
+@end

+ 17 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWeiCourseListVC.h

@@ -0,0 +1,17 @@
+//
+//  BookWeiCourseListVC.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/19.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookWeiCourseListVC : BaseViewController
++(BookWeiCourseListVC *)initBookWeiCourseListVC;
+@end
+
+NS_ASSUME_NONNULL_END

+ 118 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWeiCourseListVC.m

@@ -0,0 +1,118 @@
+//
+//  BookWeiCourseListVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/19.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BookWeiCourseListVC.h"
+#import "BookContentLeftCell.h"
+#import "HomeWeiCousreCell.h"
+#import "MyTDGroupView.h"
+#import "BookContentLeftModel.h"
+
+@interface BookWeiCourseListVC ()<UITableViewDelegate,UITableViewDataSource>
+@property (weak, nonatomic) IBOutlet UIView *HeadView;
+@property (weak, nonatomic) IBOutlet UITableView *leftTableV;
+@property (weak, nonatomic) IBOutlet UITableView *rightTableV;
+@property (strong, nonatomic) MyTDGroupView      *SearchView;
+@property (assign,nonatomic) BOOL         isRow;
+@property (strong,nonatomic) NSMutableArray      *dataArray;
+@end
+
+@implementation BookWeiCourseListVC
++(BookWeiCourseListVC *)initBookWeiCourseListVC{
+    BookWeiCourseListVC *controller = [StoryboardManager.shared.Book instantiateViewControllerWithIdentifier:@"BookWeiCourseListVC"];
+    return controller;
+}
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
+- (void)setArray
+{
+    self.dataArray = [NSMutableArray array];
+    NSArray * nameArray = @[@"艺术",@"经济",@"历史",@"心理",@"文学",@"社会",@"艺术",@"经济",@"历史",@"心理",@"文学",@"社会"];
+    for (NSInteger i = 0; i < nameArray.count; i ++) {
+        BookContentLeftModel * model = [[BookContentLeftModel alloc] init];
+        model.title = nameArray[i];
+        if (i == 0) {
+            model.isSelect = YES;
+        }else{
+            model.isSelect = NO;
+        }
+        [self.dataArray addObject:model];
+    }
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    self.leftTableV.delegate = self;
+    self.leftTableV.dataSource = self;
+    self.rightTableV.delegate = self;
+    self.rightTableV.dataSource = self;
+    [self.HeadView addSubview:self.SearchView];
+    [self.SearchView  mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.right.mas_equalTo(self.HeadView);
+        make.height.mas_offset(36);
+    }];
+    [self setArray];
+    [self.leftTableV reloadData];
+    [self.rightTableV reloadData];
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.dataArray.count;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return UITableViewAutomaticDimension;
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (tableView == self.leftTableV) {
+        BookContentLeftCell * cell = [BookContentLeftCell configCell:tableView indexPath:indexPath];
+        BookContentLeftModel * model = [self.dataArray objectAtIndex:indexPath.row];
+        [cell setDataModel:model];
+        return cell;
+    }else{
+        if (self.isRow) {
+            HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell0:tableView indexPath:indexPath];
+            cell.lineLeft.constant = 15.f;
+            cell.lineRight.constant = 15.f;
+            return cell;
+        }else{
+            HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell3:tableView indexPath:indexPath];
+            return cell;
+        }
+    }
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    if (tableView == self.leftTableV) {
+        if (indexPath.row % 2 != 0) {
+            self.isRow = YES;
+        }else{
+            self.isRow = NO;
+        }
+        BookContentLeftModel * model = [self.dataArray objectAtIndex:indexPath.row];
+        for (BookContentLeftModel * sModel in self.dataArray) {
+            sModel.isSelect = NO;
+        }
+        model.isSelect = YES;
+        [self.leftTableV reloadData];
+        [self.rightTableV reloadData];
+    }else{
+        MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+        vc.type = CollectModel_Aritle;
+        vc.Id = 522;
+        vc.isMusic = YES;
+        [self.navigationController pushViewController:vc animated:YES];
+    }
+}
+@end

+ 0 - 135
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookWeiCousreVC.m

@@ -1,135 +0,0 @@
-//
-//  BookWeiCousreVC.m
-//  smartRhino
-//
-//  Created by niuzhen on 2020/5/16.
-//  Copyright © 2020 tederen. All rights reserved.
-//
-
-#import "BookWeiCousreVC.h"
-#import "BookPlayListVC.h"
-
-@interface BookWeiCousreVC ()
-@property (weak, nonatomic) IBOutlet UIView *VideoView;
-@property (strong,nonatomic) UIView         *listView;
-@property (strong,nonatomic) UILabel        *contentL;
-@property (strong,nonatomic) UIView         *allView;
-@end
-
-@implementation BookWeiCousreVC
-+(BookWeiCousreVC *)initBookWeiCousreVC{
-    BookWeiCousreVC *controller = [StoryboardManager.shared.Book instantiateViewControllerWithIdentifier:@"BookWeiCousreVC"];
-    return controller;
-}
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    self.fd_prefersNavigationBarHidden = YES;
-    [self addCusView];
-}
-- (void)addCusView
-{
-    [self.view addSubview:self.listView];
-    [self.view addSubview:self.contentL];
-    [self.listView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self.VideoView.mas_bottom);
-        make.left.right.mas_equalTo(self.view);
-        make.height.mas_offset(52);
-    }];
-    [self.contentL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self.listView.mas_bottom);
-        make.left.mas_offset(15);
-        make.right.mas_offset(-15);
-    }];
-    UILabel * jianL = [UILabel new];
-    jianL.text = @"课程简介";
-    jianL.font = [UIFont systemFontOfSize:16];
-    jianL.textColor = UIColorHex(0x222222);
-    [self.listView addSubview:jianL];
-    [jianL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_offset(15);
-        make.centerY.mas_equalTo(self.listView);
-    }];
-    UIImageView * imagV = [UIImageView new];
-    imagV.image = IMG(@"Home_down_icon");
-    [self.listView addSubview:imagV];
-    [imagV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_offset(-15);
-        make.centerY.mas_equalTo(self.listView);
-    }];
-
-    self.contentL.text = @"由全国工商管理专业学位研究生教育指导委员会主办的2019年京津冀地区,MBA教育培养院校工作交流会在北京举行。 北大王宽诚讲席教授、国发院BiMBA商学院院长陈春花, 国发院助理院长、 BiMBA 商学院常务副院长范保群,国发院助理院长、BiMBA商学院MBA中心主任刘长艳,BiMBA商学院MBA中心副主任马宏莉出席。本文根据陈春花教授的演讲整理。";
-    
-    UILabel * lineL = [UILabel new];
-    lineL.backgroundColor = LINEBGCOLOR;
-    [self.view addSubview:lineL];
-    [lineL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.mas_equalTo(self.view);
-        make.height.mas_offset(0.5);
-        make.top.mas_equalTo(self.contentL.mas_bottom).offset(15);
-    }];
-    
-    [self.view addSubview:self.allView];
-    [self.allView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(lineL.mas_bottom);
-        make.left.right.mas_equalTo(self.view);
-        make.height.mas_offset(52);
-    }];
-
-    UILabel * allL = [UILabel new];
-    allL.text = @"播放列表";
-    allL.font = [UIFont systemFontOfSize:16];
-    allL.textColor = UIColorHex(0x222222);
-    [self.allView addSubview:allL];
-    [allL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.mas_offset(15);
-        make.centerY.mas_equalTo(self.allView);
-    }];
-    UIImageView * righgtV = [UIImageView new];
-    righgtV.image = IMG(@"Book_rightjian_icon");
-    [self.allView addSubview:righgtV];
-    [righgtV mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.mas_offset(-15);
-        make.centerY.mas_equalTo(self.allView);
-    }];
-    WS(weakSelf);
-    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-        BookPlayListVC * vc = [BookPlayListVC initBookPlayListVC];
-        [weakSelf.navigationController pushViewController:vc animated:YES];
-    }];
-    [self.allView addGestureRecognizer:tap];
-    UILabel * alineL = [UILabel new];
-    alineL.backgroundColor = LINEBGCOLOR;
-    [self.view addSubview:alineL];
-    [alineL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.right.mas_equalTo(self.view);
-        make.height.mas_offset(0.5);
-        make.top.mas_equalTo(self.allView.mas_bottom);
-    }];
-}
-- (UIView *)listView
-{
-    if (!_listView) {
-        _listView = [UIView new];
-        _listView.backgroundColor = [UIColor whiteColor];
-    }
-    return _listView;
-}
-- (UIView *)allView
-{
-    if (!_allView) {
-        _allView = [UIView new];
-        _allView.backgroundColor = [UIColor whiteColor];
-    }
-    return _allView;
-}
-- (UILabel *)contentL
-{
-    if (!_contentL) {
-        _contentL = [UILabel new];
-        _contentL.numberOfLines = 0;
-        _contentL.font = [UIFont systemFontOfSize:17];
-        _contentL.textColor = UIColorHex(0x0A0A0A);
-    }
-    return _contentL;
-}
-@end

+ 26 - 35
smartRhino/Project/VCModel/Home/VC/BookStore/View/BookContentCell.xib

@@ -13,7 +13,7 @@
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="BookContentCell0" id="KGk-i7-Jjw" customClass="BookContentCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
             <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">
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
                 <rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
@@ -63,7 +63,7 @@
                         </constraints>
                     </view>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ucs-Wr-UZo">
-                        <rect key="frame" x="15" y="123.5" width="290" height="0.5"/>
+                        <rect key="frame" x="15" y="120" width="290" height="0.5"/>
                         <color key="backgroundColor" red="0.8980392157" green="0.8980392157" blue="0.8980392157" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="0.5" id="ocw-CI-YhC"/>
@@ -78,6 +78,7 @@
                     <constraint firstItem="BIg-r8-yi6" firstAttribute="centerY" secondItem="G92-eo-trM" secondAttribute="centerY" id="Gh0-rf-dw3"/>
                     <constraint firstItem="BIg-r8-yi6" firstAttribute="leading" secondItem="G92-eo-trM" secondAttribute="trailing" constant="14" id="eBn-V8-lUn"/>
                     <constraint firstItem="ucs-Wr-UZo" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="ffO-YU-63g"/>
+                    <constraint firstItem="ucs-Wr-UZo" firstAttribute="top" secondItem="G92-eo-trM" secondAttribute="bottom" constant="15" id="iKR-08-OlN"/>
                     <constraint firstAttribute="bottom" secondItem="ucs-Wr-UZo" secondAttribute="bottom" id="oug-Uv-QKy"/>
                 </constraints>
             </tableViewCellContentView>
@@ -95,7 +96,7 @@
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="BookContentCell1" id="kHg-As-U1h" customClass="BookContentCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kHg-As-U1h" id="wtM-Oa-dfY">
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="kHg-As-U1h" id="wtM-Oa-dfY">
                 <rect key="frame" x="0.0" y="0.0" width="320" height="124"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
@@ -148,7 +149,7 @@
                         </constraints>
                     </view>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hF0-2s-hZo">
-                        <rect key="frame" x="15" y="123.5" width="290" height="0.5"/>
+                        <rect key="frame" x="15" y="110" width="290" height="0.5"/>
                         <color key="backgroundColor" red="0.8980392157" green="0.8980392157" blue="0.8980392157" alpha="1" colorSpace="calibratedRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="0.5" id="9DB-ZH-SiN"/>
@@ -163,6 +164,7 @@
                     <constraint firstItem="W3c-rb-Oax" firstAttribute="top" secondItem="wtM-Oa-dfY" secondAttribute="top" constant="15" id="bBC-vT-cRn"/>
                     <constraint firstItem="pmu-z6-Mpy" firstAttribute="leading" secondItem="W3c-rb-Oax" secondAttribute="trailing" constant="14" id="coH-Pt-IyP"/>
                     <constraint firstItem="kQ1-P7-i6T" firstAttribute="centerX" secondItem="W3c-rb-Oax" secondAttribute="centerX" id="jQR-1g-7r0"/>
+                    <constraint firstItem="hF0-2s-hZo" firstAttribute="top" secondItem="W3c-rb-Oax" secondAttribute="bottom" constant="15" id="jbx-aj-eRc"/>
                     <constraint firstItem="hF0-2s-hZo" firstAttribute="leading" secondItem="wtM-Oa-dfY" secondAttribute="leading" constant="15" id="khP-eI-f4P"/>
                     <constraint firstItem="kQ1-P7-i6T" firstAttribute="centerY" secondItem="W3c-rb-Oax" secondAttribute="centerY" id="lTy-2h-mKw"/>
                     <constraint firstItem="W3c-rb-Oax" firstAttribute="leading" secondItem="wtM-Oa-dfY" secondAttribute="leading" constant="15" id="vXU-Qc-OYs"/>
@@ -203,33 +205,12 @@
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Book_Musicplay_btn" translatesAutoresizingMaskIntoConstraints="NO" id="yJK-4E-K62">
                         <rect key="frame" x="29.5" y="38" width="11" height="12.5"/>
                     </imageView>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Yns-yl-ovg">
-                        <rect key="frame" x="70" y="20" width="220.5" height="48"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="小学教材全解(四年级语文下)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mwn-3E-0Wr">
-                                <rect key="frame" x="0.0" y="0.0" width="220.5" height="21"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="王德培等" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sTz-eH-zC1">
-                                <rect key="frame" x="0.0" y="31" width="220.5" height="15"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                <color key="textColor" red="0.36470588240000001" green="0.3921568627" blue="0.43137254899999999" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                        </subviews>
-                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                        <constraints>
-                            <constraint firstItem="mwn-3E-0Wr" firstAttribute="top" secondItem="Yns-yl-ovg" secondAttribute="top" id="5hD-RC-oZ2"/>
-                            <constraint firstAttribute="trailing" secondItem="mwn-3E-0Wr" secondAttribute="trailing" id="94k-Me-Epy"/>
-                            <constraint firstItem="sTz-eH-zC1" firstAttribute="leading" secondItem="Yns-yl-ovg" secondAttribute="leading" id="IlY-7r-Tcc"/>
-                            <constraint firstAttribute="trailing" secondItem="sTz-eH-zC1" secondAttribute="trailing" id="Y0T-BY-Uxh"/>
-                            <constraint firstAttribute="height" constant="48" id="feq-Rx-Cbb"/>
-                            <constraint firstItem="mwn-3E-0Wr" firstAttribute="leading" secondItem="Yns-yl-ovg" secondAttribute="leading" id="mDR-Nt-8rb"/>
-                            <constraint firstItem="sTz-eH-zC1" firstAttribute="top" secondItem="mwn-3E-0Wr" secondAttribute="bottom" constant="10" id="nEw-Fv-tNK"/>
-                        </constraints>
-                    </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="王德培等" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sTz-eH-zC1">
+                        <rect key="frame" x="70" y="46" width="219" height="26.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" red="0.36470588240000001" green="0.3921568627" blue="0.43137254899999999" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Ag-Vj-Iun">
                         <rect key="frame" x="15" y="87.5" width="290" height="0.5"/>
                         <color key="backgroundColor" red="0.89803921568627454" green="0.89803921568627454" blue="0.89803921568627454" alpha="1" colorSpace="calibratedRGB"/>
@@ -237,23 +218,33 @@
                             <constraint firstAttribute="height" constant="0.5" id="DwM-Kl-ND8"/>
                         </constraints>
                     </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="253" verticalCompressionResistancePriority="751" text="小学教材全解(四年级语文下)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mwn-3E-0Wr">
+                        <rect key="frame" x="70" y="15" width="235" height="21"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="6Ag-Vj-Iun" secondAttribute="trailing" constant="15" id="1IG-og-wTv"/>
-                    <constraint firstItem="Yns-yl-ovg" firstAttribute="leading" secondItem="rHx-Wg-fcz" secondAttribute="trailing" constant="15" id="9Xz-b5-eZl"/>
+                    <constraint firstAttribute="trailingMargin" secondItem="sTz-eH-zC1" secondAttribute="trailing" constant="15" id="IxV-oa-SlL"/>
                     <constraint firstItem="rHx-Wg-fcz" firstAttribute="centerY" secondItem="7J1-pz-gDr" secondAttribute="centerY" id="TQx-o2-Xbp"/>
                     <constraint firstItem="yJK-4E-K62" firstAttribute="centerY" secondItem="rHx-Wg-fcz" secondAttribute="centerY" id="WxW-dF-NfO"/>
-                    <constraint firstItem="Yns-yl-ovg" firstAttribute="centerY" secondItem="rHx-Wg-fcz" secondAttribute="centerY" id="bq0-Lr-PUH"/>
+                    <constraint firstItem="6Ag-Vj-Iun" firstAttribute="top" secondItem="sTz-eH-zC1" secondAttribute="bottom" constant="15" id="aM9-ZY-iBb"/>
                     <constraint firstItem="rHx-Wg-fcz" firstAttribute="leading" secondItem="7J1-pz-gDr" secondAttribute="leading" constant="15" id="eWa-Oz-cad"/>
+                    <constraint firstItem="rHx-Wg-fcz" firstAttribute="centerY" secondItem="7J1-pz-gDr" secondAttribute="centerY" id="eeN-7t-u1S"/>
+                    <constraint firstItem="mwn-3E-0Wr" firstAttribute="leading" secondItem="rHx-Wg-fcz" secondAttribute="trailing" constant="15" id="fuC-Ui-idV"/>
+                    <constraint firstItem="sTz-eH-zC1" firstAttribute="top" secondItem="mwn-3E-0Wr" secondAttribute="bottom" constant="10" id="hw9-kv-dZm"/>
+                    <constraint firstAttribute="trailing" secondItem="mwn-3E-0Wr" secondAttribute="trailing" constant="15" id="jaR-RG-MsK"/>
                     <constraint firstItem="6Ag-Vj-Iun" firstAttribute="leading" secondItem="7J1-pz-gDr" secondAttribute="leading" constant="15" id="k3c-fm-yBt"/>
                     <constraint firstItem="yJK-4E-K62" firstAttribute="centerX" secondItem="rHx-Wg-fcz" secondAttribute="centerX" id="nle-Ag-Mze"/>
                     <constraint firstAttribute="bottom" secondItem="6Ag-Vj-Iun" secondAttribute="bottom" id="oQM-TJ-JVL"/>
+                    <constraint firstItem="mwn-3E-0Wr" firstAttribute="top" secondItem="7J1-pz-gDr" secondAttribute="top" constant="15" id="rSq-w6-Q5d"/>
+                    <constraint firstItem="sTz-eH-zC1" firstAttribute="leading" secondItem="rHx-Wg-fcz" secondAttribute="trailing" constant="15" id="rY0-XI-8iY"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="sJx-re-6hW"/>
             <connections>
-                <outlet property="conView" destination="Yns-yl-ovg" id="Or7-ER-abF"/>
-                <outlet property="constant" destination="feq-Rx-Cbb" id="igU-oK-Ctf"/>
                 <outlet property="imagV" destination="rHx-Wg-fcz" id="0Yf-Fd-QNY"/>
                 <outlet property="subTitleL" destination="sTz-eH-zC1" id="zqs-ID-G8h"/>
                 <outlet property="titleL" destination="mwn-3E-0Wr" id="ZFt-QO-dvr"/>

+ 2 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/View/BookContentLeftCell.h

@@ -14,9 +14,11 @@ NS_ASSUME_NONNULL_BEGIN
 @interface BookContentLeftCell : UITableViewCell
 @property (weak, nonatomic) IBOutlet UILabel *NameL;
 @property (weak, nonatomic) IBOutlet UIView  *BlueView;
+@property (weak, nonatomic) IBOutlet UIView *BgView;
 
 + (BookContentLeftCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
 
+- (void)setDataModel:(BookContentLeftModel *)model;
 - (void)setDataWithModel:(BookContentLeftModel *)model middleHidden:(BOOL)middle;
 - (void)setDataWithsubModel:(BookContentLeftModel *)model leftHidden:(BOOL)left;
 

+ 21 - 8
smartRhino/Project/VCModel/Home/VC/BookStore/View/BookContentLeftCell.m

@@ -28,6 +28,19 @@
     }
     return cell;
 }
+- (void)setDataModel:(BookContentLeftModel *)model
+{
+    self.NameL.text = model.title;
+    if (model.isSelect) {
+        self.BgView.backgroundColor = UIColorHex(0xFFFFFF);
+        self.BlueView.hidden = NO;
+        self.NameL.font = [UIFont systemFontOfSize:18];
+    }else{
+        self.BgView.backgroundColor = UIColorHex(0xEBEBEB);
+        self.BlueView.hidden = YES;
+        self.NameL.font = [UIFont systemFontOfSize:16];
+    }
+}
 - (void)setDataWithModel:(BookContentLeftModel *)model middleHidden:(BOOL)middle
 {
     self.NameL.text = model.title;
@@ -35,19 +48,19 @@
         self.NameL.textColor = UIColorHex(0x0A0A0A);
         if (model.isSelect) {
             self.BlueView.hidden = NO;
-            self.contentView.backgroundColor = UIColorHex(0xFFFFFF);
+            self.BgView.backgroundColor = UIColorHex(0xFFFFFF);
         }else{
             self.BlueView.hidden = YES;
-            self.contentView.backgroundColor = UIColorHex(0xEBEBEB);
+            self.BgView.backgroundColor = UIColorHex(0xEBEBEB);
         }
     }else{
         self.BlueView.hidden = YES;
         if (model.isSelect) {
             self.NameL.textColor = UIColorHex(0xFFFFFF);
-            self.contentView.backgroundColor = UIColorHex(0x3979D3);
+            self.BgView.backgroundColor = UIColorHex(0x3979D3);
         }else{
             self.NameL.textColor = UIColorHex(0x0A0A0A);
-            self.contentView.backgroundColor = UIColorHex(0xEBEBEB);
+            self.BgView.backgroundColor = UIColorHex(0xEBEBEB);
         }
     }
 }
@@ -58,20 +71,20 @@
         self.BlueView.hidden = !model.isSelect;
         if (model.isSelect) {
             self.NameL.textColor = UIColorHex(0x0A0A0A);
-            self.contentView.backgroundColor = UIColorHex(0xFFFFFF);
+            self.BgView.backgroundColor = UIColorHex(0xFFFFFF);
         }else{
             self.NameL.textColor = UIColorHex(0x0A0A0A);
-            self.contentView.backgroundColor = UIColorHex(0xDFDFDF);
+            self.BgView.backgroundColor = UIColorHex(0xDFDFDF);
         }
     }else{
         if (model.isSelect) {
             self.BlueView.hidden = NO;
             self.NameL.textColor = UIColorHex(0x3979D3);
-            self.contentView.backgroundColor = UIColorHex(0xDFDFDF);
+            self.BgView.backgroundColor = UIColorHex(0xDFDFDF);
         }else{
             self.BlueView.hidden = YES;
             self.NameL.textColor = UIColorHex(0x0A0A0A);
-            self.contentView.backgroundColor = UIColorHex(0xDFDFDF);
+            self.BgView.backgroundColor = UIColorHex(0xDFDFDF);
         }
     }
 }

+ 29 - 15
smartRhino/Project/VCModel/Home/VC/BookStore/View/BookContentLeftCell.xib

@@ -17,30 +17,44 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="推荐" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fq3-Ri-Fhn">
-                        <rect key="frame" x="143.5" y="20.5" width="33" height="19.5"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                        <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zx2-9S-OrW">
-                        <rect key="frame" x="0.0" y="21" width="4" height="18"/>
-                        <color key="backgroundColor" red="0.22352941176470587" green="0.47450980392156861" blue="0.82745098039215681" alpha="1" colorSpace="calibratedRGB"/>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4VE-0O-lnh">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="60"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="推荐" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fq3-Ri-Fhn">
+                                <rect key="frame" x="143.5" y="20.5" width="33" height="19.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                                <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zx2-9S-OrW">
+                                <rect key="frame" x="0.0" y="21" width="4" height="18"/>
+                                <color key="backgroundColor" red="0.22352941176470587" green="0.47450980392156861" blue="0.82745098039215681" alpha="1" colorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="18" id="Bew-zc-7Bu"/>
+                                    <constraint firstAttribute="width" constant="4" id="Drg-nB-5tM"/>
+                                </constraints>
+                            </view>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
-                            <constraint firstAttribute="height" constant="18" id="Bew-zc-7Bu"/>
-                            <constraint firstAttribute="width" constant="4" id="Drg-nB-5tM"/>
+                            <constraint firstItem="zx2-9S-OrW" firstAttribute="leading" secondItem="4VE-0O-lnh" secondAttribute="leading" id="ATM-Or-t2u"/>
+                            <constraint firstItem="fq3-Ri-Fhn" firstAttribute="centerX" secondItem="4VE-0O-lnh" secondAttribute="centerX" id="T2x-2n-LHl"/>
+                            <constraint firstAttribute="height" constant="60" id="WBk-Mx-zGx"/>
+                            <constraint firstItem="fq3-Ri-Fhn" firstAttribute="centerY" secondItem="4VE-0O-lnh" secondAttribute="centerY" id="mrk-uA-85C"/>
+                            <constraint firstItem="zx2-9S-OrW" firstAttribute="centerY" secondItem="4VE-0O-lnh" secondAttribute="centerY" id="wY8-QR-ngs"/>
                         </constraints>
                     </view>
                 </subviews>
                 <constraints>
-                    <constraint firstItem="fq3-Ri-Fhn" firstAttribute="centerY" secondItem="FfX-jg-4Kt" secondAttribute="centerY" id="8hW-Ol-efO"/>
-                    <constraint firstItem="zx2-9S-OrW" firstAttribute="leading" secondItem="FfX-jg-4Kt" secondAttribute="leading" id="N5H-On-fgX"/>
-                    <constraint firstItem="fq3-Ri-Fhn" firstAttribute="centerX" secondItem="FfX-jg-4Kt" secondAttribute="centerX" id="UAh-39-9T1"/>
-                    <constraint firstItem="zx2-9S-OrW" firstAttribute="centerY" secondItem="FfX-jg-4Kt" secondAttribute="centerY" id="key-iu-Z7U"/>
+                    <constraint firstItem="4VE-0O-lnh" firstAttribute="top" secondItem="FfX-jg-4Kt" secondAttribute="top" id="EWA-gp-f2E"/>
+                    <constraint firstAttribute="bottom" secondItem="4VE-0O-lnh" secondAttribute="bottom" id="IYO-ud-Ni6"/>
+                    <constraint firstItem="4VE-0O-lnh" firstAttribute="leading" secondItem="FfX-jg-4Kt" secondAttribute="leading" id="fCA-e5-Cq3"/>
+                    <constraint firstAttribute="trailing" secondItem="4VE-0O-lnh" secondAttribute="trailing" id="iB9-Go-26K"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="7fT-DN-jFz"/>
             <connections>
+                <outlet property="BgView" destination="4VE-0O-lnh" id="xKJ-O6-RbH"/>
                 <outlet property="BlueView" destination="zx2-9S-OrW" id="V3b-qo-apW"/>
                 <outlet property="NameL" destination="fq3-Ri-Fhn" id="lim-Ph-ngB"/>
             </connections>

+ 26 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/View/PayBookAlertCell.h

@@ -0,0 +1,26 @@
+//
+//  PayBookAlertCell.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/18.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "BookAlertModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PayBookAlertCell : UITableViewCell
+@property (weak, nonatomic) IBOutlet UIImageView *bgImgV;
+@property (weak, nonatomic) IBOutlet UILabel *moneyL;
+@property (weak, nonatomic) IBOutlet UILabel *subL;
+
++ (CGFloat)configCellHeight;
+
++ (PayBookAlertCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
+
+- (void)setDataModel:(BookAlertModel *)model;
+@end
+
+NS_ASSUME_NONNULL_END

+ 41 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/View/PayBookAlertCell.m

@@ -0,0 +1,41 @@
+//
+//  PayBookAlertCell.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/18.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "PayBookAlertCell.h"
+
+@implementation PayBookAlertCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+}
++ (CGFloat)configCellHeight{
+    return 68;
+}
+
++ (PayBookAlertCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{
+    static NSString *cellIdentifer = @"PayBookAlertCell";
+    PayBookAlertCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifer];
+    if (cell == nil || !cell) {
+        cell = [[[NSBundle mainBundle] loadNibNamed:@"PayBookAlertCell" owner:nil options:nil] objectAtIndex:0];
+    }
+    return cell;
+}
+- (void)setDataModel:(BookAlertModel *)model
+{
+    self.subL.text = model.subtitle;
+    self.moneyL.text = model.title;
+    self.bgImgV.hidden = !model.isSelect;
+}
+
+@end

+ 60 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/View/PayBookAlertCell.xib

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" 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="15706"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.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" id="KGk-i7-Jjw" customClass="PayBookAlertCell">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Book_payalert_bg" translatesAutoresizingMaskIntoConstraints="NO" id="Nn4-ZA-fZm">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="68"/>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9.00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ted-wp-cMA">
+                        <rect key="frame" x="20" y="12" width="46.5" height="26.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="22"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="连续包月19元/月 ·  自动续期可随时取消 " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d4a-1i-2LR">
+                        <rect key="frame" x="20" y="43.5" width="201" height="13.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <color key="backgroundColor" red="0.94901960784313721" green="0.97647058823529409" blue="0.99607843137254903" alpha="1" colorSpace="calibratedRGB"/>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="Nn4-ZA-fZm" secondAttribute="trailing" id="1Dr-ho-29V"/>
+                    <constraint firstItem="d4a-1i-2LR" firstAttribute="top" secondItem="ted-wp-cMA" secondAttribute="bottom" constant="5" id="HCp-Id-Iis"/>
+                    <constraint firstItem="ted-wp-cMA" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="12" id="SEe-7A-e1D"/>
+                    <constraint firstItem="Nn4-ZA-fZm" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="ayO-lH-nTz"/>
+                    <constraint firstItem="Nn4-ZA-fZm" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="iMS-z8-I4A"/>
+                    <constraint firstItem="d4a-1i-2LR" firstAttribute="leading" secondItem="ted-wp-cMA" secondAttribute="leading" id="jON-qh-C8L"/>
+                    <constraint firstAttribute="bottom" secondItem="Nn4-ZA-fZm" secondAttribute="bottom" id="o45-Jf-9uG"/>
+                    <constraint firstItem="ted-wp-cMA" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="qbA-NW-nNb"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
+            <connections>
+                <outlet property="bgImgV" destination="Nn4-ZA-fZm" id="3XF-FF-BvJ"/>
+                <outlet property="moneyL" destination="ted-wp-cMA" id="q7l-7N-eg5"/>
+                <outlet property="subL" destination="d4a-1i-2LR" id="ex2-Bo-cli"/>
+            </connections>
+            <point key="canvasLocation" x="137.68115942028987" y="150"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <image name="Book_payalert_bg" width="303.5" height="68"/>
+    </resources>
+</document>

+ 37 - 5
smartRhino/Project/VCModel/Home/VC/HomeViewController.m

@@ -33,7 +33,8 @@
 #import "HomeSchoolCell.h"
 #import "HomeUserPrivilegeCell.h"
 #import "HomeWeiCousreCell.h"
-#import "BookWeiCousreVC.h"
+#import "BookWCDetailVC.h"
+#import "HomeProblemTopCell.h"
 
 @interface HomeViewController () <UITableViewDataSource, UITableViewDelegate,SLBannerViewDelegate,AddChannelControllerDelegate>
 @property (nonatomic, strong) UILabel *titleLabel;
@@ -126,7 +127,7 @@
     [self.tableView.mj_header endRefreshing];
     [self.tableView.mj_footer endRefreshing];
     self.currentPage = 1;
-    if (self.currentChannel == 2 || self.currentChannel == 3 || self.currentChannel == 4 || self.currentChannel == 5) {
+    if (self.currentChannel == 2 || self.currentChannel == 3 || self.currentChannel == 4 || self.currentChannel == 5 || self.currentChannel == 6) {
         [self.tableView reloadData];
     }else{
         [self.dataSource removeAllObjects];
@@ -141,7 +142,7 @@
         [self.tableView.mj_footer resetNoMoreData];
         return;
     }
-    if (self.currentChannel == 2 || self.currentChannel == 3 || self.currentChannel == 4 || self.currentChannel == 5) {
+    if (self.currentChannel == 2 || self.currentChannel == 3 || self.currentChannel == 4 || self.currentChannel == 5|| self.currentChannel == 6) {
         [self.tableView.mj_footer resetNoMoreData];
     }else{
         [self ReGetHomeListData:self.currentChannel];
@@ -458,6 +459,11 @@
             return UITableViewAutomaticDimension;
         }
             break;
+        case 6:
+        {
+            return UITableViewAutomaticDimension;
+        }
+            break;
         default:
         {
             if (model.ImageUrls.count == 0) {
@@ -540,10 +546,22 @@
             break;
         case 5:
         {
-            HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell:tableView indexPath:indexPath];
+            HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell0:tableView indexPath:indexPath];
             return cell;
         }
             break;
+        case 6:
+        {
+            if (indexPath.row == 0) {
+                HomeProblemTopCell * cell = [HomeProblemTopCell configCell0:tableView indexPath:indexPath];
+                [cell setData];
+                return cell;
+            }else{
+                HomeProblemTopCell * cell = [HomeProblemTopCell configCell1:tableView indexPath:indexPath];
+                return cell;
+            }
+        }
+            break;
         default:
         {
             if (model.ImageUrls.count == 0) {
@@ -643,11 +661,20 @@
             break;
         case 5:
         {
-            BookWeiCousreVC * vc = [BookWeiCousreVC initBookWeiCousreVC];
+            BookWCDetailVC * vc = [BookWCDetailVC initBookWCDetailVC];
             vc.hidesBottomBarWhenPushed = YES;
             [self.navigationController pushViewController:vc animated:YES];
         }
             break;
+        case 6:
+        {
+            if (indexPath.row > 0) {
+                BookWCDetailVC * vc = [BookWCDetailVC initBookWCDetailVC];
+                vc.hidesBottomBarWhenPushed = YES;
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+        }
+            break;
         default:
         {
             MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
@@ -805,6 +832,11 @@
     bModel.ArticleGroupName = @"每日微课";
     bModel.IsSelect = NO;
     [self.myChannel addObject:bModel];
+    ChannelModel * cModel = [[ChannelModel alloc] init];
+    cModel.ArticleGroupId = 6;
+    cModel.ArticleGroupName = @"每日一题";
+    cModel.IsSelect = NO;
+    [self.myChannel addObject:cModel];
 }
 - (UIView *)noDataView
 {

+ 32 - 0
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCell.h

@@ -0,0 +1,32 @@
+//
+//  HomeProblemTopCell.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/19.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HomeProblemTopCell : UITableViewCell<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
+@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
+@property (weak, nonatomic) IBOutlet UILabel *topTitleL;
+@property (weak, nonatomic) IBOutlet UILabel *topContentL;
+@property (weak, nonatomic) IBOutlet UIButton *TopBtn;
+
+@property (weak, nonatomic) IBOutlet UILabel *TitleL;
+@property (weak, nonatomic) IBOutlet UILabel *subTitleL;
+@property (weak, nonatomic) IBOutlet UILabel *nameL;
+@property (weak, nonatomic) IBOutlet UILabel *keL;
+@property (weak, nonatomic) IBOutlet UILabel *timeL;
+@property (weak, nonatomic) IBOutlet UIImageView *yanV;
+@property (weak, nonatomic) IBOutlet UILabel *numL;
+
++ (HomeProblemTopCell *)configCell0:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
++ (HomeProblemTopCell *)configCell1:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
+- (void)setData;
+@end
+
+NS_ASSUME_NONNULL_END

+ 93 - 0
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCell.m

@@ -0,0 +1,93 @@
+//
+//  HomeProblemTopCell.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/19.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "HomeProblemTopCell.h"
+#import "HomeProblemTopCollectCell.h"
+
+@implementation HomeProblemTopCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+}
++ (HomeProblemTopCell *)configCell0:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{
+    static NSString *cellIdentifer = @"HomeProblemTopCell0";
+    HomeProblemTopCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifer];
+    if (cell == nil) {
+        cell = [[[NSBundle mainBundle] loadNibNamed:@"HomeProblemTopCell" owner:nil options:nil] objectAtIndex:0];
+    }
+    return cell;
+}
++ (HomeProblemTopCell *)configCell1:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{
+    static NSString *cellIdentifer = @"HomeProblemTopCell1";
+    HomeProblemTopCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifer];
+    if (cell == nil) {
+        cell = [[[NSBundle mainBundle] loadNibNamed:@"HomeProblemTopCell" owner:nil options:nil] objectAtIndex:1];
+    }
+    return cell;
+}
+
+- (void)setData
+{
+    self.collectionView.delegate = self;
+    self.collectionView.dataSource = self;
+    self.collectionView.showsVerticalScrollIndicator = NO;
+    self.collectionView.showsHorizontalScrollIndicator = NO;
+    [self.collectionView registerNib:[UINib nibWithNibName:@"HomeProblemTopCollectCell" bundle:nil] forCellWithReuseIdentifier:@"HomeProblemTopCollectCell"];
+    UICollectionViewFlowLayout * layout = [[UICollectionViewFlowLayout alloc]init];
+    layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
+    layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0);
+    [self.collectionView setCollectionViewLayout:layout];
+    [self.collectionView setContentOffset:CGPointZero animated:NO];
+    [self.collectionView reloadData];
+    NSString * title = @"“解不等式的方法: 从函数的角度看,就是寻求使一次函数y=kx+b 的值大于(或小于)0的自变量x的取值范围;从函数图象的角度看,就是确定直线y=kx+b在x轴上或下)方部分所有的点的横坐标所构成的集合。应对应一次函数y=kx+b,它…";
+    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:title];
+    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+    [paragraphStyle setLineSpacing:8];
+    [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, [title length])];
+    self.topContentL.attributedText = attributedString;
+}
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section
+{
+    return 5.f;
+}
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section
+{
+    return 5.f;
+}
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return 6;
+}
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
+{
+    return 1;
+}
+-(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    return CGSizeMake(101, 76);
+}
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    HomeProblemTopCollectCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"HomeProblemTopCollectCell" forIndexPath:indexPath];
+    return cell;
+}
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    [collectionView deselectItemAtIndexPath:indexPath animated:YES];
+    WS(weakSelf);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [weakSelf.collectionView scrollToItemAtIndexPath:indexPath atScrollPosition:UICollectionViewScrollPositionLeft animated:YES];
+    });
+}
+@end

+ 244 - 0
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCell.xib

@@ -0,0 +1,244 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" 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="15706"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.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="none" indentationWidth="10" reuseIdentifier="HomeProblemTopCell0" rowHeight="404" id="KGk-i7-Jjw" customClass="HomeProblemTopCell">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="453"/>
+            <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="375" height="453"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Hwm-Dg-Cf6">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="10"/>
+                        <color key="backgroundColor" red="0.97254901960784312" green="0.97647058823529409" blue="0.98431372549019602" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="10" id="saF-sq-8PP"/>
+                        </constraints>
+                    </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="今日推荐题型" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Pe-FU-0St">
+                        <rect key="frame" x="15" y="10" width="345" height="42"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="42" id="Ncc-dj-YqE"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="8xE-K0-gVr">
+                        <rect key="frame" x="15" y="52" width="360" height="76"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="76" id="Q7p-RZ-XXo"/>
+                        </constraints>
+                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="gnz-Lm-8GS">
+                            <size key="itemSize" width="50" height="50"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                        </collectionViewFlowLayout>
+                    </collectionView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="一次函数与不等式" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="86u-fE-ywa">
+                        <rect key="frame" x="15" y="128" width="345" height="50"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="50" id="Q8a-fH-3fG"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0fc-Ma-pCc">
+                        <rect key="frame" x="15" y="178" width="345" height="150.5"/>
+                        <string key="text"> “解不等式的方法: 从函数的角度看,就是寻求使一次函数y=kx+b 的值大于(或小于)0的自变量x的取值范围;  从函数图象的角度看,就是确定直线y=kx+b在x轴上 或下)方部分所有的点的横坐标所构成的集合。应对应一次函y=kx+b,它…
+                            </string>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KTX-8l-iwG">
+                        <rect key="frame" x="131" y="343.5" width="113" height="34"/>
+                        <color key="backgroundColor" red="0.22352941176470587" green="0.47450980392156861" blue="0.82745098039215681" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="113" id="V4u-6W-BDd"/>
+                            <constraint firstAttribute="height" constant="34" id="dAR-8D-Dq0"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <state key="normal" title="立即学习">
+                            <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        </state>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="4"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                        </userDefinedRuntimeAttributes>
+                    </button>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qct-MT-t6U">
+                        <rect key="frame" x="0.0" y="401" width="375" height="10"/>
+                        <color key="backgroundColor" red="0.97254901959999995" green="0.97647058819999999" blue="0.98431372549999996" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="10" id="tah-ty-B3m"/>
+                        </constraints>
+                    </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="更多题型" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lGm-zQ-AaD">
+                        <rect key="frame" x="15" y="423" width="345" height="30"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="30" id="sSt-Fj-1eC"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="16"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="qct-MT-t6U" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="3mM-rg-8XV"/>
+                    <constraint firstItem="0fc-Ma-pCc" firstAttribute="top" secondItem="86u-fE-ywa" secondAttribute="bottom" id="5xd-MU-VHO"/>
+                    <constraint firstItem="lGm-zQ-AaD" firstAttribute="top" secondItem="qct-MT-t6U" secondAttribute="bottom" constant="12" id="6QJ-WX-y8M"/>
+                    <constraint firstAttribute="trailing" secondItem="8xE-K0-gVr" secondAttribute="trailing" id="6e7-cy-gJw"/>
+                    <constraint firstItem="8xE-K0-gVr" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="7Gt-nZ-4ge"/>
+                    <constraint firstAttribute="trailing" secondItem="0fc-Ma-pCc" secondAttribute="trailing" constant="15" id="7oV-gc-lDk"/>
+                    <constraint firstAttribute="trailing" secondItem="86u-fE-ywa" secondAttribute="trailing" constant="15" id="8v7-pq-FVN"/>
+                    <constraint firstItem="8Pe-FU-0St" firstAttribute="top" secondItem="Hwm-Dg-Cf6" secondAttribute="bottom" id="BcE-FQ-OsZ"/>
+                    <constraint firstItem="qct-MT-t6U" firstAttribute="top" secondItem="KTX-8l-iwG" secondAttribute="bottom" constant="23.5" id="CPu-pm-Vf0"/>
+                    <constraint firstItem="86u-fE-ywa" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="LEP-fe-pQW"/>
+                    <constraint firstItem="KTX-8l-iwG" firstAttribute="top" secondItem="0fc-Ma-pCc" secondAttribute="bottom" constant="15" id="LPy-xI-aia"/>
+                    <constraint firstItem="86u-fE-ywa" firstAttribute="top" secondItem="8xE-K0-gVr" secondAttribute="bottom" id="LVB-Sf-gHV"/>
+                    <constraint firstAttribute="trailing" secondItem="Hwm-Dg-Cf6" secondAttribute="trailing" id="LxA-S5-hzd"/>
+                    <constraint firstItem="Hwm-Dg-Cf6" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Nph-JV-3Cd"/>
+                    <constraint firstAttribute="bottom" secondItem="lGm-zQ-AaD" secondAttribute="bottom" id="Oa1-kp-sbl"/>
+                    <constraint firstAttribute="trailing" secondItem="lGm-zQ-AaD" secondAttribute="trailing" constant="15" id="PCz-uU-18i"/>
+                    <constraint firstItem="Hwm-Dg-Cf6" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="S0N-9a-Pqn"/>
+                    <constraint firstItem="lGm-zQ-AaD" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="V2V-Ms-jnw"/>
+                    <constraint firstItem="8xE-K0-gVr" firstAttribute="top" secondItem="8Pe-FU-0St" secondAttribute="bottom" id="d0k-N8-qJ2"/>
+                    <constraint firstAttribute="trailing" secondItem="8Pe-FU-0St" secondAttribute="trailing" constant="15" id="dAE-xN-Sb2"/>
+                    <constraint firstItem="0fc-Ma-pCc" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="fLv-xT-bbb"/>
+                    <constraint firstItem="8Pe-FU-0St" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="hlT-dY-jHa"/>
+                    <constraint firstItem="KTX-8l-iwG" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="iAZ-T6-zqQ"/>
+                    <constraint firstAttribute="trailing" secondItem="qct-MT-t6U" secondAttribute="trailing" id="vvp-nU-C7f"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
+            <connections>
+                <outlet property="TopBtn" destination="KTX-8l-iwG" id="Eb8-n6-dFo"/>
+                <outlet property="collectionView" destination="8xE-K0-gVr" id="CQI-2V-n3A"/>
+                <outlet property="topContentL" destination="0fc-Ma-pCc" id="2qH-bL-vxT"/>
+                <outlet property="topTitleL" destination="86u-fE-ywa" id="laP-dm-mc6"/>
+            </connections>
+            <point key="canvasLocation" x="109.42028985507247" y="136.27232142857142"/>
+        </tableViewCell>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="HomeProblemTopCell1" rowHeight="437" id="mz1-wI-faG" customClass="HomeProblemTopCell">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="133"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mz1-wI-faG" id="0Zt-q6-Hz7">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="133"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="254" text="一次函数与不等式" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XOr-LJ-X93">
+                        <rect key="frame" x="15" y="15" width="229" height="20.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="fSS-a1-YvI">
+                        <rect key="frame" x="259" y="28.5" width="101" height="76"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="76" id="1pA-l4-ejS"/>
+                            <constraint firstAttribute="width" constant="101" id="TMC-ZL-A4x"/>
+                        </constraints>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="253" text="在水平地面点A处有一网球发射器向…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OJc-2k-Rs9">
+                        <rect key="frame" x="15" y="45.5" width="229" height="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="周亮" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1bA-O0-MTy">
+                        <rect key="frame" x="15" y="72.5" width="25" height="14.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" 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="zhq-3K-Q1t">
+                        <rect key="frame" x="15" y="97" width="100" height="20.5"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="lessThanOrEqual" constant="100" id="yxY-iA-M9p"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" 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="gfF-Yp-n7Z">
+                        <rect key="frame" x="127" y="100" width="25" height="14.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <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="Home_yun_icon" translatesAutoresizingMaskIntoConstraints="NO" id="wwx-ur-EEY">
+                        <rect key="frame" x="164" y="102" width="15" height="11"/>
+                    </imageView>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="40" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2EO-tB-e4N">
+                        <rect key="frame" x="182" y="100" width="15.5" height="14.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W6r-ue-Wb4">
+                        <rect key="frame" x="0.0" y="132.5" width="375" height="0.5"/>
+                        <color key="backgroundColor" red="0.89803921568627454" green="0.89803921568627454" blue="0.89803921568627454" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="0.5" id="OKX-zv-qMg"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="wwx-ur-EEY" firstAttribute="leading" secondItem="gfF-Yp-n7Z" secondAttribute="trailing" constant="12" id="17k-69-Yw0"/>
+                    <constraint firstItem="OJc-2k-Rs9" firstAttribute="top" secondItem="XOr-LJ-X93" secondAttribute="bottom" constant="10" id="BZC-eH-AYU"/>
+                    <constraint firstAttribute="bottom" secondItem="W6r-ue-Wb4" secondAttribute="bottom" id="Fpa-21-fQ7"/>
+                    <constraint firstItem="2EO-tB-e4N" firstAttribute="centerY" secondItem="zhq-3K-Q1t" secondAttribute="centerY" id="GdF-A1-AEY"/>
+                    <constraint firstItem="XOr-LJ-X93" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" constant="15" id="Hly-td-61E"/>
+                    <constraint firstItem="W6r-ue-Wb4" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" id="Kr4-ya-00o"/>
+                    <constraint firstItem="fSS-a1-YvI" firstAttribute="leading" secondItem="XOr-LJ-X93" secondAttribute="trailing" constant="15" id="LXI-qU-TYu"/>
+                    <constraint firstAttribute="trailing" secondItem="W6r-ue-Wb4" secondAttribute="trailing" id="NBe-RL-iYH"/>
+                    <constraint firstItem="XOr-LJ-X93" firstAttribute="top" secondItem="0Zt-q6-Hz7" secondAttribute="top" constant="15" id="OXl-nq-3C3"/>
+                    <constraint firstItem="W6r-ue-Wb4" firstAttribute="top" secondItem="zhq-3K-Q1t" secondAttribute="bottom" constant="15" id="Psc-Tm-Owi"/>
+                    <constraint firstItem="zhq-3K-Q1t" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" constant="15" id="Tru-0s-HdU"/>
+                    <constraint firstItem="fSS-a1-YvI" firstAttribute="leading" secondItem="OJc-2k-Rs9" secondAttribute="trailing" constant="15" id="Yqn-cz-Lp1"/>
+                    <constraint firstItem="gfF-Yp-n7Z" firstAttribute="centerY" secondItem="zhq-3K-Q1t" secondAttribute="centerY" id="eS3-pn-mdK"/>
+                    <constraint firstItem="gfF-Yp-n7Z" firstAttribute="leading" secondItem="zhq-3K-Q1t" secondAttribute="trailing" constant="12" id="i0G-9X-F42"/>
+                    <constraint firstItem="OJc-2k-Rs9" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" constant="15" id="nSU-NG-gbs"/>
+                    <constraint firstItem="2EO-tB-e4N" firstAttribute="leading" secondItem="wwx-ur-EEY" secondAttribute="trailing" constant="3" id="np3-wb-yk2"/>
+                    <constraint firstItem="fSS-a1-YvI" firstAttribute="centerY" secondItem="0Zt-q6-Hz7" secondAttribute="centerY" id="uoy-nE-O5z"/>
+                    <constraint firstItem="1bA-O0-MTy" firstAttribute="leading" secondItem="0Zt-q6-Hz7" secondAttribute="leading" constant="15" id="vpc-xg-I8S"/>
+                    <constraint firstAttribute="trailing" secondItem="fSS-a1-YvI" secondAttribute="trailing" constant="15" id="wIy-F6-3pO"/>
+                    <constraint firstItem="wwx-ur-EEY" firstAttribute="centerY" secondItem="2EO-tB-e4N" secondAttribute="centerY" id="y49-7k-TIc"/>
+                    <constraint firstItem="1bA-O0-MTy" firstAttribute="top" secondItem="OJc-2k-Rs9" secondAttribute="bottom" constant="10" id="yu3-Qe-kFe"/>
+                    <constraint firstItem="wwx-ur-EEY" firstAttribute="centerY" secondItem="zhq-3K-Q1t" secondAttribute="centerY" id="z0r-lT-Lf1"/>
+                    <constraint firstItem="zhq-3K-Q1t" firstAttribute="top" secondItem="1bA-O0-MTy" secondAttribute="bottom" constant="10" id="zJ5-Vz-E7p"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="zgn-76-k4X"/>
+            <connections>
+                <outlet property="TitleL" destination="XOr-LJ-X93" id="kIv-D2-bjn"/>
+                <outlet property="keL" destination="zhq-3K-Q1t" id="ZLY-lW-Dop"/>
+                <outlet property="nameL" destination="1bA-O0-MTy" id="ylb-wr-zdq"/>
+                <outlet property="numL" destination="2EO-tB-e4N" id="Dkp-rb-lo4"/>
+                <outlet property="subTitleL" destination="OJc-2k-Rs9" id="NvS-3c-RF8"/>
+                <outlet property="timeL" destination="gfF-Yp-n7Z" id="d5L-nV-KJl"/>
+                <outlet property="yanV" destination="wwx-ur-EEY" id="djY-RW-x0T"/>
+            </connections>
+            <point key="canvasLocation" x="107.97101449275362" y="465.73660714285711"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <image name="Home_yun_icon" width="15" height="11"/>
+        <image name="img_placeHolder" width="70" height="70"/>
+    </resources>
+</document>

+ 18 - 0
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCollectCell.h

@@ -0,0 +1,18 @@
+//
+//  HomeProblemTopCollectCell.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/19.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HomeProblemTopCollectCell : UICollectionViewCell
+@property (weak, nonatomic) IBOutlet UIImageView *imagV;
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 18 - 0
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCollectCell.m

@@ -0,0 +1,18 @@
+//
+//  HomeProblemTopCollectCell.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/19.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "HomeProblemTopCollectCell.h"
+
+@implementation HomeProblemTopCollectCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+@end

+ 48 - 0
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeProblemTopCollectCell.xib

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" 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="15706"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.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"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="HomeProblemTopCollectCell">
+            <rect key="frame" x="0.0" y="0.0" width="231" height="138"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="231" height="138"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_placeHolder" translatesAutoresizingMaskIntoConstraints="NO" id="4rc-NE-1Bd">
+                        <rect key="frame" x="0.0" y="0.0" width="231" height="138"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="3"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                        </userDefinedRuntimeAttributes>
+                    </imageView>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="4rc-NE-1Bd" secondAttribute="bottom" id="8mi-mR-P7G"/>
+                <constraint firstItem="4rc-NE-1Bd" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="LLb-dB-dNx"/>
+                <constraint firstAttribute="trailing" secondItem="4rc-NE-1Bd" secondAttribute="trailing" id="Rla-QN-kVk"/>
+                <constraint firstItem="4rc-NE-1Bd" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="vzp-6i-n4E"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
+            <size key="customSize" width="231" height="138"/>
+            <connections>
+                <outlet property="imagV" destination="4rc-NE-1Bd" id="jl0-BQ-qYg"/>
+            </connections>
+            <point key="canvasLocation" x="268.84057971014494" y="179.46428571428569"/>
+        </collectionViewCell>
+    </objects>
+    <resources>
+        <image name="img_placeHolder" width="70" height="70"/>
+    </resources>
+</document>

+ 12 - 3
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCell.h

@@ -10,7 +10,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface HomeWeiCousreCell : UITableViewCell
+@interface HomeWeiCousreCell : UITableViewCell<UICollectionViewDelegate,UICollectionViewDataSource,UICollectionViewDelegateFlowLayout>
+@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
 @property (weak, nonatomic) IBOutlet UIImageView *imgV;
 @property (weak, nonatomic) IBOutlet UILabel *titleL;
 @property (weak, nonatomic) IBOutlet UILabel *subTitleL;
@@ -20,8 +21,16 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UILabel *numL;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *nameContant;
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *timeContant;
-+ (HomeWeiCousreCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
-
+@property (weak, nonatomic) IBOutlet UIView *lineV;
+@property (weak, nonatomic) IBOutlet UILabel *jianjieL;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *lineLeft;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *lineRight;
+@property (strong, nonatomic) NSMutableArray  *dataArray;
++ (HomeWeiCousreCell *)configCell0:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
++ (HomeWeiCousreCell *)configCell1:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
++ (HomeWeiCousreCell *)configCell2:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
++ (HomeWeiCousreCell *)configCell3:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
+- (void)setCollData;
 @end
 
 NS_ASSUME_NONNULL_END

+ 94 - 2
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCell.m

@@ -7,6 +7,8 @@
 //
 
 #import "HomeWeiCousreCell.h"
+#import "HomeWeiCousreCollectCell.h"
+#import "BookAlertModel.h"
 
 @implementation HomeWeiCousreCell
 
@@ -21,12 +23,102 @@
 
     // Configure the view for the selected state
 }
-+ (HomeWeiCousreCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{
-    static NSString *cellIdentifer = @"HomeWeiCousreCell";
++ (HomeWeiCousreCell *)configCell0:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{
+    static NSString *cellIdentifer = @"HomeWeiCousreCell0";
     HomeWeiCousreCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifer];
     if (cell == nil) {
         cell = [[[NSBundle mainBundle] loadNibNamed:@"HomeWeiCousreCell" owner:nil options:nil] objectAtIndex:0];
     }
     return cell;
 }
++ (HomeWeiCousreCell *)configCell1:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{
+    static NSString *cellIdentifer = @"HomeWeiCousreCell1";
+    HomeWeiCousreCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifer];
+    if (cell == nil) {
+        cell = [[[NSBundle mainBundle] loadNibNamed:@"HomeWeiCousreCell" owner:nil options:nil] objectAtIndex:1];
+    }
+    return cell;
+}
++ (HomeWeiCousreCell *)configCell2:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{
+    static NSString *cellIdentifer = @"HomeWeiCousreCell2";
+    HomeWeiCousreCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifer];
+    if (cell == nil) {
+        cell = [[[NSBundle mainBundle] loadNibNamed:@"HomeWeiCousreCell" owner:nil options:nil] objectAtIndex:2];
+    }
+    return cell;
+}
++ (HomeWeiCousreCell *)configCell3:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{
+    static NSString *cellIdentifer = @"HomeWeiCousreCell3";
+    HomeWeiCousreCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifer];
+    if (cell == nil) {
+        cell = [[[NSBundle mainBundle] loadNibNamed:@"HomeWeiCousreCell" owner:nil options:nil] objectAtIndex:3];
+    }
+    return cell;
+}
+- (void)setCollData
+{
+    self.collectionView.delegate = self;
+    self.collectionView.dataSource = self;
+    self.collectionView.showsVerticalScrollIndicator = NO;
+    self.collectionView.showsHorizontalScrollIndicator = NO;
+    [self.collectionView registerNib:[UINib nibWithNibName:@"HomeWeiCousreCollectCell" bundle:nil] forCellWithReuseIdentifier:@"HomeWeiCousreCollectCell"];
+    UICollectionViewFlowLayout * layout = [[UICollectionViewFlowLayout alloc]init];
+    layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
+    layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0);
+    [self.collectionView setCollectionViewLayout:layout];
+    [self.collectionView setContentOffset:CGPointZero animated:NO];
+    [self setArray];
+    [self.collectionView reloadData];
+}
+- (void)setArray
+{
+    self.dataArray = [NSMutableArray array];
+    for (NSInteger i = 0 ; i < 8; i ++) {
+        BookAlertModel * model = [[BookAlertModel alloc] init];
+        model.title = @"高中生将面临5 种新考试!";
+        model.isSelect = i == 0 ? YES : NO;
+        [self.dataArray addObject:model];
+    }
+}
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section
+{
+    return 15.f;
+}
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section
+{
+    return 15.f;
+}
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return self.dataArray.count;
+}
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
+{
+    return 1;
+}
+-(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    return CGSizeMake(135, 80);
+}
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    HomeWeiCousreCollectCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"HomeWeiCousreCollectCell" forIndexPath:indexPath];
+    BookAlertModel * model = [self.dataArray objectAtIndex:indexPath.row];
+    [cell setDataWithTitle:model.title isSelect:model.isSelect];
+    return cell;
+}
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    [collectionView deselectItemAtIndexPath:indexPath animated:YES];
+    WS(weakSelf);
+    BookAlertModel * model = [self.dataArray objectAtIndex:indexPath.row];
+    for (BookAlertModel * smodel in self.dataArray) {
+        smodel.isSelect = NO;
+    }
+    model.isSelect = YES;
+    [self.collectionView reloadData];
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [weakSelf.collectionView scrollToItemAtIndexPath:indexPath atScrollPosition:UICollectionViewScrollPositionLeft animated:YES];
+    });
+}
 @end

+ 182 - 3
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCell.xib

@@ -10,7 +10,7 @@
     <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="137" id="KGk-i7-Jjw" customClass="HomeWeiCousreCell">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="HomeWeiCousreCell0" rowHeight="137" id="KGk-i7-Jjw" customClass="HomeWeiCousreCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="127"/>
             <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">
@@ -88,7 +88,7 @@
                     <constraint firstItem="cdf-yD-0ub" firstAttribute="leading" secondItem="fCc-3R-NJB" secondAttribute="trailing" constant="12" id="Bd5-oN-iYg"/>
                     <constraint firstItem="Ojh-TS-zhY" firstAttribute="centerY" secondItem="ztE-2b-9Wy" secondAttribute="centerY" id="Dhd-CV-IRu"/>
                     <constraint firstItem="ztE-2b-9Wy" firstAttribute="top" secondItem="zat-pn-bTP" secondAttribute="bottom" constant="12" id="F4N-hw-atb"/>
-                    <constraint firstItem="st1-VG-jPC" firstAttribute="top" secondItem="zat-pn-bTP" secondAttribute="bottom" constant="41.5" id="HMH-pz-klC"/>
+                    <constraint firstItem="st1-VG-jPC" firstAttribute="top" secondItem="ztE-2b-9Wy" secondAttribute="bottom" constant="15" id="HMH-pz-klC"/>
                     <constraint firstItem="Ojh-TS-zhY" firstAttribute="leading" secondItem="cdf-yD-0ub" secondAttribute="trailing" constant="12" id="O4b-fT-UuX"/>
                     <constraint firstItem="Xwu-8Z-Lpc" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="SNQ-1d-lpn"/>
                     <constraint firstItem="cdf-yD-0ub" firstAttribute="top" secondItem="zat-pn-bTP" secondAttribute="bottom" constant="12" id="Ub6-wz-I7H"/>
@@ -104,6 +104,9 @@
             <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
             <connections>
                 <outlet property="imgV" destination="JQz-WS-Pz6" id="pOR-D3-750"/>
+                <outlet property="lineLeft" destination="eHj-99-bAV" id="9PX-Bf-emx"/>
+                <outlet property="lineRight" destination="0Vl-zy-lWM" id="XiI-aF-2oE"/>
+                <outlet property="lineV" destination="st1-VG-jPC" id="XiU-Ef-z8b"/>
                 <outlet property="nameContant" destination="Bd5-oN-iYg" id="ty7-s1-Rd0"/>
                 <outlet property="nameL" destination="fCc-3R-NJB" id="GdB-iq-7IX"/>
                 <outlet property="numL" destination="ztE-2b-9Wy" id="Y9F-8c-rWB"/>
@@ -113,10 +116,186 @@
                 <outlet property="titleL" destination="KJB-m3-kx3" id="6ih-sS-IfC"/>
                 <outlet property="yunV" destination="Ojh-TS-zhY" id="VOV-MF-8D0"/>
             </connections>
-            <point key="canvasLocation" x="137.68115942028987" y="181.13839285714286"/>
+            <point key="canvasLocation" x="114" y="-89"/>
+        </tableViewCell>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="HomeWeiCousreCell1" rowHeight="137" id="hj2-ed-aZh" customClass="HomeWeiCousreCell">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="110"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hj2-ed-aZh" id="aqn-G2-abH">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="110"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="Jck-7h-Uq0">
+                        <rect key="frame" x="15" y="15" width="290" height="80"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="E7B-2R-aX9">
+                            <size key="itemSize" width="50" height="50"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                        </collectionViewFlowLayout>
+                    </collectionView>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hTR-k4-yg9">
+                        <rect key="frame" x="15" y="109.5" width="290" height="0.5"/>
+                        <color key="backgroundColor" red="0.8980392157" green="0.8980392157" blue="0.8980392157" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="0.5" id="5Zx-Je-jau"/>
+                        </constraints>
+                    </view>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="Jck-7h-Uq0" firstAttribute="top" secondItem="aqn-G2-abH" secondAttribute="top" constant="15" id="0Gb-Jy-bdr"/>
+                    <constraint firstAttribute="trailing" secondItem="Jck-7h-Uq0" secondAttribute="trailing" constant="15" id="39h-Cd-61p"/>
+                    <constraint firstAttribute="bottom" secondItem="hTR-k4-yg9" secondAttribute="bottom" id="eOe-O1-a5F"/>
+                    <constraint firstItem="Jck-7h-Uq0" firstAttribute="centerY" secondItem="aqn-G2-abH" secondAttribute="centerY" id="h6v-RO-7Pn"/>
+                    <constraint firstAttribute="trailing" secondItem="hTR-k4-yg9" secondAttribute="trailing" constant="15" id="va8-wZ-mOX"/>
+                    <constraint firstItem="hTR-k4-yg9" firstAttribute="leading" secondItem="aqn-G2-abH" secondAttribute="leading" constant="15" id="y6r-Em-qhc"/>
+                    <constraint firstItem="Jck-7h-Uq0" firstAttribute="leading" secondItem="aqn-G2-abH" secondAttribute="leading" constant="15" id="yBC-Xa-Y8x"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="LOB-2f-rCO"/>
+            <connections>
+                <outlet property="collectionView" destination="Jck-7h-Uq0" id="zsK-ur-dcx"/>
+            </connections>
+            <point key="canvasLocation" x="111.59420289855073" y="59.933035714285708"/>
+        </tableViewCell>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="HomeWeiCousreCell2" rowHeight="137" id="Yw5-ns-89l" customClass="HomeWeiCousreCell">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="127"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Yw5-ns-89l" id="BkQ-vH-8x8">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="127"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="理科思维记古诗——中国诗词 大会冠军陈更独家开讲" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jHa-67-RnV">
+                        <rect key="frame" x="15" y="15" width="290" height="66.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <color key="textColor" red="0.0" green="0.0" blue="0.0" 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="Zfp-E7-USX">
+                        <rect key="frame" x="15" y="93.5" width="29" height="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <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="DU8-cn-xoP">
+                        <rect key="frame" x="64" y="93.5" width="29" height="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3.7万人已学习" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e1P-BX-gYZ">
+                        <rect key="frame" x="113" y="93.5" width="91.5" height="17"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tlf-Kp-bpi">
+                        <rect key="frame" x="0.0" y="126.5" width="320" height="0.5"/>
+                        <color key="backgroundColor" red="0.8980392157" green="0.8980392157" blue="0.8980392157" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="0.5" id="HrP-aK-qQX"/>
+                        </constraints>
+                    </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qGh-xF-F3V">
+                        <rect key="frame" x="262" y="92.5" width="31" height="19"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="19" id="c92-mY-P72"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                        <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Book_rightjian_icon" translatesAutoresizingMaskIntoConstraints="NO" id="bSM-Lg-H0b">
+                        <rect key="frame" x="297" y="95" width="8" height="14"/>
+                    </imageView>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="Tlf-Kp-bpi" firstAttribute="leading" secondItem="BkQ-vH-8x8" secondAttribute="leading" id="3pS-Tp-eKw"/>
+                    <constraint firstItem="jHa-67-RnV" firstAttribute="leading" secondItem="BkQ-vH-8x8" secondAttribute="leading" constant="15" id="5vk-o3-NWz"/>
+                    <constraint firstItem="Zfp-E7-USX" firstAttribute="leading" secondItem="BkQ-vH-8x8" secondAttribute="leading" constant="15" id="8QM-6S-RPh"/>
+                    <constraint firstItem="e1P-BX-gYZ" firstAttribute="leading" secondItem="DU8-cn-xoP" secondAttribute="trailing" constant="20" id="8a8-c5-JyT"/>
+                    <constraint firstAttribute="trailing" secondItem="jHa-67-RnV" secondAttribute="trailing" constant="15" id="Aqb-Ck-b72"/>
+                    <constraint firstItem="bSM-Lg-H0b" firstAttribute="leading" secondItem="qGh-xF-F3V" secondAttribute="trailing" constant="4" id="BOg-f4-3ft"/>
+                    <constraint firstItem="Zfp-E7-USX" firstAttribute="top" secondItem="jHa-67-RnV" secondAttribute="bottom" constant="12" id="HvH-Y6-QTJ"/>
+                    <constraint firstItem="e1P-BX-gYZ" firstAttribute="top" secondItem="jHa-67-RnV" secondAttribute="bottom" constant="12" id="Lc0-xc-NgR"/>
+                    <constraint firstItem="DU8-cn-xoP" firstAttribute="top" secondItem="jHa-67-RnV" secondAttribute="bottom" constant="12" id="Mk9-Yt-WLo"/>
+                    <constraint firstItem="jHa-67-RnV" firstAttribute="top" secondItem="BkQ-vH-8x8" secondAttribute="top" constant="15" id="Vvq-WU-dd5"/>
+                    <constraint firstItem="bSM-Lg-H0b" firstAttribute="centerY" secondItem="qGh-xF-F3V" secondAttribute="centerY" id="egC-Cu-a6G"/>
+                    <constraint firstAttribute="trailing" secondItem="bSM-Lg-H0b" secondAttribute="trailing" constant="15" id="fQd-6H-rpF"/>
+                    <constraint firstItem="qGh-xF-F3V" firstAttribute="top" secondItem="jHa-67-RnV" secondAttribute="bottom" constant="11" id="gNZ-Dk-vLF"/>
+                    <constraint firstItem="Tlf-Kp-bpi" firstAttribute="top" secondItem="qGh-xF-F3V" secondAttribute="bottom" constant="15" id="h4n-CA-ecu"/>
+                    <constraint firstAttribute="trailing" secondItem="Tlf-Kp-bpi" secondAttribute="trailing" id="hwL-dV-J0h"/>
+                    <constraint firstItem="DU8-cn-xoP" firstAttribute="leading" secondItem="Zfp-E7-USX" secondAttribute="trailing" constant="20" id="mIf-ay-N5q"/>
+                    <constraint firstAttribute="bottom" secondItem="Tlf-Kp-bpi" secondAttribute="bottom" id="meY-xe-nfL"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="gMv-px-4lS"/>
+            <connections>
+                <outlet property="jianjieL" destination="qGh-xF-F3V" id="8Hf-GO-GER"/>
+                <outlet property="nameContant" destination="mIf-ay-N5q" id="5ez-pP-vec"/>
+                <outlet property="nameL" destination="Zfp-E7-USX" id="tdQ-oZ-FWU"/>
+                <outlet property="numL" destination="e1P-BX-gYZ" id="LFh-pe-tCv"/>
+                <outlet property="timeL" destination="DU8-cn-xoP" id="BvW-YX-h5s"/>
+                <outlet property="titleL" destination="jHa-67-RnV" id="RTL-YG-8c9"/>
+            </connections>
+            <point key="canvasLocation" x="111.59420289855073" y="204.57589285714286"/>
+        </tableViewCell>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="HomeWeiCousreCell3" rowHeight="119" id="kI0-1F-mCg" customClass="HomeWeiCousreCell">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kI0-1F-mCg" id="F78-ym-t2e">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="尼日尔-刚果语系" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wPm-9L-yHB">
+                        <rect key="frame" x="15" y="15" width="249.5" height="23.5"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8yz-Zj-y9d">
+                        <rect key="frame" x="15" y="79.5" width="290" height="0.5"/>
+                        <color key="backgroundColor" red="0.8980392157" green="0.8980392157" blue="0.8980392157" alpha="1" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="0.5" id="PtP-P0-aha"/>
+                        </constraints>
+                    </view>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="信息与传播理论,新闻事业,广播,电视…" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ims-E9-iUB">
+                        <rect key="frame" x="15" y="48.5" width="249.5" 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>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Book_rightjian_icon" translatesAutoresizingMaskIntoConstraints="NO" id="nhd-8V-5HL">
+                        <rect key="frame" x="279.5" y="33" width="25.5" height="14"/>
+                    </imageView>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="Ims-E9-iUB" firstAttribute="top" secondItem="wPm-9L-yHB" secondAttribute="bottom" constant="10" id="4eH-nf-VJx"/>
+                    <constraint firstItem="wPm-9L-yHB" firstAttribute="leading" secondItem="F78-ym-t2e" secondAttribute="leading" constant="15" id="A51-8N-EEZ"/>
+                    <constraint firstItem="nhd-8V-5HL" firstAttribute="centerY" secondItem="F78-ym-t2e" secondAttribute="centerY" id="Ck6-fK-ZyU"/>
+                    <constraint firstItem="wPm-9L-yHB" firstAttribute="trailing" secondItem="nhd-8V-5HL" secondAttribute="leading" constant="-15" id="DRA-Q2-Rx9"/>
+                    <constraint firstItem="Ims-E9-iUB" firstAttribute="leading" secondItem="F78-ym-t2e" secondAttribute="leading" constant="15" id="EJA-yY-q8g"/>
+                    <constraint firstItem="Ims-E9-iUB" firstAttribute="trailing" secondItem="nhd-8V-5HL" secondAttribute="leading" constant="-15" id="Hox-tV-AgI"/>
+                    <constraint firstItem="8yz-Zj-y9d" firstAttribute="top" secondItem="Ims-E9-iUB" secondAttribute="bottom" constant="15" id="TVj-rD-OGV"/>
+                    <constraint firstAttribute="trailing" secondItem="8yz-Zj-y9d" secondAttribute="trailing" constant="15" id="Zti-aJ-5ef"/>
+                    <constraint firstAttribute="bottom" secondItem="8yz-Zj-y9d" secondAttribute="bottom" id="eVl-RL-vUv"/>
+                    <constraint firstItem="8yz-Zj-y9d" firstAttribute="leading" secondItem="F78-ym-t2e" secondAttribute="leading" constant="15" id="fEZ-c5-ELy"/>
+                    <constraint firstItem="wPm-9L-yHB" firstAttribute="top" secondItem="F78-ym-t2e" secondAttribute="top" constant="15" id="i5i-Tg-sdt"/>
+                    <constraint firstAttribute="trailing" secondItem="nhd-8V-5HL" secondAttribute="trailing" constant="15" id="xxi-fq-oyl"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="joA-d3-ysF"/>
+            <connections>
+                <outlet property="subTitleL" destination="Ims-E9-iUB" id="3nK-Jk-13U"/>
+                <outlet property="titleL" destination="wPm-9L-yHB" id="knJ-Mt-t95"/>
+            </connections>
+            <point key="canvasLocation" x="111.59420289855073" y="347.54464285714283"/>
         </tableViewCell>
     </objects>
     <resources>
+        <image name="Book_rightjian_icon" width="8" height="14"/>
         <image name="Home_yun_icon" width="15" height="11"/>
         <image name="img_placeHolder" width="70" height="70"/>
     </resources>

+ 18 - 0
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCollectCell.h

@@ -0,0 +1,18 @@
+//
+//  HomeWeiCousreCollectCell.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/18.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface HomeWeiCousreCollectCell : UICollectionViewCell
+@property (weak, nonatomic) IBOutlet UILabel *titleL;
+- (void)setDataWithTitle:(NSString *)title isSelect:(BOOL)select;
+@end
+
+NS_ASSUME_NONNULL_END

+ 26 - 0
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCollectCell.m

@@ -0,0 +1,26 @@
+//
+//  HomeWeiCousreCollectCell.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/18.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "HomeWeiCousreCollectCell.h"
+
+@implementation HomeWeiCousreCollectCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+- (void)setDataWithTitle:(NSString *)title isSelect:(BOOL)select
+{
+    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:title];
+    NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
+    [paragraphStyle setLineSpacing:12];
+    [attributedString addAttribute:NSParagraphStyleAttributeName value:paragraphStyle range:NSMakeRange(0, [title length])];
+    [attributedString addAttribute:NSForegroundColorAttributeName value:select ? UIColorHex(0xFF6429) : UIColorHex(0x222222) range:NSMakeRange(0, [title length])];
+    self.titleL.attributedText = attributedString;
+}
+@end

+ 61 - 0
smartRhino/Project/VCModel/Home/VC/View/Cell/HomeWeiCousreCollectCell.xib

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" 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="15706"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.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"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="HomeWeiCousreCollectCell">
+            <rect key="frame" x="0.0" y="0.0" width="216" height="124"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="216" height="124"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bn0-Yz-Qa6">
+                        <rect key="frame" x="0.0" y="0.0" width="216" height="124"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="高中生将面临5 种新考试!" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DfN-lQ-x5P">
+                                <rect key="frame" x="15" y="15" width="186" height="94"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <fontDescription key="fontDescription" name=".PingFangSC-Regular" family=".AppleSimplifiedChineseFont" pointSize="16"/>
+                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="DfN-lQ-x5P" secondAttribute="trailing" constant="15" id="2N0-oQ-Quc"/>
+                            <constraint firstAttribute="bottom" secondItem="DfN-lQ-x5P" secondAttribute="bottom" constant="15" id="Aa8-aw-Aqw"/>
+                            <constraint firstItem="DfN-lQ-x5P" firstAttribute="leading" secondItem="bn0-Yz-Qa6" secondAttribute="leading" constant="15" id="K6L-Ws-BuJ"/>
+                            <constraint firstItem="DfN-lQ-x5P" firstAttribute="top" secondItem="bn0-Yz-Qa6" secondAttribute="top" constant="15" id="uFr-kM-cSs"/>
+                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <integer key="value" value="2"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                        </userDefinedRuntimeAttributes>
+                    </view>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstItem="bn0-Yz-Qa6" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="6Gl-J3-A6q"/>
+                <constraint firstAttribute="bottom" secondItem="bn0-Yz-Qa6" secondAttribute="bottom" id="W79-uJ-qFu"/>
+                <constraint firstItem="bn0-Yz-Qa6" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="fSY-RE-A2W"/>
+                <constraint firstAttribute="trailing" secondItem="bn0-Yz-Qa6" secondAttribute="trailing" id="ypx-9b-3qA"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
+            <size key="customSize" width="216" height="124"/>
+            <connections>
+                <outlet property="titleL" destination="DfN-lQ-x5P" id="iWH-Za-1yy"/>
+            </connections>
+            <point key="canvasLocation" x="257.97101449275362" y="174.77678571428569"/>
+        </collectionViewCell>
+    </objects>
+</document>