HF_Q 5 years ago
parent
commit
cdd8c2f5f0
100 changed files with 2740 additions and 469 deletions
  1. 160 0
      smartRhino.xcodeproj/project.pbxproj
  2. BIN
      smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/UserInterfaceState.xcuserstate
  3. 10 0
      smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  4. BIN
      smartRhino/Assets.xcassets/ChatMsg/Book_rightjian_icon.imageset/Book_rightjian_icon@2x.png
  5. BIN
      smartRhino/Assets.xcassets/ChatMsg/Book_rightjian_icon.imageset/Book_rightjian_icon@3x.png
  6. 22 0
      smartRhino/Assets.xcassets/ChatMsg/Book_rightjian_icon.imageset/Contents.json
  7. 22 0
      smartRhino/Assets.xcassets/ChatMsg/Home_down_icon.imageset/Contents.json
  8. BIN
      smartRhino/Assets.xcassets/ChatMsg/Home_down_icon.imageset/Home_down_icon@2x.png
  9. BIN
      smartRhino/Assets.xcassets/ChatMsg/Home_down_icon.imageset/Home_down_icon@3x.png
  10. BIN
      smartRhino/Assets.xcassets/首页/Book_Musicplay_btn.imageset/Book_Musicplay_btn@2x.png
  11. BIN
      smartRhino/Assets.xcassets/首页/Book_Musicplay_btn.imageset/Book_Musicplay_btn@3x.png
  12. 22 0
      smartRhino/Assets.xcassets/首页/Book_Musicplay_btn.imageset/Contents.json
  13. BIN
      smartRhino/Assets.xcassets/首页/Book_Videoplay_btn.imageset/Book_Videoplay_btn@2x.png
  14. BIN
      smartRhino/Assets.xcassets/首页/Book_Videoplay_btn.imageset/Book_Videoplay_btn@3x.png
  15. 22 0
      smartRhino/Assets.xcassets/首页/Book_Videoplay_btn.imageset/Contents.json
  16. BIN
      smartRhino/Assets.xcassets/首页/Book_shaisuan_right.imageset/Book_shaisuan_right@2x.png
  17. BIN
      smartRhino/Assets.xcassets/首页/Book_shaisuan_right.imageset/Book_shaisuan_right@3x.png
  18. 22 0
      smartRhino/Assets.xcassets/首页/Book_shaisuan_right.imageset/Contents.json
  19. BIN
      smartRhino/Assets.xcassets/首页/Book_shuangjian_left.imageset/Book_shuangjian_left@2x.png
  20. BIN
      smartRhino/Assets.xcassets/首页/Book_shuangjian_left.imageset/Book_shuangjian_left@3x.png
  21. 22 0
      smartRhino/Assets.xcassets/首页/Book_shuangjian_left.imageset/Contents.json
  22. BIN
      smartRhino/Assets.xcassets/首页/Book_top_0.imageset/Book_top_0@2x.png
  23. BIN
      smartRhino/Assets.xcassets/首页/Book_top_0.imageset/Book_top_0@3x.png
  24. 22 0
      smartRhino/Assets.xcassets/首页/Book_top_0.imageset/Contents.json
  25. BIN
      smartRhino/Assets.xcassets/首页/Book_top_1.imageset/Book_top_1@2x.png
  26. BIN
      smartRhino/Assets.xcassets/首页/Book_top_1.imageset/Book_top_1@3x.png
  27. 22 0
      smartRhino/Assets.xcassets/首页/Book_top_1.imageset/Contents.json
  28. BIN
      smartRhino/Assets.xcassets/首页/Book_top_2.imageset/Book_top_2@2x.png
  29. BIN
      smartRhino/Assets.xcassets/首页/Book_top_2.imageset/Book_top_2@3x.png
  30. 22 0
      smartRhino/Assets.xcassets/首页/Book_top_2.imageset/Contents.json
  31. BIN
      smartRhino/Assets.xcassets/首页/Book_top_3.imageset/Book_top_3@2x.png
  32. BIN
      smartRhino/Assets.xcassets/首页/Book_top_3.imageset/Book_top_3@3x.png
  33. 22 0
      smartRhino/Assets.xcassets/首页/Book_top_3.imageset/Contents.json
  34. 22 0
      smartRhino/Assets.xcassets/首页/Home_shuangjian_right.imageset/Contents.json
  35. BIN
      smartRhino/Assets.xcassets/首页/Home_shuangjian_right.imageset/Home_shuangjian_right@2x.png
  36. BIN
      smartRhino/Assets.xcassets/首页/Home_shuangjian_right.imageset/Home_shuangjian_right@3x.png
  37. 22 0
      smartRhino/Assets.xcassets/首页/Home_yun_icon.imageset/Contents.json
  38. BIN
      smartRhino/Assets.xcassets/首页/Home_yun_icon.imageset/Home_yun_icon@2x.png
  39. BIN
      smartRhino/Assets.xcassets/首页/Home_yun_icon.imageset/Home_yun_icon@3x.png
  40. 22 0
      smartRhino/Assets.xcassets/首页/VIP_Icon.imageset/Contents.json
  41. BIN
      smartRhino/Assets.xcassets/首页/VIP_Icon.imageset/VIP_Icon@2x.png
  42. BIN
      smartRhino/Assets.xcassets/首页/VIP_Icon.imageset/VIP_Icon@3x.png
  43. 22 0
      smartRhino/Assets.xcassets/首页/back_white_icon.imageset/Contents.json
  44. BIN
      smartRhino/Assets.xcassets/首页/back_white_icon.imageset/back_white_icon@2x.png
  45. BIN
      smartRhino/Assets.xcassets/首页/back_white_icon.imageset/back_white_icon@3x.png
  46. 22 0
      smartRhino/Assets.xcassets/首页/home_guangbo_icon.imageset/Contents.json
  47. BIN
      smartRhino/Assets.xcassets/首页/home_guangbo_icon.imageset/home_guangbo_icon@2x.png
  48. BIN
      smartRhino/Assets.xcassets/首页/home_guangbo_icon.imageset/home_guangbo_icon@3x.png
  49. 22 0
      smartRhino/Assets.xcassets/首页/home_music_icon.imageset/Contents.json
  50. BIN
      smartRhino/Assets.xcassets/首页/home_music_icon.imageset/home_music_icon@2x.png
  51. BIN
      smartRhino/Assets.xcassets/首页/home_music_icon.imageset/home_music_icon@3x.png
  52. 22 0
      smartRhino/Assets.xcassets/首页/home_pdAdd_icon.imageset/Contents.json
  53. BIN
      smartRhino/Assets.xcassets/首页/home_pdAdd_icon.imageset/home_pdAdd_icon@2x.png
  54. BIN
      smartRhino/Assets.xcassets/首页/home_pdAdd_icon.imageset/home_pdAdd_icon@3x.png
  55. 22 0
      smartRhino/Assets.xcassets/首页/home_ting_icon.imageset/Contents.json
  56. BIN
      smartRhino/Assets.xcassets/首页/home_ting_icon.imageset/home_ting_icon@2x.png
  57. BIN
      smartRhino/Assets.xcassets/首页/home_ting_icon.imageset/home_ting_icon@3x.png
  58. 22 0
      smartRhino/Assets.xcassets/首页/menu_white_icon.imageset/Contents.json
  59. BIN
      smartRhino/Assets.xcassets/首页/menu_white_icon.imageset/menu_white_icon@2x.png
  60. BIN
      smartRhino/Assets.xcassets/首页/menu_white_icon.imageset/menu_white_icon@3x.png
  61. 9 0
      smartRhino/FwzAppConfig.h
  62. 2 2
      smartRhino/Project/VCModel/ChatMessage/ChatMsg.storyboard
  63. 3 2
      smartRhino/Project/VCModel/ChatMessage/Controller/ChatMsgListVC.m
  64. 102 169
      smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailListByZuVC.m
  65. 18 19
      smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailListVC.m
  66. 2 2
      smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/ShareCusVC.m
  67. 2 2
      smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/ShareListVC.m
  68. 2 2
      smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/ShareSysVC.m
  69. 31 8
      smartRhino/Project/VCModel/ChatMessage/Controller/MailList/MailList.storyboard
  70. 14 3
      smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/TDGroup.storyboard
  71. 142 129
      smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/MyTDGroupViewController.m
  72. 2 2
      smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/TDGroupInfoDetailVC.m
  73. 26 20
      smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/TDGroupInfoListVC.m
  74. 14 2
      smartRhino/Project/VCModel/ChatMessage/Controller/TDInternalLeter/contoller/TDInterLeterHome.storyboard
  75. 94 97
      smartRhino/Project/VCModel/ChatMessage/Controller/TDInternalLeter/contoller/TDInterLeterHomeViewController.m
  76. 1 0
      smartRhino/Project/VCModel/ChatMessage/View/ChatMsgListCell.h
  77. 17 3
      smartRhino/Project/VCModel/ChatMessage/View/ChatMsgListCell.xib
  78. 11 1
      smartRhino/Project/VCModel/Home/OtherHomeVC/ClickOK/AddChannel/AddChannelController.m
  79. 3 3
      smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/MyTDTopicGroupUserVC.m
  80. 2 2
      smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/MyTDTopicViewController.m
  81. 603 1
      smartRhino/Project/VCModel/Home/VC/BookStore/BookStore.storyboard
  82. 19 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookContentLeftModel.h
  83. 13 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookContentLeftModel.m
  84. 26 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookContentModel.h
  85. 13 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookContentModel.m
  86. 18 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookContentTopModel.h
  87. 13 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookContentTopModel.m
  88. 22 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookHomeModel.h
  89. 13 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookHomeModel.m
  90. 21 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookHomeSubModel.h
  91. 13 0
      smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookHomeSubModel.m
  92. 18 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookAllLookVC.h
  93. 134 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookAllLookVC.m
  94. 18 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookContentNavVC.h
  95. 419 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookContentNavVC.m
  96. 18 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookMingVC.h
  97. 215 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookMingVC.m
  98. 17 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookPlayListVC.h
  99. 42 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookPlayListVC.m
  100. 0 0
      smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookStoreHome.m

+ 160 - 0
smartRhino.xcodeproj/project.pbxproj

@@ -751,6 +751,18 @@
 		EB0FA5D1241F6DBD00BF8558 /* HomeScrCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB0FA5CF241F6DBD00BF8558 /* HomeScrCell.xib */; };
 		EB12500A23CC359400143436 /* RichFileCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB12500823CC359400143436 /* RichFileCell.m */; };
 		EB1BA21323FFD6E500202452 /* H6ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1BA21223FFD6E500202452 /* H6ViewController.m */; };
+		EB1E0F73246CD5A300D4C3DE /* BookAllLookCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1E0F71246CD5A300D4C3DE /* BookAllLookCell.m */; };
+		EB1E0F74246CD5A300D4C3DE /* BookAllLookCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB1E0F72246CD5A300D4C3DE /* BookAllLookCell.xib */; };
+		EB1E0F77246CE49100D4C3DE /* BookContentNavVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1E0F76246CE49100D4C3DE /* BookContentNavVC.m */; };
+		EB1E0F7B246D0DA700D4C3DE /* BookContentLeftCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1E0F79246D0DA700D4C3DE /* BookContentLeftCell.m */; };
+		EB1E0F7C246D0DA700D4C3DE /* BookContentLeftCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB1E0F7A246D0DA700D4C3DE /* BookContentLeftCell.xib */; };
+		EB1E0F7F246D0FDB00D4C3DE /* BookContentLeftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1E0F7E246D0FDB00D4C3DE /* BookContentLeftModel.m */; };
+		EB1E0F82246D0FF300D4C3DE /* BookContentTopModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1E0F81246D0FF300D4C3DE /* BookContentTopModel.m */; };
+		EB1E0F85246D100200D4C3DE /* BookContentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1E0F84246D100200D4C3DE /* BookContentModel.m */; };
+		EB1E0F89246D17B600D4C3DE /* BookContentCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1E0F87246D17B600D4C3DE /* BookContentCell.m */; };
+		EB1E0F8A246D17B600D4C3DE /* BookContentCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB1E0F88246D17B600D4C3DE /* BookContentCell.xib */; };
+		EB1E0F8E246D4A9700D4C3DE /* BookContentTopCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1E0F8C246D4A9700D4C3DE /* BookContentTopCell.m */; };
+		EB1E0F8F246D4A9700D4C3DE /* BookContentTopCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB1E0F8D246D4A9700D4C3DE /* BookContentTopCell.xib */; };
 		EB2B5A72242B0CA40087E1E7 /* MyNewFindUserCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB2B5A70242B0CA40087E1E7 /* MyNewFindUserCell.m */; };
 		EB2B5A73242B0CA40087E1E7 /* MyNewFindUserCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB2B5A71242B0CA40087E1E7 /* MyNewFindUserCell.xib */; };
 		EB2B5A76242B36010087E1E7 /* OtherNoteBookVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB2B5A75242B36010087E1E7 /* OtherNoteBookVC.m */; };
@@ -784,6 +796,14 @@
 		EB3EAFF123A31C7D00C38AB4 /* TDGroupInfoDetailVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB3EAFF023A31C7D00C38AB4 /* TDGroupInfoDetailVC.m */; };
 		EB41513B246BC64800030371 /* BookStore.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EB41513A246BC64800030371 /* BookStore.storyboard */; };
 		EB41513E246BC71500030371 /* BookStoreHome.m in Sources */ = {isa = PBXBuildFile; fileRef = EB41513D246BC71500030371 /* BookStoreHome.m */; };
+		EB415142246BCD6C00030371 /* BookHomeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB415140246BCD6C00030371 /* BookHomeCell.m */; };
+		EB415143246BCD6C00030371 /* BookHomeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB415141246BCD6C00030371 /* BookHomeCell.xib */; };
+		EB415146246BD1CB00030371 /* BookHomeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB415145246BD1CB00030371 /* BookHomeModel.m */; };
+		EB41514A246BD58F00030371 /* BookHomeSubCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB415148246BD58F00030371 /* BookHomeSubCell.m */; };
+		EB41514B246BD58F00030371 /* BookHomeSubCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB415149246BD58F00030371 /* BookHomeSubCell.xib */; };
+		EB41514E246BDEB900030371 /* BookHomeSubModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB41514D246BDEB900030371 /* BookHomeSubModel.m */; };
+		EB415151246C001D00030371 /* BookMingVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB415150246C001D00030371 /* BookMingVC.m */; };
+		EB415154246C071300030371 /* BookAllLookVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB415153246C071300030371 /* BookAllLookVC.m */; };
 		EB440FC523A32302006BCB95 /* TDGroupInfoDetailCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB440FC323A32302006BCB95 /* TDGroupInfoDetailCell.m */; };
 		EB440FC623A32302006BCB95 /* TDGroupInfoDetailCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB440FC423A32302006BCB95 /* TDGroupInfoDetailCell.xib */; };
 		EB440FC923A3324F006BCB95 /* createSearchBarView.m in Sources */ = {isa = PBXBuildFile; fileRef = EB440FC823A3324F006BCB95 /* createSearchBarView.m */; };
@@ -809,6 +829,14 @@
 		EB629DFF2416206200A5E0EE /* _NoInputAccessoryView.m in Sources */ = {isa = PBXBuildFile; fileRef = EB629DFE2416206200A5E0EE /* _NoInputAccessoryView.m */; };
 		EB674D07242E126C003FEC6D /* MoveSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB674D06242E126C003FEC6D /* MoveSearchVC.m */; };
 		EB6D1C1623F6B590000D2EF8 /* FileOpenViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6D1C1523F6B590000D2EF8 /* FileOpenViewController.m */; };
+		EB6E84D0246F99A200BE0524 /* HomeSchoolCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6E84CE246F99A200BE0524 /* HomeSchoolCell.m */; };
+		EB6E84D1246F99A200BE0524 /* HomeSchoolCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB6E84CF246F99A200BE0524 /* HomeSchoolCell.xib */; };
+		EB6E84D5246FB90300BE0524 /* HomeUserPrivilegeCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB6E84D3246FB90300BE0524 /* HomeUserPrivilegeCell.m */; };
+		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 */; };
 		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 */; };
@@ -1155,6 +1183,8 @@
 		EBF64A76241C73510074FD55 /* WorkFlowFecordSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF64A75241C73510074FD55 /* WorkFlowFecordSearchVC.m */; };
 		EBF64A79241C810A0074FD55 /* FecordSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF64A78241C810A0074FD55 /* FecordSearchVC.m */; };
 		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 */; };
 		EBFC605A23FE52DE00A6874B /* HomeCommentView.m in Sources */ = {isa = PBXBuildFile; fileRef = EBFC605923FE52DE00A6874B /* HomeCommentView.m */; };
 		EBFC605C23FE52EE00A6874B /* HomeCommentView.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBFC605B23FE52EE00A6874B /* HomeCommentView.xib */; };
 		EBFDDADA241B9DA100875D8A /* ReadSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBFDDAD9241B9DA100875D8A /* ReadSearchVC.m */; };
@@ -2493,6 +2523,26 @@
 		EB12500823CC359400143436 /* RichFileCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RichFileCell.m; sourceTree = "<group>"; };
 		EB1BA21123FFD6E500202452 /* H6ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = H6ViewController.h; sourceTree = "<group>"; };
 		EB1BA21223FFD6E500202452 /* H6ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = H6ViewController.m; sourceTree = "<group>"; };
+		EB1E0F70246CD5A300D4C3DE /* BookAllLookCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookAllLookCell.h; sourceTree = "<group>"; };
+		EB1E0F71246CD5A300D4C3DE /* BookAllLookCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookAllLookCell.m; sourceTree = "<group>"; };
+		EB1E0F72246CD5A300D4C3DE /* BookAllLookCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookAllLookCell.xib; sourceTree = "<group>"; };
+		EB1E0F75246CE49100D4C3DE /* BookContentNavVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookContentNavVC.h; sourceTree = "<group>"; };
+		EB1E0F76246CE49100D4C3DE /* BookContentNavVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookContentNavVC.m; sourceTree = "<group>"; };
+		EB1E0F78246D0DA700D4C3DE /* BookContentLeftCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookContentLeftCell.h; sourceTree = "<group>"; };
+		EB1E0F79246D0DA700D4C3DE /* BookContentLeftCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookContentLeftCell.m; sourceTree = "<group>"; };
+		EB1E0F7A246D0DA700D4C3DE /* BookContentLeftCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookContentLeftCell.xib; sourceTree = "<group>"; };
+		EB1E0F7D246D0FDB00D4C3DE /* BookContentLeftModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookContentLeftModel.h; sourceTree = "<group>"; };
+		EB1E0F7E246D0FDB00D4C3DE /* BookContentLeftModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookContentLeftModel.m; sourceTree = "<group>"; };
+		EB1E0F80246D0FF300D4C3DE /* BookContentTopModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookContentTopModel.h; sourceTree = "<group>"; };
+		EB1E0F81246D0FF300D4C3DE /* BookContentTopModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookContentTopModel.m; sourceTree = "<group>"; };
+		EB1E0F83246D100200D4C3DE /* BookContentModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookContentModel.h; sourceTree = "<group>"; };
+		EB1E0F84246D100200D4C3DE /* BookContentModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookContentModel.m; sourceTree = "<group>"; };
+		EB1E0F86246D17B600D4C3DE /* BookContentCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookContentCell.h; sourceTree = "<group>"; };
+		EB1E0F87246D17B600D4C3DE /* BookContentCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookContentCell.m; sourceTree = "<group>"; };
+		EB1E0F88246D17B600D4C3DE /* BookContentCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookContentCell.xib; sourceTree = "<group>"; };
+		EB1E0F8B246D4A9700D4C3DE /* BookContentTopCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookContentTopCell.h; sourceTree = "<group>"; };
+		EB1E0F8C246D4A9700D4C3DE /* BookContentTopCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookContentTopCell.m; sourceTree = "<group>"; };
+		EB1E0F8D246D4A9700D4C3DE /* BookContentTopCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookContentTopCell.xib; sourceTree = "<group>"; };
 		EB2B5A6F242B0CA40087E1E7 /* MyNewFindUserCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyNewFindUserCell.h; sourceTree = "<group>"; };
 		EB2B5A70242B0CA40087E1E7 /* MyNewFindUserCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyNewFindUserCell.m; sourceTree = "<group>"; };
 		EB2B5A71242B0CA40087E1E7 /* MyNewFindUserCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyNewFindUserCell.xib; sourceTree = "<group>"; };
@@ -2551,6 +2601,20 @@
 		EB41513A246BC64800030371 /* BookStore.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BookStore.storyboard; sourceTree = "<group>"; };
 		EB41513C246BC71500030371 /* BookStoreHome.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookStoreHome.h; sourceTree = "<group>"; };
 		EB41513D246BC71500030371 /* BookStoreHome.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookStoreHome.m; sourceTree = "<group>"; };
+		EB41513F246BCD6C00030371 /* BookHomeCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookHomeCell.h; sourceTree = "<group>"; };
+		EB415140246BCD6C00030371 /* BookHomeCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookHomeCell.m; sourceTree = "<group>"; };
+		EB415141246BCD6C00030371 /* BookHomeCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookHomeCell.xib; sourceTree = "<group>"; };
+		EB415144246BD1CB00030371 /* BookHomeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookHomeModel.h; sourceTree = "<group>"; };
+		EB415145246BD1CB00030371 /* BookHomeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookHomeModel.m; sourceTree = "<group>"; };
+		EB415147246BD58F00030371 /* BookHomeSubCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookHomeSubCell.h; sourceTree = "<group>"; };
+		EB415148246BD58F00030371 /* BookHomeSubCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookHomeSubCell.m; sourceTree = "<group>"; };
+		EB415149246BD58F00030371 /* BookHomeSubCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookHomeSubCell.xib; sourceTree = "<group>"; };
+		EB41514C246BDEB900030371 /* BookHomeSubModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookHomeSubModel.h; sourceTree = "<group>"; };
+		EB41514D246BDEB900030371 /* BookHomeSubModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookHomeSubModel.m; sourceTree = "<group>"; };
+		EB41514F246C001D00030371 /* BookMingVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookMingVC.h; sourceTree = "<group>"; };
+		EB415150246C001D00030371 /* BookMingVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookMingVC.m; sourceTree = "<group>"; };
+		EB415152246C071300030371 /* BookAllLookVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookAllLookVC.h; sourceTree = "<group>"; };
+		EB415153246C071300030371 /* BookAllLookVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BookAllLookVC.m; sourceTree = "<group>"; };
 		EB440FC223A32302006BCB95 /* TDGroupInfoDetailCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TDGroupInfoDetailCell.h; sourceTree = "<group>"; };
 		EB440FC323A32302006BCB95 /* TDGroupInfoDetailCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TDGroupInfoDetailCell.m; sourceTree = "<group>"; };
 		EB440FC423A32302006BCB95 /* TDGroupInfoDetailCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TDGroupInfoDetailCell.xib; sourceTree = "<group>"; };
@@ -2597,6 +2661,19 @@
 		EB674D06242E126C003FEC6D /* MoveSearchVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MoveSearchVC.m; sourceTree = "<group>"; };
 		EB6D1C1423F6B590000D2EF8 /* FileOpenViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FileOpenViewController.h; sourceTree = "<group>"; };
 		EB6D1C1523F6B590000D2EF8 /* FileOpenViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FileOpenViewController.m; sourceTree = "<group>"; };
+		EB6E84CD246F99A200BE0524 /* HomeSchoolCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeSchoolCell.h; sourceTree = "<group>"; };
+		EB6E84CE246F99A200BE0524 /* HomeSchoolCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeSchoolCell.m; sourceTree = "<group>"; };
+		EB6E84CF246F99A200BE0524 /* HomeSchoolCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeSchoolCell.xib; sourceTree = "<group>"; };
+		EB6E84D2246FB90300BE0524 /* HomeUserPrivilegeCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeUserPrivilegeCell.h; sourceTree = "<group>"; };
+		EB6E84D3246FB90300BE0524 /* HomeUserPrivilegeCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeUserPrivilegeCell.m; sourceTree = "<group>"; };
+		EB6E84D4246FB90300BE0524 /* HomeUserPrivilegeCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeUserPrivilegeCell.xib; sourceTree = "<group>"; };
+		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>"; };
 		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>"; };
@@ -3161,6 +3238,9 @@
 		EBF64A78241C810A0074FD55 /* FecordSearchVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FecordSearchVC.m; 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>"; };
+		EBFA5EF2246E374A00915D5F /* HomeMusicCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeMusicCell.m; sourceTree = "<group>"; };
+		EBFA5EF3246E374A00915D5F /* HomeMusicCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeMusicCell.xib; sourceTree = "<group>"; };
 		EBFC605823FE52DE00A6874B /* HomeCommentView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeCommentView.h; sourceTree = "<group>"; };
 		EBFC605923FE52DE00A6874B /* HomeCommentView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeCommentView.m; sourceTree = "<group>"; };
 		EBFC605B23FE52EE00A6874B /* HomeCommentView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeCommentView.xib; sourceTree = "<group>"; };
@@ -5276,6 +5356,18 @@
 				EB8143BF24407A3E00C439A9 /* AddChanelNoDataCell.h */,
 				EB8143C024407A3E00C439A9 /* AddChanelNoDataCell.m */,
 				EB8143C124407A3E00C439A9 /* AddChanelNoDataCell.xib */,
+				EBFA5EF1246E374A00915D5F /* HomeMusicCell.h */,
+				EBFA5EF2246E374A00915D5F /* HomeMusicCell.m */,
+				EBFA5EF3246E374A00915D5F /* HomeMusicCell.xib */,
+				EB6E84CD246F99A200BE0524 /* HomeSchoolCell.h */,
+				EB6E84CE246F99A200BE0524 /* HomeSchoolCell.m */,
+				EB6E84CF246F99A200BE0524 /* HomeSchoolCell.xib */,
+				EB6E84D2246FB90300BE0524 /* HomeUserPrivilegeCell.h */,
+				EB6E84D3246FB90300BE0524 /* HomeUserPrivilegeCell.m */,
+				EB6E84D4246FB90300BE0524 /* HomeUserPrivilegeCell.xib */,
+				EB6E84D7246FD1BF00BE0524 /* HomeWeiCousreCell.h */,
+				EB6E84D8246FD1BF00BE0524 /* HomeWeiCousreCell.m */,
+				EB6E84D9246FD1BF00BE0524 /* HomeWeiCousreCell.xib */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -6759,6 +6851,16 @@
 		EB415135246BC5D800030371 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				EB415144246BD1CB00030371 /* BookHomeModel.h */,
+				EB415145246BD1CB00030371 /* BookHomeModel.m */,
+				EB41514C246BDEB900030371 /* BookHomeSubModel.h */,
+				EB41514D246BDEB900030371 /* BookHomeSubModel.m */,
+				EB1E0F7D246D0FDB00D4C3DE /* BookContentLeftModel.h */,
+				EB1E0F7E246D0FDB00D4C3DE /* BookContentLeftModel.m */,
+				EB1E0F80246D0FF300D4C3DE /* BookContentTopModel.h */,
+				EB1E0F81246D0FF300D4C3DE /* BookContentTopModel.m */,
+				EB1E0F83246D100200D4C3DE /* BookContentModel.h */,
+				EB1E0F84246D100200D4C3DE /* BookContentModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -6768,6 +6870,16 @@
 			children = (
 				EB41513C246BC71500030371 /* BookStoreHome.h */,
 				EB41513D246BC71500030371 /* BookStoreHome.m */,
+				EB41514F246C001D00030371 /* BookMingVC.h */,
+				EB415150246C001D00030371 /* BookMingVC.m */,
+				EB415152246C071300030371 /* BookAllLookVC.h */,
+				EB415153246C071300030371 /* BookAllLookVC.m */,
+				EB1E0F75246CE49100D4C3DE /* BookContentNavVC.h */,
+				EB1E0F76246CE49100D4C3DE /* BookContentNavVC.m */,
+				EB6E84DD246FD67100BE0524 /* BookWeiCousreVC.h */,
+				EB6E84DE246FD67100BE0524 /* BookWeiCousreVC.m */,
+				EB6E84E0246FDF2400BE0524 /* BookPlayListVC.h */,
+				EB6E84E1246FDF2400BE0524 /* BookPlayListVC.m */,
 			);
 			path = VC;
 			sourceTree = "<group>";
@@ -6775,6 +6887,24 @@
 		EB415137246BC5D800030371 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				EB41513F246BCD6C00030371 /* BookHomeCell.h */,
+				EB415140246BCD6C00030371 /* BookHomeCell.m */,
+				EB415141246BCD6C00030371 /* BookHomeCell.xib */,
+				EB415147246BD58F00030371 /* BookHomeSubCell.h */,
+				EB415148246BD58F00030371 /* BookHomeSubCell.m */,
+				EB415149246BD58F00030371 /* BookHomeSubCell.xib */,
+				EB1E0F70246CD5A300D4C3DE /* BookAllLookCell.h */,
+				EB1E0F71246CD5A300D4C3DE /* BookAllLookCell.m */,
+				EB1E0F72246CD5A300D4C3DE /* BookAllLookCell.xib */,
+				EB1E0F78246D0DA700D4C3DE /* BookContentLeftCell.h */,
+				EB1E0F79246D0DA700D4C3DE /* BookContentLeftCell.m */,
+				EB1E0F7A246D0DA700D4C3DE /* BookContentLeftCell.xib */,
+				EB1E0F86246D17B600D4C3DE /* BookContentCell.h */,
+				EB1E0F87246D17B600D4C3DE /* BookContentCell.m */,
+				EB1E0F88246D17B600D4C3DE /* BookContentCell.xib */,
+				EB1E0F8B246D4A9700D4C3DE /* BookContentTopCell.h */,
+				EB1E0F8C246D4A9700D4C3DE /* BookContentTopCell.m */,
+				EB1E0F8D246D4A9700D4C3DE /* BookContentTopCell.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -7784,6 +7914,7 @@
 				C79C6D3723BF0A6100BE4156 /* MyMeetingTimeView.xib in Resources */,
 				EB8E2D1B239666A900CDFBDA /* alert_info@3x.png in Resources */,
 				C76CC9D823BC9C7A003B23DC /* MeetingRecordJoinCell.xib in Resources */,
+				EB1E0F8A246D17B600D4C3DE /* BookContentCell.xib in Resources */,
 				EB8E2D59239666A900CDFBDA /* chatbar_photo@3x.png in Resources */,
 				C6227098236C09FC00E2E3BF /* mj_car@3x.png in Resources */,
 				C625AA85236FCD680010E967 /* ChatMsgSearch.storyboard in Resources */,
@@ -7799,6 +7930,7 @@
 				C625AA96236FD1A90010E967 /* ChatMsgSearchHistoryCell.xib in Resources */,
 				EB8E2D88239666A900CDFBDA /* msg_location_white@2x.png in Resources */,
 				C78373F123A9D82E0096AFE2 /* HistoricalWorkFlowListController.xib in Resources */,
+				EB1E0F74246CD5A300D4C3DE /* BookAllLookCell.xib in Resources */,
 				C622157D237169E3006F5D7F /* NoticeNewGroupMenuCell.xib in Resources */,
 				C7743F9223A86D7000973D70 /* MyWorkFlowListController.xib in Resources */,
 				EB8E2CE1239666A900CDFBDA /* close_gray@2x.png in Resources */,
@@ -7814,7 +7946,9 @@
 				324F176B239B3B4D0025CAE7 /* NoticeSelectCell.xib in Resources */,
 				EBDE08C424582BA6005D426C /* CommonListCell.xib in Resources */,
 				C7D6BC90235DA1CE00770E7C /* MyClubApplicationTableViewCell.xib in Resources */,
+				EB415143246BCD6C00030371 /* BookHomeCell.xib in Resources */,
 				EB8E2D47239666A900CDFBDA /* icon_019.gif in Resources */,
+				EB6E84DB246FD1BF00BE0524 /* HomeWeiCousreCell.xib in Resources */,
 				C622708C236C09FC00E2E3BF /* mj_house@3x.png in Resources */,
 				EB8E2D3F239666A900CDFBDA /* icon_035.gif in Resources */,
 				C7743F9923A86DAE00973D70 /* WorkFlowFecordController.xib in Resources */,
@@ -7840,6 +7974,7 @@
 				EB8E2D5A239666A900CDFBDA /* chatbar_map_blue@2x.png in Resources */,
 				EB8E2D72239666A900CDFBDA /* chatbar_face_blue@3x.png in Resources */,
 				C625AAB5236FFFAA0010E967 /* WorkingGroup.storyboard in Resources */,
+				EB1E0F7C246D0DA700D4C3DE /* BookContentLeftCell.xib in Resources */,
 				C7EE367923BB2D57002EB3BF /* NewMeetingFecordDetailsController.xib in Resources */,
 				324D963E23A4D47F00C7D9E8 /* NoteBook.storyboard in Resources */,
 				EBE96EC1245ABEB6008BDBA8 /* PayAlert.xib in Resources */,
@@ -7929,6 +8064,7 @@
 				C7525DE62388F25F004B9D71 /* MyWordCell.xib in Resources */,
 				C701EE4B23C2D97800082463 /* InPutGongWenImageCell.xib in Resources */,
 				C625AAC6237011D50010E967 /* ChatMsgNotice.storyboard in Resources */,
+				EB1E0F8F246D4A9700D4C3DE /* BookContentTopCell.xib in Resources */,
 				C7D6BCBB235DA1CE00770E7C /* LearninglistTableViewCell.xib in Resources */,
 				EB96B8A023BF584300EE09D7 /* TDInterLeterHome.storyboard in Resources */,
 				C6227096236C09FC00E2E3BF /* mj_air_black@3x.png in Resources */,
@@ -7947,6 +8083,7 @@
 				C7914DCE236D8573000CD5CA /* AddPeopleToGongWenCell.xib in Resources */,
 				C7EE366F23BAFD2E002EB3BF /* FecordDetailsContentCell.xib in Resources */,
 				EB8E2DA4239666A900CDFBDA /* chat_clear@2x.png in Resources */,
+				EB6E84D6246FB90300BE0524 /* HomeUserPrivilegeCell.xib in Resources */,
 				EBE36C3823A7208E002BE674 /* NewTopicCell.xib in Resources */,
 				C7799F1323AB7E6500270988 /* WorkFlowPersonnelListController.xib in Resources */,
 				C69A8E3E23754A660098FA26 /* FindPhotoOrVideoHeaderView.xib in Resources */,
@@ -7962,6 +8099,7 @@
 				C69A8E4323754F7A0098FA26 /* ChatSearchFindbyFuJCell.xib in Resources */,
 				EB96B89E23BF573B00EE09D7 /* NoteBookDetailCell.xib in Resources */,
 				EB8E2CDE239666A900CDFBDA /* user_avatar_blue@3x.png in Resources */,
+				EB41514B246BD58F00030371 /* BookHomeSubCell.xib in Resources */,
 				EB8E2D39239666A900CDFBDA /* icon_012.gif in Resources */,
 				EB8E2D73239666A900CDFBDA /* chatbar_call@2x.png in Resources */,
 				C57264872382A6520054EE66 /* ArticleTextCell.xib in Resources */,
@@ -7992,6 +8130,7 @@
 				C62270A2236C09FC00E2E3BF /* CarRefreshHeadView.xib in Resources */,
 				C7525DEB238907D6004B9D71 /* MyWorkAppApprovalCell.xib in Resources */,
 				EB8E2D82239666A900CDFBDA /* msg_location@2x.png in Resources */,
+				EBFA5EF5246E374A00915D5F /* HomeMusicCell.xib in Resources */,
 				EB8E2D41239666A900CDFBDA /* icon_012_cover.png in Resources */,
 				EB8E2D8D239666A900CDFBDA /* msg_send_audio@3x.png in Resources */,
 				EB8E2D91239666A900CDFBDA /* msg_send_audio01@3x.png in Resources */,
@@ -8014,6 +8153,7 @@
 				C7D6BCB2235DA1CE00770E7C /* AccountAndSecurityViewController.xib in Resources */,
 				C62215682371147A006F5D7F /* MoreAppCell.xib in Resources */,
 				EB8E2D6D239666A900CDFBDA /* chatbar_face_blue@2x.png in Resources */,
+				EB6E84D1246F99A200BE0524 /* HomeSchoolCell.xib in Resources */,
 				C7D6BC87235DA1CE00770E7C /* NoticeTableViewCell.xib in Resources */,
 				EB8E2D4D239666A900CDFBDA /* icon_013_cover.png in Resources */,
 				C7525DF023890A8B004B9D71 /* MyWorkSpaceCell.xib in Resources */,
@@ -8145,6 +8285,7 @@
 				C7D6BB45235DA18A00770E7C /* CommentModel.m in Sources */,
 				C6F2E1A0236C3C32009E6903 /* EditUserNickVC.m in Sources */,
 				C76B01282387B9C400AD6E28 /* WorkFilterModel.m in Sources */,
+				EB6E84D5246FB90300BE0524 /* HomeUserPrivilegeCell.m in Sources */,
 				C7E125AA23793AA60067F275 /* JpushTool.m in Sources */,
 				C625AA66236D99170010E967 /* ChatMsgListVC.m in Sources */,
 				EB38514224652EB000E28172 /* TDGroupLabelVC.m in Sources */,
@@ -8155,6 +8296,7 @@
 				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 */,
@@ -8166,6 +8308,7 @@
 				C7954B4A237E799200EDC479 /* AddressBookGroupModel.m in Sources */,
 				C625AABE237000010010E967 /* WorkingGroupMainVC.m in Sources */,
 				C69A8DC72373AB470098FA26 /* MailListDetailVC.m in Sources */,
+				EB1E0F77246CE49100D4C3DE /* BookContentNavVC.m in Sources */,
 				EB0F64D623AA528A00AD56A0 /* TopicListItemModel.m in Sources */,
 				EB2E470923A4B55D00CAF0D3 /* SmartBar.m in Sources */,
 				C62215632371057F006F5D7F /* MoreAppModel.m in Sources */,
@@ -8213,6 +8356,7 @@
 				C72F38FD236DADDC00933828 /* BlacklistVC.m in Sources */,
 				C6F2E1E2236D126B009E6903 /* UIViewController+NavBar.m in Sources */,
 				C72F3906236DADDC00933828 /* SettingCell.m in Sources */,
+				EB1E0F89246D17B600D4C3DE /* BookContentCell.m in Sources */,
 				C5598D1C23865E4500BC7185 /* DepartmentModel.m in Sources */,
 				C625AAAA236FF23E0010E967 /* ChatMsgSearchReseltContentVC.m in Sources */,
 				C7974A43236C4CD5004D5470 /* MyWorkWordView.m in Sources */,
@@ -8225,12 +8369,14 @@
 				C7EE367323BAFE6E002EB3BF /* FecordDetailsGoodsCell.m in Sources */,
 				C69A8E3D23754A660098FA26 /* FindPhotoOrVideoHeaderView.m in Sources */,
 				C732D3A62394B3BE0097A059 /* ScanResultModel.m in Sources */,
+				EB6E84DA246FD1BF00BE0524 /* HomeWeiCousreCell.m in Sources */,
 				C69A8E0923751B490098FA26 /* ChatSearchCenterVC.m in Sources */,
 				324D960523A1139300C7D9E8 /* ChatMsgSearchModelSub.m in Sources */,
 				C7974A46236C4CFA004D5470 /* MyWorkWordModel.m in Sources */,
 				C5598D2223869D1400BC7185 /* NoticeListModel.m in Sources */,
 				C7525DE12388DC9E004B9D71 /* LMJHorizontalScrollText.m in Sources */,
 				C744D23F2369AABE00D51EDD /* MyFavoriteFindCell.m in Sources */,
+				EB415154246C071300030371 /* BookAllLookVC.m in Sources */,
 				C788F18C236957890070A6B3 /* FavoriteFindModel.m in Sources */,
 				EB440FC523A32302006BCB95 /* TDGroupInfoDetailCell.m in Sources */,
 				C7037FFC236FD33F008EA3E4 /* SendGroupBCell.m in Sources */,
@@ -8258,6 +8404,7 @@
 				C7D6BBB6235DA18A00770E7C /* XLTextCalculateHelper.m in Sources */,
 				C76DB43B236ACCF600369F5C /* MyTDTopicCellView.m in Sources */,
 				C622158523719C84006F5D7F /* LoginVC.m in Sources */,
+				EB1E0F73246CD5A300D4C3DE /* BookAllLookCell.m in Sources */,
 				EB96B89823BF56C800EE09D7 /* TDGroupInfoListCell.m in Sources */,
 				C59D0A442382468A007D0760 /* JSONModelArray.m in Sources */,
 				C7F61628238C068A008AF22D /* AppUserModel.m in Sources */,
@@ -8381,6 +8528,7 @@
 				EB8E2CD7239666A900CDFBDA /* UIViewController+Util.m in Sources */,
 				EBE5EF1F2459841B00AD59C4 /* MyAccountVC.m in Sources */,
 				EB98E7B524061CD00087C4E2 /* NoteBookSearchVC.m in Sources */,
+				EB1E0F8E246D4A9700D4C3DE /* BookContentTopCell.m in Sources */,
 				EBF2D55123C2E85600EC35C4 /* MHTopicFrame.m in Sources */,
 				C7D6BB42235DA18A00770E7C /* SearchTypeCell.m in Sources */,
 				EBE5EF2724598F8600AD59C4 /* MyCardVC.m in Sources */,
@@ -8390,6 +8538,7 @@
 				C62270AE236C09FC00E2E3BF /* LeeTagItemViewModel.m in Sources */,
 				C7D6BB3D235DA18A00770E7C /* MyChanelCollectionReusableViewTop.m in Sources */,
 				C7D6BC99235DA1CE00770E7C /* PersonalCertificationHeaderView.m in Sources */,
+				EB1E0F7F246D0FDB00D4C3DE /* BookContentLeftModel.m in Sources */,
 				C59D0C4B23825DE1007D0760 /* YYTimer.m in Sources */,
 				C59D0C2223825DE1007D0760 /* YYTextArchiver.m in Sources */,
 				C6221589237278A8006F5D7F /* ShowKeepNoticeAlert.m in Sources */,
@@ -8481,6 +8630,7 @@
 				C59D0C3C23825DE1007D0760 /* NSString+YYAdd.m in Sources */,
 				EB8E2CF7239666A900CDFBDA /* MWCaptionView.m in Sources */,
 				C744D2422369B97E00D51EDD /* FavoriteHeaderView.m in Sources */,
+				EB6E84E2246FDF2400BE0524 /* BookPlayListVC.m in Sources */,
 				C783741223AA46730096AFE2 /* HistoricalWorkFlowDetailsContentCell.m in Sources */,
 				C7954B4C237E799200EDC479 /* Department.m in Sources */,
 				324D960423A1139300C7D9E8 /* ChatMsgSearchModel.m in Sources */,
@@ -8548,6 +8698,7 @@
 				C7D6BB49235DA18A00770E7C /* DetailTitleView.m in Sources */,
 				EBB6887C23C9C0C300E24DD9 /* MMRichImageCell.m in Sources */,
 				EB8E2D0C239666A900CDFBDA /* PSTGridLayoutItem.m in Sources */,
+				EBFA5EF4246E374A00915D5F /* HomeMusicCell.m in Sources */,
 				C6F2E19A236C334A009E6903 /* UIImage+Crop.m in Sources */,
 				C751012823837FB100E4429B /* MyZanCell.m in Sources */,
 				C7974A40236C4CC0004D5470 /* MyWorkWordVC.m in Sources */,
@@ -8608,6 +8759,7 @@
 				EB8E2D7D239666A900CDFBDA /* EMMsgImageBubbleView.m in Sources */,
 				C625AAB2236FFCC60010E967 /* ChatMsgSerchReseltByIMVC.m in Sources */,
 				C75958A3237FFC9700AE85C0 /* HomeArticleModel.m in Sources */,
+				EB41514A246BD58F00030371 /* BookHomeSubCell.m in Sources */,
 				C7D6BBB1235DA18A00770E7C /* SurfaceSearchView.m in Sources */,
 				C703801123701018008EA3E4 /* MyApprovalDetailCell.m in Sources */,
 				C622709F236C09FC00E2E3BF /* XLDot.m in Sources */,
@@ -8650,6 +8802,7 @@
 				C783741723AA46900096AFE2 /* HistoricalWorkFlowDetailsMoreCell.m in Sources */,
 				32580E6623ADCF35005DF500 /* NoteBooKSelectNoteBookVC.m in Sources */,
 				EB8E2D76239666A900CDFBDA /* EMMessageStatusView.m in Sources */,
+				EB41514E246BDEB900030371 /* BookHomeSubModel.m in Sources */,
 				C69A8E1A23753A150098FA26 /* CalenderCollectionCell.m in Sources */,
 				C77E218E23AE4CC2009A230C /* WorkFlowOrderModel.m in Sources */,
 				EBB6886C23C9C0C300E24DD9 /* MMRichTextConfig.m in Sources */,
@@ -8690,6 +8843,7 @@
 				EB8E2D7F239666A900CDFBDA /* EMMessageBubbleView.m in Sources */,
 				EB568FC5239B47A3000827B0 /* ChatResultVC.m in Sources */,
 				C76FD29C238506E100E858F6 /* NodesModel.m in Sources */,
+				EB415146246BD1CB00030371 /* BookHomeModel.m in Sources */,
 				C7D6BB38235DA18A00770E7C /* HomeViewController.m in Sources */,
 				C7D6BCB1235DA1CE00770E7C /* AccountAndSecurityViewController.m in Sources */,
 				C77E218323ADF55F009A230C /* SelectedTimeModel.m in Sources */,
@@ -8703,6 +8857,7 @@
 				C7799F2123ABA4C700270988 /* EditorWorkFlowFecordController.m in Sources */,
 				C622157523716492006F5D7F /* NoticeNewGroupMenuVC.m in Sources */,
 				C7D6BB4A235DA18A00770E7C /* TextInputView.m in Sources */,
+				EB1E0F7B246D0DA700D4C3DE /* BookContentLeftCell.m in Sources */,
 				C7D6BC93235DA1CE00770E7C /* ClubApplicationModel.m in Sources */,
 				C59D0C1823825DE1007D0760 /* YYTextKeyboardManager.m in Sources */,
 				32C384C823B1AE9500BBC733 /* NoteBookCommentVC.m in Sources */,
@@ -8738,6 +8893,7 @@
 				C7E1001F236DB2D700803CFA /* TaasdasdbleVieasdsawCell.m in Sources */,
 				C59D0C2E23825DE1007D0760 /* UIGestureRecognizer+YYAdd.m in Sources */,
 				C69A8E0323750D770098FA26 /* ChatImNameUpdateVC.m in Sources */,
+				EB1E0F85246D100200D4C3DE /* BookContentModel.m in Sources */,
 				C572647623828C5C0054EE66 /* NSDictionary+NilSafe.m in Sources */,
 				EB8E2D9F239666A900CDFBDA /* EMLocationViewController.m in Sources */,
 				C77E218623AE0ED5009A230C /* SelectedTimeSourceModel.m in Sources */,
@@ -8800,6 +8956,7 @@
 				C783741B23AA48F50096AFE2 /* HistoricalWorkFlowDetailsBaseCell.m in Sources */,
 				C622709D236C09FC00E2E3BF /* GHRefreshHeader.m in Sources */,
 				C72F38FE236DADDC00933828 /* AccountSecurityVC.m in Sources */,
+				EB1E0F82246D0FF300D4C3DE /* BookContentTopModel.m in Sources */,
 				C6F2E1DF236D126B009E6903 /* XTSystem.m in Sources */,
 				C7743FA623A8CAA500973D70 /* CollectionViewSpaceLayout.m in Sources */,
 				EB8E2D13239666A900CDFBDA /* EMTextFieldViewController.m in Sources */,
@@ -8839,6 +8996,7 @@
 				C76CC9E623BCA6B6003B23DC /* MeetingRecordContentCell.m in Sources */,
 				C59D0C1323825DE1007D0760 /* YYTextEffectWindow.m in Sources */,
 				C69A8E38237546310098FA26 /* ChatSearchFindbyPhotoCell.m in Sources */,
+				EB415142246BCD6C00030371 /* BookHomeCell.m in Sources */,
 				C768AFB223796C0C00E0A066 /* IgnoreHeaderTouchAndRecognizeSimultaneousTableView.m in Sources */,
 				EB77B297239FCAF90050A3C0 /* ChatNewRowCell.m in Sources */,
 				C7D6BB46235DA18A00770E7C /* ThirdSharedView.m in Sources */,
@@ -8850,6 +9008,7 @@
 				C6F2E1DD236D126B009E6903 /* UIButton+XTExtension.m in Sources */,
 				EB0BDF4D244D49F1009F6434 /* MailListSortVC.m in Sources */,
 				C69A8DF7237446670098FA26 /* ChatInfoUserCollectionCell.m in Sources */,
+				EB6E84D0246F99A200BE0524 /* HomeSchoolCell.m in Sources */,
 				C7D6BCB0235DA1CE00770E7C /* SettingModel.m in Sources */,
 				C59D0C0123825DE1007D0760 /* YYImageCache.m in Sources */,
 				C59D0C4A23825DE1007D0760 /* YYFileHash.m in Sources */,
@@ -8882,6 +9041,7 @@
 				C7974A4A236C4D2A004D5470 /* MyWorkWordCell.m in Sources */,
 				C622156C23714B00006F5D7F /* ChatMsgListImModel.m in Sources */,
 				EB3DCA4F24555299000A0189 /* ShareSysVC.m in Sources */,
+				EB415151246C001D00030371 /* BookMingVC.m in Sources */,
 				C79C6D3523BF0A5500BE4156 /* MyMeetingTimeView.m in Sources */,
 				C72F3902236DADDC00933828 /* FeedBackVC.m in Sources */,
 				EB8E2D18239666A900CDFBDA /* EMAlertController.m in Sources */,

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


+ 10 - 0
smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -56,5 +56,15 @@
             continueAfterRunningActions = "No">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.IDEConstraintErrorBreakpoint">
+         <BreakpointContent
+            uuid = "B948653C-7D6D-4E9E-828A-1DE2612CDB56"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            breakpointStackSelectionBehavior = "1">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

BIN
smartRhino/Assets.xcassets/ChatMsg/Book_rightjian_icon.imageset/Book_rightjian_icon@2x.png


BIN
smartRhino/Assets.xcassets/ChatMsg/Book_rightjian_icon.imageset/Book_rightjian_icon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/ChatMsg/Book_rightjian_icon.imageset/Contents.json

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

+ 22 - 0
smartRhino/Assets.xcassets/ChatMsg/Home_down_icon.imageset/Contents.json

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

BIN
smartRhino/Assets.xcassets/ChatMsg/Home_down_icon.imageset/Home_down_icon@2x.png


BIN
smartRhino/Assets.xcassets/ChatMsg/Home_down_icon.imageset/Home_down_icon@3x.png


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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


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

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

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


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


+ 9 - 0
smartRhino/FwzAppConfig.h

@@ -372,6 +372,15 @@ typedef enum HistorySearchType {
     HistorySearchType_FileJia = 11,
 }HistorySearchType;
 
+/// 书城
+typedef enum BookHomeType{
+    BookHomeA = 0,
+    BookHomeB = 1,
+    BookHomeC = 2,
+    BookHomeD = 3,///名栏
+    BookHomeE = 4,///显示全部
+}BookHomeType;
+
 #define NOTIFI_ChaoSongRen @"NOTIFI_ChaoSongRen"
 #define NOTIFI_ApprovalRen @"NOTIFI_ApprovalRen"
 #define NOTIFI_NoteBookSelectNoteBook @"NOTIFI_NoteBookSelectNoteBook"

+ 2 - 2
smartRhino/Project/VCModel/ChatMessage/ChatMsg.storyboard

@@ -109,10 +109,10 @@
                                 </connections>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NmS-Ca-cpY">
-                                <rect key="frame" x="0.0" y="64" width="414" height="50"/>
+                                <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="50" id="Z6j-uI-cmb"/>
+                                    <constraint firstAttribute="height" constant="40" id="Z6j-uI-cmb"/>
                                 </constraints>
                             </view>
                         </subviews>

+ 3 - 2
smartRhino/Project/VCModel/ChatMessage/Controller/ChatMsgListVC.m

@@ -209,7 +209,8 @@ static int kConversation_AtAll = 2;
 //    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleGroupSubjectUpdated:) name:GROUP_SUBJECT_UPDATED object:nil];
     [self.HeadView addSubview:self.SearchView];
     [self.SearchView  mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.mas_offset(UIEdgeInsetsZero);
+        make.left.top.right.mas_equalTo(self.HeadView);
+        make.height.mas_offset(36);
     }];
     WS(weakSelf);
     [self.SearchView.button setAction:^{
@@ -1494,7 +1495,7 @@ static int kConversation_AtAll = 2;
 - (MyTDGroupView *)SearchView
 {
     if (!_SearchView) {
-        _SearchView = [[MyTDGroupView alloc] init];
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
     }
     return _SearchView;
 }

+ 102 - 169
smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailListByZuVC.m

@@ -23,8 +23,12 @@
 #import "AddLookUpUserSecondVC.h"
 #import "MailListMoveVC.h"
 #import "MailListSearchVC.h"
+#import "MyTDGroupView.h"
 
 @interface MailListByZuVC ()<UITableViewDelegate,UITableViewDataSource,AddLookUpUserSecondVCDelegate>
+@property (weak, nonatomic) IBOutlet UIView *HeadView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *HeadHight;
+@property (strong, nonatomic) MyTDGroupView             *SearchView;
 
 @property (strong,nonatomic) IBOutlet UIButton *rightBtn;
 @property (strong,nonatomic) IBOutlet UITableView *tableView;
@@ -67,6 +71,15 @@
     }
     return _operationBottomBgView;
 }
+
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
+
 -(void)initBottomBgView{
     UIButton *leftCloseBtn = [UIButton buttonWithType:UIButtonTypeCustom];
     [leftCloseBtn setTitle:@"删除" forState:UIControlStateNormal];
@@ -118,6 +131,7 @@
 -(void)changeToOperation:(BOOL)operation{
     if(operation){
         self.iSViewEditor = YES;
+        self.HeadHight.constant = 0.f;
         self.rightBtn.hidden = YES;
         //默认操作状态为批量编辑状态
         self.operationStateEnum = OperationStateEnum1;
@@ -147,6 +161,8 @@
                 break;
         }
         self.iSViewEditor = NO;
+        self.HeadHight.constant = 40.f;
+
         //默认操作状态为无状态
         self.operationStateEnum = OperationStateEnum0;
         self.operationAllSelectButton.hidden = NO;
@@ -294,6 +310,16 @@
     self.tableView.dataSource = self;
     self.tableView.backgroundColor = [UIColor clearColor];
     
+    [self.HeadView addSubview:self.SearchView];
+    [self.SearchView  mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.right.mas_equalTo(self.HeadView);
+        make.height.mas_offset(36);
+    }];
+    WS(weakSelf);
+    [self.SearchView.button setAction:^{
+        [weakSelf NewSearch:weakSelf.isSelectPeople];
+    }];
+    
     [self initBottomBgView];
     [self changeToOperation:NO];
     self.iSViewEditor = NO;
@@ -494,10 +520,10 @@
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
     switch (self.pageType) {
         case MailListByZuPageType_Sys:{
-            return 1 + self.departAndUsersPingArray.count;
+            return self.departAndUsersPingArray.count;
         }break;
         case MailListByZuPageType_custom:{
-            return 1 + self.pinyinArray.count;
+            return self.pinyinArray.count;
         }break;
     }
 }
@@ -505,26 +531,12 @@
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
     switch (self.pageType) {
         case MailListByZuPageType_Sys:{
-            if (section == 0) {
-                return 1;
-            }else{
-                
-                NSMutableArray *array = [NSMutableArray arrayWithArray:self.departAndUsersArray[section-1]];
-                return array.count;
-            }
+            NSMutableArray *array = [NSMutableArray arrayWithArray:self.departAndUsersArray[section]];
+            return array.count;
         }break;
         case MailListByZuPageType_custom:{
-            switch (section) {
-                case 0:{
-                    return 1;
-                }break;
-                default:{
-                    NSArray *array = [self.cusNameArray objectAtIndex:section - 1];
-                    return [array count];
-                }
-                    break;
-            }
-            return 0;
+            NSArray *array = [self.cusNameArray objectAtIndex:section];
+            return [array count];
         }break;
     }
 }
@@ -560,38 +572,24 @@
     switch (self.pageType) {
         case MailListByZuPageType_Sys:
         {
-            if (section > 0) {
-                UILabel *headerLabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 0, 200, 30)];
-                NSString *returnStr = [self.departAndUsersPingArray objectAtIndex:section - 1];
-                
-                headerLabel.font = [UIFont systemFontOfSize:14.];
-                
-                headerLabel.text = returnStr;
-                
-                headerLabel.textColor = RGB(153, 153, 153);
-                
-                [headerView addSubview:headerLabel];
-            }else{
-                UILabel *headerLabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 0, 200, 30)];
-                headerLabel.font = [UIFont systemFontOfSize:14.];
-                
-                headerLabel.text = @"";
-                
-                headerLabel.textColor = RGB(153, 153, 153);
-                
-                [headerView addSubview:headerLabel];
-            }
+            UILabel *headerLabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 0, 200, 30)];
+            NSString *returnStr = [self.departAndUsersPingArray objectAtIndex:section];
+            
+            headerLabel.font = [UIFont systemFontOfSize:14.];
             
+            headerLabel.text = returnStr;
+            
+            headerLabel.textColor = RGB(153, 153, 153);
+            
+            [headerView addSubview:headerLabel];
         }break;
         case MailListByZuPageType_custom:{
-            if(section > 0){
-                NSString *returnStr = [self.pinyinArray objectAtIndex:section - 1];
-                UILabel *headerLabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 0, 200, 30)];
-                [headerView addSubview:headerLabel];
-                headerLabel.font = [UIFont systemFontOfSize:14.];
-                headerLabel.text = returnStr;
-                headerLabel.textColor = RGB(153, 153, 153);
-            }
+            NSString *returnStr = [self.pinyinArray objectAtIndex:section];
+            UILabel *headerLabel = [[UILabel alloc] initWithFrame:CGRectMake(15, 0, 200, 30)];
+            [headerView addSubview:headerLabel];
+            headerLabel.font = [UIFont systemFontOfSize:14.];
+            headerLabel.text = returnStr;
+            headerLabel.textColor = RGB(153, 153, 153);
         }break;
     }
     return headerView;
@@ -601,16 +599,11 @@
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section{
     switch (self.pageType) {
         case MailListByZuPageType_Sys:{
-            if(section > 0){
-                return 30;
-            }
+            return 30;
         }break;
         case MailListByZuPageType_custom:
         {
-            if(section > 0){
-                return 30;
-            }
-            return 0;
+            return 30;
         }break;
     }
     return 0;
@@ -620,33 +613,15 @@
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
     switch (self.pageType) {
         case MailListByZuPageType_Sys:{
-            switch (indexPath.section) {
-                case 0:{
-                    return [MailListCell configCell1Height];
-                }break;
-                default:{
-                    if (self.pinyinArray.count == 0) {
-                        return [MailListByZuCell configCell0Height];
-                    }else{
-                        if ((indexPath.section > 0 ) && (indexPath.section < self.pinyinArray.count)) {
-                            return [MailListCell configCell0Height];
-                        }else{
-                            return [MailListByZuCell configCell0Height];
-                        }
-                    }
-                }break;
+            if ((indexPath.section > 0 ) && (indexPath.section < self.pinyinArray.count)) {
+                return [MailListCell configCell0Height];
+            }else{
+                return [MailListByZuCell configCell0Height];
             }
         }break;
         case MailListByZuPageType_custom:
         {
-            switch (indexPath.section) {
-                case 0:{
-                    return [MailListCell configCell1Height];
-                }break;
-                default:{
-                    return [MailListByZuCell configCell0Height];
-                }break;
-            }
+            return [MailListByZuCell configCell0Height];
         }break;
     }
     return 0;
@@ -656,84 +631,58 @@
     WS(weakSelf);
     switch (self.pageType) {
         case MailListByZuPageType_Sys:{
-            switch (indexPath.section) {
-                case 0:{
-                    MailListCell *cell = [MailListCell configCell1:tableView indexPath:indexPath];
-                    return cell;
-                }break;
-                default:{
-                    NSString *titleStr = self.departAndUsersArray[indexPath.section -1][indexPath.row];
-                    NSArray *dataArray = [self getDepartMentArray:titleStr With:indexPath];
-                    if ([dataArray.firstObject boolValue]) {
-                        MailListCell *cell = [MailListCell configCell0:tableView indexPath:indexPath];
-                        cell.cell0TitleLabel.text = titleStr;
-//                        cell.cell0ZiJianLabel.hidden = YES;
-                        return cell;
-                    }else{
-                        NSDictionary *dic = dataArray.lastObject;
-                        MailListByZuCell *cell = [MailListByZuCell configCell0:tableView indexPath:indexPath];
-                        if ([[dic objectForKey:@"IsDisable"] boolValue]) {
-                            [cell.contentView setBackgroundColor:[UIColor lightGrayColor]];
-                        }
-                        cell.cell0TitleLabel.text = titleStr;
-                        [cell.cell0ImgView sd_setImageWithURL:[NSURL URLWithString:dic[@"AvatarUrl"]] placeholderImage:[UIImage imageNamed:@"chatmsg_list_testuser_img"]];
-                        return cell;
-                    }
-                }break;
+            NSString *titleStr = self.departAndUsersArray[indexPath.section][indexPath.row];
+            NSArray *dataArray = [self getDepartMentArray:titleStr With:indexPath];
+            if ([dataArray.firstObject boolValue]) {
+                MailListCell *cell = [MailListCell configCell0:tableView indexPath:indexPath];
+                cell.cell0TitleLabel.text = titleStr;
+                //                        cell.cell0ZiJianLabel.hidden = YES;
+                return cell;
+            }else{
+                NSDictionary *dic = dataArray.lastObject;
+                MailListByZuCell *cell = [MailListByZuCell configCell0:tableView indexPath:indexPath];
+                if ([[dic objectForKey:@"IsDisable"] boolValue]) {
+                    [cell.contentView setBackgroundColor:[UIColor lightGrayColor]];
+                }
+                cell.cell0TitleLabel.text = titleStr;
+                [cell.cell0ImgView sd_setImageWithURL:[NSURL URLWithString:dic[@"AvatarUrl"]] placeholderImage:[UIImage imageNamed:@"chatmsg_list_testuser_img"]];
+                return cell;
             }
         } break;
         case MailListByZuPageType_custom:{
-            switch (indexPath.section) {
-                case 0:{
-                    MailListCell *cell = [MailListCell configCell1:tableView indexPath:indexPath];
-                    switch (self.operationStateEnum) {
-                        case OperationStateEnum0:
-                        {
-                            cell.editorVIew.hidden = YES;
-                        }break;
-                        default:{
-                            cell.editorVIew.hidden = NO;
-                        }break;
+            SelectModel * model = [[self.cusNameArray objectAtIndex:indexPath.section] objectAtIndex:indexPath.row];
+            switch (self.operationStateEnum) {
+                case OperationStateEnum0:
+                {
+                    MailListByZuCell *cell = [MailListByZuCell configCell0:tableView indexPath:indexPath];
+                    cell.cell0TitleLabel.text = model.UserName;
+                    if (model.IsDisable) {
+                        [cell.contentView setBackgroundColor:[UIColor lightGrayColor]];
                     }
+                    [cell.cell0ImgView sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:IMG(@"chatmsg_list_testuser_img")];
                     return cell;
                 }break;
-                default:{
-                    SelectModel * model = [[self.cusNameArray objectAtIndex:indexPath.section-1] objectAtIndex:indexPath.row];
-                    switch (self.operationStateEnum) {
-                        case OperationStateEnum0:
-                        {
-                            MailListByZuCell *cell = [MailListByZuCell configCell0:tableView indexPath:indexPath];
-                            cell.cell0TitleLabel.text = model.UserName;
-                            if (model.IsDisable) {
-                                [cell.contentView setBackgroundColor:[UIColor lightGrayColor]];
-                            }
-                            [cell.cell0ImgView sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:IMG(@"chatmsg_list_testuser_img")];
-                            return cell;
-                        }break;
-                        case OperationStateEnum1:{
-                            self.isAllselect = [self checkSelectArray];
-                            [self.operationAllSelectButton setTitle:self.isAllselect ? @"取消全选": @"全选" forState:UIControlStateNormal];
-                            MailListByZuCell *cell = [MailListByZuCell configCell1:tableView indexPath:indexPath];
-                            cell.cell0TitleLabel.text = model.UserName;
-                            if (model.IsDisable) {
-                                [cell.contentView setBackgroundColor:[UIColor lightGrayColor]];
-                            }
-                            [cell.cell0ImgView sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:IMG(@"chatmsg_list_testuser_img")];
-                            cell.selectBtn.selected = model.hadSelected;
-                            [cell.selectBtn setAction:^{
-                                NSLog(@"12313");
-                                model.hadSelected = !model.hadSelected;
-                                [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
-                            }];
-                            return cell;
-                        }
-                        default:
-                            break;
+                case OperationStateEnum1:{
+                    self.isAllselect = [self checkSelectArray];
+                    [self.operationAllSelectButton setTitle:self.isAllselect ? @"取消全选": @"全选" forState:UIControlStateNormal];
+                    MailListByZuCell *cell = [MailListByZuCell configCell1:tableView indexPath:indexPath];
+                    cell.cell0TitleLabel.text = model.UserName;
+                    if (model.IsDisable) {
+                        [cell.contentView setBackgroundColor:[UIColor lightGrayColor]];
                     }
-                }break;
+                    [cell.cell0ImgView sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:IMG(@"chatmsg_list_testuser_img")];
+                    cell.selectBtn.selected = model.hadSelected;
+                    [cell.selectBtn setAction:^{
+                        NSLog(@"12313");
+                        model.hadSelected = !model.hadSelected;
+                        [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
+                    }];
+                    return cell;
+                }
+                default:
+                    break;
             }
         }break;
-            
     }
     return nil;
 }
@@ -776,18 +725,13 @@
         }
             break;
         case MailListByZuPageType_custom:{
-            if (indexPath.section == 0) {
-                UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[]];
-                actions.performsFirstActionWithFullSwipe = NO;
-                return actions;
-            }
             if (self.operationStateEnum == OperationStateEnum1) {
                 UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[]];
                 actions.performsFirstActionWithFullSwipe = NO;
                 return actions;
                 
             }
-            SelectModel * model = [[self.cusNameArray objectAtIndex:indexPath.section-1] objectAtIndex:indexPath.row];
+            SelectModel * model = [[self.cusNameArray objectAtIndex:indexPath.section] objectAtIndex:indexPath.row];
             WEAKSELF
             UIContextualAction *action1 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:@"删除" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
                 UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:@"确认删除" preferredStyle:UIAlertControllerStyleAlert];
@@ -838,13 +782,10 @@
             return @[];
             break;
         case MailListByZuPageType_custom:{
-            if (indexPath.section == 0) {
-                return @[];
-            }
             if (self.operationStateEnum == OperationStateEnum1) {
                 return @[];
             }
-            SelectModel * model = [[self.cusNameArray objectAtIndex:indexPath.section-1] objectAtIndex:indexPath.row];
+            SelectModel * model = [[self.cusNameArray objectAtIndex:indexPath.section] objectAtIndex:indexPath.row];
             WEAKSELF
             UITableViewRowAction *action1 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"删除" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
                 UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:@"确认删除" preferredStyle:UIAlertControllerStyleAlert];
@@ -891,11 +832,7 @@
         case MailListByZuPageType_Sys:{
             switch (self.operationStateEnum) {
                 case OperationStateEnum0:{
-                    if (indexPath.section == 0) {
-                        [self NewSearch:self.isSelectPeople];
-                        return;
-                    }
-                    NSArray *dataArray = [self getDepartMentArray:self.departAndUsersArray[indexPath.section-1][indexPath.row] With:indexPath];
+                    NSArray *dataArray = [self getDepartMentArray:self.departAndUsersArray[indexPath.section][indexPath.row] With:indexPath];
                     // 第一个值 YES 部门  成员
                     // 第二个值 部门的字典 | 成员的字典
                     if ([dataArray.firstObject boolValue]) {
@@ -965,11 +902,7 @@
             }
         }break;
         case MailListByZuPageType_custom:{
-            if (indexPath.section == 0) {
-                [self NewSearch:self.isSelectPeople];
-                return;
-            }
-            SelectModel *model = [[self.cusNameArray objectAtIndex:indexPath.section - 1] objectAtIndex:indexPath.row];
+            SelectModel *model = [[self.cusNameArray objectAtIndex:indexPath.section] objectAtIndex:indexPath.row];
             if(indexPath.section > 0){
                 if (self.isSelectPeople && !model.IsDisable) {
                     SHOWSUCCESS(@"成功")
@@ -1034,7 +967,7 @@
             }
         }
     }else{
-        if (((indexPath.section -1) >= 0 ) && ((indexPath.section-1) < self.pinyinArray.count)) {
+        if ((indexPath.section >= 0 ) && (indexPath.section < self.pinyinArray.count)) {
             for(NSDictionary *dic in self.departmentArray){
                 if ([dic[@"Name"] isEqual:name]) {
                     return @[@(YES),dic];

+ 18 - 19
smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/MailListVC.m

@@ -13,12 +13,13 @@
 #import "MyTDGroupView.h"
 #import "MailListSearchVC.h"
 #import "MailListSortVC.h"
+#import "MyTDGroupView.h"
 
 @interface MailListVC ()<UITableViewDelegate,UITableViewDataSource>
-   
+@property (weak, nonatomic) IBOutlet UIView *HeadView;
 @property (strong,nonatomic) IBOutlet UIButton *rightButton;
 @property (strong,nonatomic) IBOutlet UITableView *tableView;
-@property (strong,nonatomic) UIView *   myHeaderView;
+@property (strong, nonatomic) MyTDGroupView             *SearchView;
 @property (strong,nonatomic) NSMutableArray *dataSourceArray;
 @property (strong,nonatomic) NSMutableArray *historyDataSourceArray;
 @property (nonatomic, strong) AddressBookGroupModel *groupModel;
@@ -29,16 +30,25 @@
     MailListVC *controller = [StoryboardManager.shared.mailList instantiateViewControllerWithIdentifier:@"MailListVC"];
     return controller;
 }
-
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
     [self getData];
     self.fd_prefersNavigationBarHidden = YES;
     self.view.backgroundColor = RGB(255, 255, 255);
-     
-    self.tableView.tableHeaderView = self.myHeaderView;
+    [self.HeadView addSubview:self.SearchView];
+    [self.SearchView  mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.right.mas_equalTo(self.HeadView);
+        make.height.mas_offset(36);
+    }];
     WS(weakSelf);
-    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+    [self.SearchView.button setAction:^{
         MailListSearchVC *vc = [[MailListSearchVC alloc] init];
         vc.notChangeColor = weakSelf.notSearchChangeColor;
         vc.IsAddUser = weakSelf.isSelectPeople;
@@ -50,8 +60,8 @@
         vc.DepartmentId = 0;
         vc.SearchType = 0;
         [weakSelf.navigationController pushViewController:vc animated:YES];
-     }];
-     [self.myHeaderView addGestureRecognizer:tap];
+    }];
+
     
     if (@available(iOS 11.0, *)) {
         self.tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
@@ -354,17 +364,6 @@
     [self.navigationController pushViewController:vc animated:YES];
 }
 
-- (UIView *)myHeaderView
-{
-    if (!_myHeaderView) {
-        _myHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 50)];
-        MyTDGroupView * groupView = [[MyTDGroupView alloc] init];
-        [_myHeaderView addSubview:groupView];
-        _myHeaderView.backgroundColor = UIColorHex(FFFFFF);
-    }
-    return _myHeaderView;
-}
-
 - (void)getData{
     WEAKSELF
     SHOWLOADING

+ 2 - 2
smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/ShareCusVC.m

@@ -125,8 +125,8 @@
 - (UIView *)myHeaderView
 {
     if (!_myHeaderView) {
-        _myHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 50)];
-        MyTDGroupView * groupView = [[MyTDGroupView alloc] init];
+        _myHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 44)];
+        MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4 , SCREEN_WIDTH, 36)];
         [_myHeaderView addSubview:groupView];
         _myHeaderView.backgroundColor = UIColorHex(FFFFFF);
     }

+ 2 - 2
smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/ShareListVC.m

@@ -179,8 +179,8 @@
 - (UIView *)myHeaderView
 {
     if (!_myHeaderView) {
-        _myHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 50)];
-        MyTDGroupView * groupView = [[MyTDGroupView alloc] init];
+        _myHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 44)];
+        MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4, SCREEN_WIDTH, 36)];
         [_myHeaderView addSubview:groupView];
         _myHeaderView.backgroundColor = UIColorHex(FFFFFF);
     }

+ 2 - 2
smartRhino/Project/VCModel/ChatMessage/Controller/MailList/Controller/ShareSysVC.m

@@ -144,8 +144,8 @@
 - (UIView *)myHeaderView
 {
     if (!_myHeaderView) {
-        _myHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 50)];
-        MyTDGroupView * groupView = [[MyTDGroupView alloc] init];
+        _myHeaderView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 44)];
+        MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 4, SCREEN_WIDTH, 36)];
         [_myHeaderView addSubview:groupView];
         _myHeaderView.backgroundColor = UIColorHex(FFFFFF);
     }

+ 31 - 8
smartRhino/Project/VCModel/ChatMessage/Controller/MailList/MailList.storyboard

@@ -72,7 +72,7 @@
                                                 <color key="textColor" red="0.039215686270000001" green="0.039215686270000001" blue="0.039215686270000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kye-rG-08R">
+                                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kye-rG-08R">
                                                 <rect key="frame" x="0.0" y="43.666666666666664" width="414" height="0.3333333333333357"/>
                                                 <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <constraints>
@@ -111,14 +111,24 @@
                                 </connections>
                             </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="HCu-mz-62m">
-                                <rect key="frame" x="0.0" y="64" width="414" height="672"/>
+                                <rect key="frame" x="0.0" y="104" width="414" height="632"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </tableView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="O39-GM-fgg">
+                                <rect key="frame" x="0.0" y="64" width="414" height="40"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="h7w-8G-5wP"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
                             <constraint firstItem="HvV-0g-7nS" firstAttribute="bottom" secondItem="HCu-mz-62m" secondAttribute="bottom" id="2gp-Pu-QjR"/>
-                            <constraint firstItem="HCu-mz-62m" firstAttribute="top" secondItem="ylv-WC-ssg" secondAttribute="bottom" id="a4I-5L-BrR"/>
+                            <constraint firstItem="O39-GM-fgg" firstAttribute="top" secondItem="ylv-WC-ssg" secondAttribute="bottom" id="5yx-sG-udQ"/>
+                            <constraint firstItem="O39-GM-fgg" firstAttribute="leading" secondItem="HvV-0g-7nS" secondAttribute="leading" id="LdA-Kq-Hta"/>
+                            <constraint firstItem="HCu-mz-62m" firstAttribute="top" secondItem="O39-GM-fgg" secondAttribute="bottom" id="cPS-TX-bqt"/>
+                            <constraint firstItem="HvV-0g-7nS" firstAttribute="trailing" secondItem="O39-GM-fgg" secondAttribute="trailing" id="ens-PB-l0n"/>
                             <constraint firstItem="HvV-0g-7nS" firstAttribute="trailing" secondItem="HCu-mz-62m" secondAttribute="trailing" id="hF4-WS-Xbu"/>
                             <constraint firstItem="ylv-WC-ssg" firstAttribute="trailing" secondItem="HvV-0g-7nS" secondAttribute="trailing" id="i3E-X6-gzf"/>
                             <constraint firstItem="ylv-WC-ssg" firstAttribute="top" secondItem="KYS-6e-x96" secondAttribute="top" id="kD5-O1-Zqo"/>
@@ -129,13 +139,14 @@
                     </view>
                     <navigationItem key="navigationItem" id="hjM-Bv-aPk"/>
                     <connections>
+                        <outlet property="HeadView" destination="O39-GM-fgg" id="ZDI-mX-rp3"/>
                         <outlet property="rightButton" destination="caN-Dk-YtH" id="Mav-FQ-lqS"/>
                         <outlet property="tableView" destination="HCu-mz-62m" id="6AH-ob-Wxj"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="0Bv-gH-jbr" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-268" y="95"/>
+            <point key="canvasLocation" x="-268.1159420289855" y="94.565217391304358"/>
         </scene>
         <!--Mail List By ZuVC-->
         <scene sceneID="zys-sX-Dhh">
@@ -189,7 +200,7 @@
                                                 </constraints>
                                                 <state key="normal" image="chatmsg_right_add_icon"/>
                                             </button>
-                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CKQ-pF-OU6">
+                                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CKQ-pF-OU6">
                                                 <rect key="frame" x="0.0" y="43.666666666666664" width="414" height="0.3333333333333357"/>
                                                 <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <constraints>
@@ -228,24 +239,36 @@
                                 </connections>
                             </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="SdD-zm-gTv">
-                                <rect key="frame" x="0.0" y="64" width="414" height="672"/>
+                                <rect key="frame" x="0.0" y="104" width="414" height="632"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </tableView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MUN-LO-bJ5">
+                                <rect key="frame" x="0.0" y="64" width="414" height="40"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="RJO-bw-sbX"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
                             <constraint firstItem="RcA-QL-QkY" firstAttribute="trailing" secondItem="ZaA-qP-dLF" secondAttribute="trailing" id="4Ua-EG-hBu"/>
+                            <constraint firstItem="SdD-zm-gTv" firstAttribute="top" secondItem="MUN-LO-bJ5" secondAttribute="bottom" id="5l9-TF-XlY"/>
                             <constraint firstItem="SdD-zm-gTv" firstAttribute="leading" secondItem="ZaA-qP-dLF" secondAttribute="leading" id="5p1-to-81m"/>
                             <constraint firstItem="ZaA-qP-dLF" firstAttribute="bottom" secondItem="SdD-zm-gTv" secondAttribute="bottom" id="7bm-71-0Se"/>
+                            <constraint firstItem="MUN-LO-bJ5" firstAttribute="leading" secondItem="ZaA-qP-dLF" secondAttribute="leading" id="96D-MQ-TH8"/>
                             <constraint firstItem="ZaA-qP-dLF" firstAttribute="trailing" secondItem="SdD-zm-gTv" secondAttribute="trailing" id="9Yp-GN-8aq"/>
+                            <constraint firstItem="MUN-LO-bJ5" firstAttribute="trailing" secondItem="ZaA-qP-dLF" secondAttribute="trailing" id="CUV-ZJ-S46"/>
                             <constraint firstItem="RcA-QL-QkY" firstAttribute="top" secondItem="fBh-Ke-BZh" secondAttribute="top" id="Hie-vg-5dh"/>
+                            <constraint firstItem="MUN-LO-bJ5" firstAttribute="top" secondItem="RcA-QL-QkY" secondAttribute="bottom" id="h4D-Id-atn"/>
                             <constraint firstItem="RcA-QL-QkY" firstAttribute="leading" secondItem="ZaA-qP-dLF" secondAttribute="leading" id="sPw-Uv-ue5"/>
-                            <constraint firstItem="SdD-zm-gTv" firstAttribute="top" secondItem="RcA-QL-QkY" secondAttribute="bottom" id="wqT-eJ-jMh"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="ZaA-qP-dLF"/>
                     </view>
                     <navigationItem key="navigationItem" id="gZI-aN-57q"/>
                     <connections>
+                        <outlet property="HeadHight" destination="RJO-bw-sbX" id="xyt-gf-xDP"/>
+                        <outlet property="HeadView" destination="MUN-LO-bJ5" id="2cu-l3-rhM"/>
                         <outlet property="operationAllSelectButton" destination="r3c-bD-Lpq" id="N8A-gt-CWW"/>
                         <outlet property="operationBackButton" destination="RWC-YC-yxO" id="MSE-Lo-AaN"/>
                         <outlet property="pageTitleLabel" destination="Sc4-LZ-xil" id="r72-cb-wB1"/>
@@ -255,7 +278,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="maQ-wa-M6q" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="414" y="84"/>
+            <point key="canvasLocation" x="413.04347826086962" y="83.967391304347828"/>
         </scene>
         <!--Mail List DetailVC-->
         <scene sceneID="h05-KI-hAw">

+ 14 - 3
smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/TDGroup.storyboard

@@ -655,7 +655,7 @@
                                                 <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="IlV-fa-Lsg">
+                                            <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IlV-fa-Lsg">
                                                 <rect key="frame" x="0.0" y="43.666666666666664" width="414" height="0.3333333333333357"/>
                                                 <color key="backgroundColor" red="0.93333333330000001" green="0.93333333330000001" blue="0.93333333330000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <constraints>
@@ -701,8 +701,15 @@
                                     <outlet property="height" destination="dS0-3A-8wz" id="KSM-P4-o7f"/>
                                 </connections>
                             </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U2U-JB-KZJ">
+                                <rect key="frame" x="0.0" y="64" width="414" height="40"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="uGA-ZZ-61C"/>
+                                </constraints>
+                            </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="mrh-MJ-8XD">
-                                <rect key="frame" x="0.0" y="64" width="414" height="672"/>
+                                <rect key="frame" x="0.0" y="104" width="414" height="632"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </tableView>
                             <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="agq-cG-6Fa">
@@ -724,22 +731,26 @@
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
+                            <constraint firstItem="U2U-JB-KZJ" firstAttribute="trailing" secondItem="9Eo-C6-jog" secondAttribute="trailing" id="0h3-so-OlK"/>
                             <constraint firstItem="9Eo-C6-jog" firstAttribute="trailing" secondItem="agq-cG-6Fa" secondAttribute="trailing" id="1hF-6n-O1W"/>
                             <constraint firstItem="mrh-MJ-8XD" firstAttribute="leading" secondItem="9Eo-C6-jog" secondAttribute="leading" id="EiX-d7-Q5f"/>
                             <constraint firstItem="9Eo-C6-jog" firstAttribute="trailing" secondItem="mrh-MJ-8XD" secondAttribute="trailing" id="F7R-4G-Ckn"/>
                             <constraint firstItem="agq-cG-6Fa" firstAttribute="top" secondItem="48F-12-H5e" secondAttribute="bottom" id="GSp-aa-7Nw"/>
-                            <constraint firstItem="mrh-MJ-8XD" firstAttribute="top" secondItem="48F-12-H5e" secondAttribute="bottom" id="MuH-yn-Mul"/>
                             <constraint firstAttribute="bottom" secondItem="mrh-MJ-8XD" secondAttribute="bottom" id="Ovd-ol-1Da"/>
                             <constraint firstItem="agq-cG-6Fa" firstAttribute="leading" secondItem="9Eo-C6-jog" secondAttribute="leading" id="PpS-Ag-tZA"/>
                             <constraint firstItem="48F-12-H5e" firstAttribute="leading" secondItem="9Eo-C6-jog" secondAttribute="leading" id="bZu-vJ-jSA"/>
+                            <constraint firstItem="mrh-MJ-8XD" firstAttribute="top" secondItem="U2U-JB-KZJ" secondAttribute="bottom" id="c0V-b3-UWa"/>
+                            <constraint firstItem="U2U-JB-KZJ" firstAttribute="leading" secondItem="9Eo-C6-jog" secondAttribute="leading" id="e2R-5y-r5D"/>
                             <constraint firstItem="48F-12-H5e" firstAttribute="top" secondItem="2AP-S1-jvE" secondAttribute="top" id="hMK-ig-DKN"/>
                             <constraint firstItem="48F-12-H5e" firstAttribute="trailing" secondItem="9Eo-C6-jog" secondAttribute="trailing" id="j7L-7L-OWu"/>
+                            <constraint firstItem="U2U-JB-KZJ" firstAttribute="top" secondItem="48F-12-H5e" secondAttribute="bottom" id="n7k-ho-jPq"/>
                             <constraint firstItem="9Eo-C6-jog" firstAttribute="bottom" secondItem="agq-cG-6Fa" secondAttribute="bottom" id="qC1-PR-wde"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="9Eo-C6-jog"/>
                     </view>
                     <navigationItem key="navigationItem" id="6TT-x3-Iqt"/>
                     <connections>
+                        <outlet property="HeadView" destination="U2U-JB-KZJ" id="iwv-lv-MEC"/>
                         <outlet property="noDataL" destination="tVg-58-B7M" id="nSJ-89-uSS"/>
                         <outlet property="noDataView" destination="agq-cG-6Fa" id="qSf-3f-qlV"/>
                         <outlet property="rightAddBtn" destination="itQ-y6-1ah" id="8H2-0V-Eia"/>

+ 142 - 129
smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/MyTDGroupViewController.m

@@ -15,10 +15,14 @@
 #import "MoveViewController.h"
 #import "TDGroupSearchResultVC.h"
 #import "TDGroupInfoListVC.h"
+#import "MyTDGroupView.h"
 
 @interface MyTDGroupViewController ()<UITableViewDelegate,UITableViewDataSource>
 @property (nonatomic, strong) TDTableView *tableView;
 @property (nonatomic, strong) UIView      *CusNavBar;
+@property (nonatomic, strong) UIView      *HeadView;
+@property (strong, nonatomic) MyTDGroupView             *SearchView;
+
 @property (nonatomic, strong) UILabel     *titleL;
 @property (nonatomic, strong) UIButton    *addBtn;
 @property (nonatomic, strong) NSMutableArray <NoticeModel*>*dataArray;
@@ -71,13 +75,13 @@
         make.top.left.right.mas_equalTo(self.view);
         make.height.mas_offset(kNavigationHeight);
     }];
-    UILabel * lineL = [UILabel new];
-    lineL.backgroundColor = LINEBGCOLOR;
-    [self.CusNavBar addSubview:lineL];
-    [lineL mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.bottom.right.mas_equalTo(self.CusNavBar);
-        make.height.offset(0.5);
-    }];
+//    UILabel * lineL = [UILabel new];
+//    lineL.backgroundColor = LINEBGCOLOR;
+//    [self.CusNavBar addSubview:lineL];
+//    [lineL mas_makeConstraints:^(MASConstraintMaker *make) {
+//        make.left.bottom.right.mas_equalTo(self.CusNavBar);
+//        make.height.offset(0.5);
+//    }];
     UIButton * backBtn  = [UIButton new];
     [backBtn setImage:[UIImage imageNamed:@"back_black_icon"] forState:UIControlStateNormal];
     [self.CusNavBar addSubview:backBtn];
@@ -133,9 +137,25 @@
     }else{
         self.titleL.attributedText = [self stringToAttribuedString:self.titleStr];
     }
+    [self.view addSubview:self.HeadView];
+    [self.HeadView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.right.mas_equalTo(self.view);
+        make.height.mas_offset(40);
+        make.top.mas_equalTo(self.CusNavBar.mas_bottom);
+    }];
+    [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.SearchView.button setAction:^{
+        TDGroupSearchResultVC *vc = [[TDGroupSearchResultVC alloc] init];
+        vc.ParentId = weakSelf.ParentId;
+        [weakSelf.navigationController pushViewController:vc animated:YES];
+    }];
     [self.view addSubview:self.tableView];
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(self.CusNavBar.mas_bottom);
+        make.top.mas_equalTo(self.HeadView.mas_bottom);
         make.left.right.mas_equalTo(self.view);
         if (@available(iOS 11.0, *)) {
             make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom);
@@ -149,6 +169,7 @@
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
 }
+
 -(NSMutableArray *)getMenuDataSource:(NSArray *)titleArray{
     NSMutableArray *menuDataSourceArray = [[NSMutableArray alloc] init];
     for(int i=0;i<titleArray.count;i++){
@@ -198,6 +219,14 @@
     }
     return _CusNavBar;
 }
+- (UIView *)HeadView
+{
+    if (!_HeadView) {
+        _HeadView = [UIView new];
+        _HeadView.backgroundColor = [UIColor whiteColor];
+    }
+    return _HeadView;
+}
 - (UILabel *)titleL
 {
     if (!_titleL) {
@@ -479,6 +508,10 @@
     if(operation){
         self.titleL.attributedText = [self stringToAttribuedString:@"批量操作"];
         self.iSViewEditor = YES;
+        [self.HeadView mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_offset(0);
+        }];
+        self.SearchView.hidden = YES;
         self.addBtn.hidden = YES;
         //默认操作状态为批量编辑状态
         self.operationStateEnum = OperationStateEnum1;
@@ -503,6 +536,10 @@
          }
         self.addBtn.hidden = NO;
         self.iSViewEditor = NO;
+        [self.HeadView mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.height.mas_offset(40);
+        }];
+        self.SearchView.hidden = NO;
         //默认操作状态为无状态
         self.operationStateEnum = OperationStateEnum0;
         self.operationAllSelectButton.hidden = NO;
@@ -624,156 +661,133 @@
     }
     return _dataArray;
 }
-
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
 #pragma Mark 左滑按钮 iOS8以上
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_11_0
 - (UISwipeActionsConfiguration *)tableView:(UITableView *)tableView trailingSwipeActionsConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath API_AVAILABLE(ios(11.0)) API_UNAVAILABLE(tvos){// delete action
     WS(weakSelf);
     NoticeModel *model = [self.dataArray objectAtIndex:indexPath.row];
-    if (indexPath.section > 0) {
-        switch (model.AttributeValue) {
-            case 2:{
-                UIContextualAction *action1 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:@"删除" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
-                    UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:@"确认删除" preferredStyle:(UIAlertControllerStyleAlert)];
-                    UIAlertAction * sureAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
-                        [weakSelf deleteFind:@[model].mutableCopy];
-                    }];
-                    UIAlertAction * cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
-                        
-                    }];
-                    [alert addAction:sureAction];
-                    [alert addAction:cancelAction];
-                    [weakSelf presentViewController:alert animated:YES completion:^{
-                        
-                    }];
-                }];
-                action1.backgroundColor = RGB(255, 59, 47);
-                UIContextualAction *action2 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:@"重命名" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
-                    [[ShowNewGroupAlert initShowNewGroupAlertWithTitle:@"修改文件夹名称" changeStr:model.FolderName confirm:^(NSString * _Nonnull groupName) {
-                        NSLog(@"%@",groupName);
-                        [weakSelf reNameFind:model withReNameString:groupName];
-                    } cancle:^{
-                    }] show];
-                }];
-                
-                action2.backgroundColor = RGB(255, 149, 3);
-                UIContextualAction *action3 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:model.IsTop?@"取消置顶" :@"置顶" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
-                    [weakSelf topFind:model];
-                }];
-                
-                action3.backgroundColor = RGB(197, 201, 204);
-                UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[action1, action2, action3]];
-                actions.performsFirstActionWithFullSwipe = NO;
-                return actions;
-            }break;
-            default:{
-                UIContextualAction *action1 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:@"退出" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
+    switch (model.AttributeValue) {
+        case 2:{
+            UIContextualAction *action1 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:@"删除" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
+                UIAlertController *alert = [UIAlertController alertControllerWithTitle:nil message:@"确认删除" preferredStyle:(UIAlertControllerStyleAlert)];
+                UIAlertAction * sureAction = [UIAlertAction actionWithTitle:@"确定" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
                     [weakSelf deleteFind:@[model].mutableCopy];
                 }];
-                action1.backgroundColor = RGB(255, 59, 47);
-                UIContextualAction *action2 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:@"移动" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
-                    [weakSelf launchMoveVC:@[@(model.Id)].mutableCopy];
+                UIAlertAction * cancelAction = [UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+                    
                 }];
-                action2.backgroundColor = UIColorHex(#589AF1);
-                UIContextualAction *action3 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:model.IsTop ?@"取消置顶" :@"置顶" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
-                    [weakSelf topFind:model];
+                [alert addAction:sureAction];
+                [alert addAction:cancelAction];
+                [weakSelf presentViewController:alert animated:YES completion:^{
+                    
                 }];
-                action3.backgroundColor = RGB(197, 201, 204);
-                UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[action1, action2, action3]];
-                actions.performsFirstActionWithFullSwipe = NO;
-                return actions;
-            }
-                break;
+            }];
+            action1.backgroundColor = RGB(255, 59, 47);
+            UIContextualAction *action2 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:@"重命名" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
+                [[ShowNewGroupAlert initShowNewGroupAlertWithTitle:@"修改文件夹名称" changeStr:model.FolderName confirm:^(NSString * _Nonnull groupName) {
+                    NSLog(@"%@",groupName);
+                    [weakSelf reNameFind:model withReNameString:groupName];
+                } cancle:^{
+                }] show];
+            }];
+            
+            action2.backgroundColor = RGB(255, 149, 3);
+            UIContextualAction *action3 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:model.IsTop?@"取消置顶" :@"置顶" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
+                [weakSelf topFind:model];
+            }];
+            
+            action3.backgroundColor = RGB(197, 201, 204);
+            UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[action1, action2, action3]];
+            actions.performsFirstActionWithFullSwipe = NO;
+            return actions;
+        }break;
+        default:{
+            UIContextualAction *action1 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:@"退出" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
+                [weakSelf deleteFind:@[model].mutableCopy];
+            }];
+            action1.backgroundColor = RGB(255, 59, 47);
+            UIContextualAction *action2 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:@"移动" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
+                [weakSelf launchMoveVC:@[@(model.Id)].mutableCopy];
+            }];
+            action2.backgroundColor = UIColorHex(#589AF1);
+            UIContextualAction *action3 = [UIContextualAction contextualActionWithStyle:UIContextualActionStyleDestructive title:model.IsTop ?@"取消置顶" :@"置顶" handler:^(UIContextualAction * _Nonnull action,__kindof UIView * _Nonnull sourceView,void (^ _Nonnull completionHandler)(BOOL)) {
+                [weakSelf topFind:model];
+            }];
+            action3.backgroundColor = RGB(197, 201, 204);
+            UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[action1, action2, action3]];
+            actions.performsFirstActionWithFullSwipe = NO;
+            return actions;
         }
-    }else{
-        UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[]];
-        actions.performsFirstActionWithFullSwipe = NO;
-        return actions;
+            break;
     }
 }
 #else
 - (NSArray<UITableViewRowAction *> *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath {
     NoticeModel *model = [self.dataArray objectAtIndex:indexPath.row];
     WEAKSELF
-    if (indexPath.section > 0) {
-        switch (model.AttributeValue) {
-               case 2:{
-                   UITableViewRowAction *action1 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"删除" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
-                       [weakSelf deleteFind:@[model].mutableCopy];
-                   }];
-                   action1.backgroundColor = RGB(255, 59, 47);
-                   UITableViewRowAction *action2 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"重命名" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
-                           [[ShowNewGroupAlert initShowNewGroupAlertWithTitle:@"修改文件夹名称" changeStr:model.FolderName confirm:^(NSString * _Nonnull groupName) {
-                           NSLog(@"%@",groupName);
-                           [weakSelf reNameFind:model withReNameString:groupName];
-                       } cancle:^{
-                       }] show];
-                   }];
-                   
-                   action2.backgroundColor = RGB(255, 149, 3);
-                   //                    NSLog(@"")
-                   UITableViewRowAction *action3 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title: model.IsTop?@"取消置顶" :@"置顶" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
-                       [weakSelf topFind:model];
-                   }];
-                   
-                   action3.backgroundColor = RGB(197, 201, 204);
-                   return @[action1, action2, action3];
-               }break;
-               default:{
-                   UITableViewRowAction *action1 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"退出" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
-                       [weakSelf deleteFind:@[model].mutableCopy];
-                   }];
-                   action1.backgroundColor = RGB(255, 59, 47);
-                   UITableViewRowAction *action2 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"移动" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
-                       [weakSelf launchMoveVC:@[@(model.Id)].mutableCopy];
-                   }];
-                   action2.backgroundColor = UIColorHex(#589AF1);
-                   UITableViewRowAction *action3 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:model.IsTop ?@"取消置顶" :@"置顶"  handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
-                       [weakSelf topFind:model];
-                   }];
-                   action3.backgroundColor = RGB(197, 201, 204);
-                   return @[action1, action2, action3];
-               }
-                   break;
-           }
-    }else{
-        return @[];
+    switch (model.AttributeValue) {
+        case 2:{
+            UITableViewRowAction *action1 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"删除" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
+                [weakSelf deleteFind:@[model].mutableCopy];
+            }];
+            action1.backgroundColor = RGB(255, 59, 47);
+            UITableViewRowAction *action2 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"重命名" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
+                [[ShowNewGroupAlert initShowNewGroupAlertWithTitle:@"修改文件夹名称" changeStr:model.FolderName confirm:^(NSString * _Nonnull groupName) {
+                    NSLog(@"%@",groupName);
+                    [weakSelf reNameFind:model withReNameString:groupName];
+                } cancle:^{
+                }] show];
+            }];
+            
+            action2.backgroundColor = RGB(255, 149, 3);
+            //                    NSLog(@"")
+            UITableViewRowAction *action3 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title: model.IsTop?@"取消置顶" :@"置顶" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
+                [weakSelf topFind:model];
+            }];
+            
+            action3.backgroundColor = RGB(197, 201, 204);
+            return @[action1, action2, action3];
+        }break;
+        default:{
+            UITableViewRowAction *action1 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"退出" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
+                [weakSelf deleteFind:@[model].mutableCopy];
+            }];
+            action1.backgroundColor = RGB(255, 59, 47);
+            UITableViewRowAction *action2 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:@"移动" handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
+                [weakSelf launchMoveVC:@[@(model.Id)].mutableCopy];
+            }];
+            action2.backgroundColor = UIColorHex(#589AF1);
+            UITableViewRowAction *action3 = [UITableViewRowAction rowActionWithStyle:UITableViewRowActionStyleDestructive title:model.IsTop ?@"取消置顶" :@"置顶"  handler:^(UITableViewRowAction * _Nonnull action, NSIndexPath * _Nonnull indexPath) {
+                [weakSelf topFind:model];
+            }];
+            action3.backgroundColor = RGB(197, 201, 204);
+            return @[action1, action2, action3];
+        }
+            break;
     }
 }
 #endif
 
 #pragma mark - UITableViewDelegate,UITableViewDataSource
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
-    return 2;
+    return 1;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    if (section == 0) {
-        return 1;
-    }else{
-        return self.dataArray.count;
-    }
+    return self.dataArray.count;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    if (indexPath.section == 0) {
-        return [ChatNewRowCell configCell0Height];
-    }else{
-        return [ChatNewRowCell configCell2Height];
-    }
+    return [ChatNewRowCell configCell2Height];
 }
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
     WS(weakSelf);
-    if (indexPath.section == 0) {
-        ChatNewRowCell *cell = [ChatNewRowCell configCell0:tableView indexPath:indexPath];
-        WS(weakSelf);
-        [cell.cell0SearchBtn setAction:^{
-            TDGroupSearchResultVC *vc = [[TDGroupSearchResultVC alloc] init];
-            vc.ParentId = weakSelf.ParentId;
-            [weakSelf.navigationController pushViewController:vc animated:YES];
-        }];
-        return cell;
-    }
-    else{
         switch (self.operationStateEnum) {
             case OperationStateEnum0:{
                 NoticeModel *model = [self.dataArray objectAtIndex:indexPath.row];
@@ -839,7 +853,6 @@
                 }
             }break;
         }
-    }
 }
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(nonnull NSIndexPath *)indexPath
 {

+ 2 - 2
smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/TDGroupInfoDetailVC.m

@@ -41,7 +41,7 @@
     self.fd_prefersNavigationBarHidden = YES;
     [self.HeadView addSubview:self.SearchView];
     [self.SearchView mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.edges.mas_offset(UIEdgeInsetsZero);
+        make.edges.mas_offset(UIEdgeInsetsMake(0, 0, 4, 0));
     }];
     [self.SearchView.button setAction: ^{
         NSLog(@"SearchView");
@@ -53,7 +53,7 @@
 - (MyTDGroupView *)SearchView
 {
     if (!_SearchView) {
-        _SearchView = [[MyTDGroupView alloc] init];
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
     }
     return _SearchView;
 }

+ 26 - 20
smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/TDGroupInfoListVC.m

@@ -37,6 +37,9 @@
 @property (weak, nonatomic) IBOutlet UIButton *rightAddBtn;
 @property (weak, nonatomic) IBOutlet UIButton *rightEditBtn;
 @property (weak, nonatomic) IBOutlet UIButton *rightJoinBtn;
+@property (weak, nonatomic) IBOutlet UIView *HeadView;
+@property (strong, nonatomic) MyTDGroupView             *SearchView;
+
 @property (copy, nonatomic) NSArray           * addListArray;
 @property (strong, nonatomic) NSMutableArray           * dataArray;
 @property (nonatomic, assign) NSUInteger  currentPage;
@@ -55,6 +58,13 @@
     TDGroupInfoListVC *controller = [StoryboardManager.shared.TDGroup instantiateViewControllerWithIdentifier:@"TDGroupInfoListVC"];
     return controller;
 }
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
 #pragma mark - 转发
 
 - (void)shareHander{
@@ -226,6 +236,19 @@
         self.rightJoinBtn.hidden = YES;
     }
     [self setNavbarView];
+    [self.HeadView addSubview:self.SearchView];
+    [self.SearchView  mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.right.mas_equalTo(self.HeadView);
+        make.height.mas_offset(36);
+    }];
+    WS(weakSelf);
+    [self.SearchView.button setAction:^{
+        MyTDTopicSearchVC * vc = [[MyTDTopicSearchVC alloc] init];
+        vc.searchType = TDTopicGroupSearch;
+        vc.GroupId = weakSelf.GroupId;
+        [weakSelf.navigationController pushViewController:vc animated:YES];
+    }];
+
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.currentPage = 1;
@@ -382,10 +405,12 @@
         dispatch_async(dispatch_get_main_queue(), ^{
             if (weakSelf.dataArray.count > 0) {
                 weakSelf.noDataView.hidden = YES;
+                weakSelf.HeadView.hidden = NO;
                 weakSelf.tableView.hidden = NO;
                 [weakSelf.tableView reloadData];
             }else{
                 weakSelf.noDataView.hidden = NO;
+                weakSelf.HeadView.hidden = YES;
                 weakSelf.tableView.hidden = YES;
                 weakSelf.noDataL.attributedText = [ZYCTool checkOfString:@"没有话题,我来发表一个" withSearchText:@"发表" bgtextColor:UIColorHex(#BBBBBB) foreTextColor:UIColorHex(#0F88EB) font:[UIFont systemFontOfSize:15]];
                 UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
@@ -889,9 +914,6 @@
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
-    if (section == 0) {
-        return 50.f;
-    }
     return 0.01f;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
@@ -903,23 +925,7 @@
 }
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
-    WS(weakSelf);
-    if (section == 0) {
-        UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 50)];
-        MyTDGroupView * groupView = [[MyTDGroupView alloc] init];
-        [view addSubview:groupView];
-        view.backgroundColor = UIColorHex(FFFFFF);
-        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
-            MyTDTopicSearchVC * vc = [[MyTDTopicSearchVC alloc] init];
-            vc.searchType = TDTopicGroupSearch;
-            vc.GroupId = weakSelf.GroupId;
-            [weakSelf.navigationController pushViewController:vc animated:YES];
-        }];
-        [view addGestureRecognizer:tap];
-        return view;
-    }else{
-        return [UIView new];
-    }
+    return [UIView new];
 }
 - (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
 {

+ 14 - 2
smartRhino/Project/VCModel/ChatMessage/Controller/TDInternalLeter/contoller/TDInterLeterHome.storyboard

@@ -125,28 +125,40 @@
                                 </connections>
                             </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="WAW-Um-4Yy">
-                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                                <rect key="frame" x="0.0" y="104" width="375" height="563"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                                 <connections>
                                     <outlet property="dataSource" destination="AJ2-t6-FYh" id="sUT-6y-UcP"/>
                                     <outlet property="delegate" destination="AJ2-t6-FYh" id="3Dl-ru-Bbh"/>
                                 </connections>
                             </tableView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NUl-2i-gp2">
+                                <rect key="frame" x="0.0" y="64" width="375" height="40"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="ayk-v3-VeO"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
+                            <constraint firstItem="NUl-2i-gp2" firstAttribute="top" secondItem="Gdu-Ue-fGt" secondAttribute="bottom" id="1G3-MF-2a1"/>
                             <constraint firstItem="Gdu-Ue-fGt" firstAttribute="leading" secondItem="1Hg-Yu-gGi" secondAttribute="leading" id="1gS-ct-I4X"/>
+                            <constraint firstItem="1Hg-Yu-gGi" firstAttribute="trailing" secondItem="NUl-2i-gp2" secondAttribute="trailing" id="9Yb-Ws-Fc8"/>
                             <constraint firstItem="Gdu-Ue-fGt" firstAttribute="top" secondItem="xrP-Af-1HR" secondAttribute="top" id="Vk2-fb-ArE"/>
                             <constraint firstItem="WAW-Um-4Yy" firstAttribute="leading" secondItem="1Hg-Yu-gGi" secondAttribute="leading" id="aXc-3J-JyQ"/>
                             <constraint firstItem="Gdu-Ue-fGt" firstAttribute="trailing" secondItem="1Hg-Yu-gGi" secondAttribute="trailing" id="cSk-Gk-UMX"/>
-                            <constraint firstItem="WAW-Um-4Yy" firstAttribute="top" secondItem="Gdu-Ue-fGt" secondAttribute="bottom" id="dEF-FN-RPn"/>
                             <constraint firstItem="1Hg-Yu-gGi" firstAttribute="trailing" secondItem="WAW-Um-4Yy" secondAttribute="trailing" id="pmk-bk-gGg"/>
+                            <constraint firstItem="WAW-Um-4Yy" firstAttribute="top" secondItem="NUl-2i-gp2" secondAttribute="bottom" id="psU-Zi-X34"/>
+                            <constraint firstItem="NUl-2i-gp2" firstAttribute="leading" secondItem="1Hg-Yu-gGi" secondAttribute="leading" id="qXQ-ZY-7qs"/>
                             <constraint firstAttribute="bottom" secondItem="WAW-Um-4Yy" secondAttribute="bottom" id="v0k-Zx-HSU"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="1Hg-Yu-gGi"/>
                     </view>
                     <navigationItem key="navigationItem" id="ev0-B3-D41"/>
                     <connections>
+                        <outlet property="HeadHight" destination="ayk-v3-VeO" id="Y09-mJ-wLq"/>
+                        <outlet property="HeadView" destination="NUl-2i-gp2" id="VPU-7r-6gk"/>
                         <outlet property="NavBar" destination="Gb7-jc-4O2" id="pdl-jc-wEW"/>
                         <outlet property="deleteSelectBtn" destination="nqc-ip-g8E" id="os5-mm-pSH"/>
                         <outlet property="operationAllSelectButton" destination="NnD-tO-j1Q" id="StQ-Oi-c6d"/>

+ 94 - 97
smartRhino/Project/VCModel/ChatMessage/Controller/TDInternalLeter/contoller/TDInterLeterHomeViewController.m

@@ -19,6 +19,7 @@
 #import "MyTDTopicDetailVC.h"
 #import "NSDate+Extension.h"
 #import "ShowBtn.h"
+#import "MyTDGroupView.h"
 
 @interface TDInterLeterHomeViewController ()<UITableViewDelegate,UITableViewDataSource,TDInterLeterTypeVCDelegate>
 //@property (weak, nonatomic) IBOutlet UITableView *tableView;
@@ -29,6 +30,9 @@
 @property (weak, nonatomic) IBOutlet UILabel *titleLable;
 @property (weak, nonatomic) IBOutlet UIButton *deleteSelectBtn;
 @property (weak, nonatomic) IBOutlet UIView *NavBar;
+@property (weak, nonatomic) IBOutlet UIView *HeadView;
+@property (strong, nonatomic) MyTDGroupView             *SearchView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *HeadHight;
 
 @property (strong, nonatomic) UIButton *leftCloseBtn;
 @property (strong, nonatomic) UIButton *rightMoveBtn;
@@ -68,6 +72,13 @@
     [super viewWillAppear:animated];
     [self headRefresh];
 }
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
 - (UITableView *)tableView
 {
     if (!_tableView) {
@@ -90,11 +101,24 @@
     } else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
+
+    [self.HeadView addSubview:self.SearchView];
+    [self.SearchView  mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.top.right.mas_equalTo(self.HeadView);
+        make.height.mas_offset(36);
+    }];
+    WS(weakSelf);
+    [self.SearchView.button setAction:^{
+        TDInterLeterSearchVC *vc = [[TDInterLeterSearchVC alloc] init];
+        vc.FolderId = weakSelf.interLeterFolderId;
+        vc.type = weakSelf.pageType;
+        [weakSelf.navigationController pushViewController:vc animated:YES];
+    }];
     
     [self.view addSubview:self.tableView];
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.mas_equalTo(self.view);
-        make.top.mas_equalTo(self.NavBar.mas_bottom);
+        make.top.mas_equalTo(self.HeadView.mas_bottom);
         if (@available(iOS 11.0, *)) {
             make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom);
         } else {
@@ -105,11 +129,9 @@
     self.tableView.delegate = self;
     self.tableView.dataSource = self;
     self.tableView.backgroundColor = [UIColor clearColor];
-    
     self.pageType = PageTypeFromTitleAll;
     [self autoSizeBtn:@"全部"];
 
-    WS(weakSelf);
     [self.titleBtn setAction:^{
         weakSelf.tDInterLeterTypeVC.view.hidden = !weakSelf.tDInterLeterTypeVC.view.hidden;
         if(weakSelf.tDInterLeterTypeVC.view.hidden){
@@ -391,11 +413,6 @@
 #if __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_11_0
 - (UISwipeActionsConfiguration *)tableView:(UITableView *)tableView trailingSwipeActionsConfigurationForRowAtIndexPath:(NSIndexPath *)indexPath API_AVAILABLE(ios(11.0)) API_UNAVAILABLE(tvos){// delete action
     InterLeterSubModel *model = self.interLetterArray[indexPath.row];
-    if (indexPath.section == 0) {
-        UISwipeActionsConfiguration *actions = [UISwipeActionsConfiguration configurationWithActions:@[]];
-        actions.performsFirstActionWithFullSwipe = NO;
-        return actions;
-    }
     WS(weakSelf);
     switch (self.pageType) {
         case PageTypeFromTitleAll:{
@@ -534,9 +551,6 @@
 #else
 - (NSArray<UITableViewRowAction *> *)tableView:(UITableView *)tableView editActionsForRowAtIndexPath:(NSIndexPath *)indexPath {
     InterLeterSubModel *model = self.interLetterArray[indexPath.row];
-    if (indexPath.section == 0) {
-        return @[];
-    }
     switch (self.pageType) {
         case PageTypeFromTitleAll:{
             switch (model.AttributeValue) {
@@ -677,52 +691,38 @@
 #endif
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
-    return  2;
+    return  1;
 }
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
-    switch (section) {
-        case 0:
-            return self.iSViewEditor ? 0 : 1;
-        case 1:
-            return self.interLetterArray.count;
-        default:
-            return 0;
-    }
+    return self.interLetterArray.count;
 }
 
 
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
-    switch (indexPath.section) {
-        case 0:
-            return self.iSViewEditor ? 0 : [ChatMsgNoticeCell configCell0Height];
+    InterLeterSubModel *model  = self.interLetterArray[indexPath.row];
+    switch (model.AttributeValue) {
+        case 1:
+            return [ChatMsgNoticeCell configCell2Height];
+        case 2:
+            return [ChatMsgNoticeCell configCell1Height];
         default:
-        {
-            InterLeterSubModel *model  = self.interLetterArray[indexPath.row];
-            switch (model.AttributeValue) {
-                case 1:
-                    return [ChatMsgNoticeCell configCell2Height];
-                case 2:
-                    return [ChatMsgNoticeCell configCell1Height];
-                default:
-                    return 0;
-            }
-        }
+            return 0;
     }
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
-    if (indexPath.section == 0) {
-        ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell0:tableView indexPath:indexPath];
-        WS(weakSelf);
-        [cell.cell0SearchBtn setAction:^{
-            TDInterLeterSearchVC *vc = [[TDInterLeterSearchVC alloc] init];
-            vc.FolderId = weakSelf.interLeterFolderId;
-            vc.type = weakSelf.pageType;
-            [weakSelf.navigationController pushViewController:vc animated:YES];
-        }];
-        return cell;
-    }
+//    if (indexPath.section == 0) {
+//        ChatMsgNoticeCell *cell = [ChatMsgNoticeCell configCell0:tableView indexPath:indexPath];
+//        WS(weakSelf);
+//        [cell.cell0SearchBtn setAction:^{
+//            TDInterLeterSearchVC *vc = [[TDInterLeterSearchVC alloc] init];
+//            vc.FolderId = weakSelf.interLeterFolderId;
+//            vc.type = weakSelf.pageType;
+//            [weakSelf.navigationController pushViewController:vc animated:YES];
+//        }];
+//        return cell;
+//    }
     InterLeterSubModel  *model = self.interLetterArray[indexPath.row];
     switch (self.operationStateEnum) {
         case OperationStateEnum0:{
@@ -932,60 +932,55 @@
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-    
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
-    if (indexPath.section == 0) {
-        return;
-    }else{
-        InterLeterSubModel *model = self.interLetterArray[indexPath.row];
-        switch (self.operationStateEnum) {
-            case OperationStateEnum0:
-            {
-                switch (model.AttributeValue) {
-                    case 2:{
-                        TDInterLeterHomeViewController *vc = [TDInterLeterHomeViewController initChatMsgNoticeVC];
-                        vc.interLeterFolderId = model.Id;
-                        vc.interLeterFoldName = model.FolderName;
-                        [self.navigationController pushViewController:vc animated:YES];
-                    }break;
-                    default:{
-                        if (self.pageType == PageTypeFromTitleDraftBox) {
-                            [self editorButtonHander:indexPath];
-                        }else{
-                            switch (model.MissiveType) {
-                                case 1:
-                                {
-                                    MyTDTopicDetailVC *vc = [MyTDTopicDetailVC  initMyTDTopicDetailVC];
-                                    //                                    vc.detailType = (model.MissiveType == 1)? InterLeterDetialType_Sign : InterLeterDetialType_NoSign;
-                                    vc.Id  = model.MiddleId;
-                                    vc.type = CollectModel_InterMail;
-                                    [self.navigationController pushViewController:vc animated:YES];
-                                }break;
-                                case 2:{
-                                    MyTDTopicDetailVC *vc = [MyTDTopicDetailVC  initMyTDTopicDetailVC];
-                                    vc.Id  = model.MiddleId;
-                                    vc.type = CollectModel_InterMail;
-                                    [self.navigationController pushViewController:vc animated:YES];
-                                }break;
-                                default:
-                                {
-                                    MyTDTopicDetailVC *vc = [MyTDTopicDetailVC  initMyTDTopicDetailVC];
-                                    //                                    vc.detailType = (model.MissiveType == 1)? InterLeterDetialType_Sign : InterLeterDetialType_NoSign;
-                                    vc.Id  = model.MiddleId;
-                                    vc.type = CollectModel_InterMail;
-                                    [self.navigationController pushViewController:vc animated:YES];
-                                }break;
-                            }
+    InterLeterSubModel *model = self.interLetterArray[indexPath.row];
+    switch (self.operationStateEnum) {
+        case OperationStateEnum0:
+        {
+            switch (model.AttributeValue) {
+                case 2:{
+                    TDInterLeterHomeViewController *vc = [TDInterLeterHomeViewController initChatMsgNoticeVC];
+                    vc.interLeterFolderId = model.Id;
+                    vc.interLeterFoldName = model.FolderName;
+                    [self.navigationController pushViewController:vc animated:YES];
+                }break;
+                default:{
+                    if (self.pageType == PageTypeFromTitleDraftBox) {
+                        [self editorButtonHander:indexPath];
+                    }else{
+                        switch (model.MissiveType) {
+                            case 1:
+                            {
+                                MyTDTopicDetailVC *vc = [MyTDTopicDetailVC  initMyTDTopicDetailVC];
+                                //                                    vc.detailType = (model.MissiveType == 1)? InterLeterDetialType_Sign : InterLeterDetialType_NoSign;
+                                vc.Id  = model.MiddleId;
+                                vc.type = CollectModel_InterMail;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }break;
+                            case 2:{
+                                MyTDTopicDetailVC *vc = [MyTDTopicDetailVC  initMyTDTopicDetailVC];
+                                vc.Id  = model.MiddleId;
+                                vc.type = CollectModel_InterMail;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }break;
+                            default:
+                            {
+                                MyTDTopicDetailVC *vc = [MyTDTopicDetailVC  initMyTDTopicDetailVC];
+                                //                                    vc.detailType = (model.MissiveType == 1)? InterLeterDetialType_Sign : InterLeterDetialType_NoSign;
+                                vc.Id  = model.MiddleId;
+                                vc.type = CollectModel_InterMail;
+                                [self.navigationController pushViewController:vc animated:YES];
+                            }break;
                         }
-                    }break;
-                }
-            }break;
-            default:{
-                model.IsSelect  = !model.IsSelect;
-                [tableView reloadRowAtIndexPath:indexPath withRowAnimation:UITableViewRowAnimationNone];
-                return;
-            }break;
-        }
+                    }
+                }break;
+            }
+        }break;
+        default:{
+            model.IsSelect  = !model.IsSelect;
+            [tableView reloadRowAtIndexPath:indexPath withRowAnimation:UITableViewRowAnimationNone];
+            return;
+        }break;
     }
 }
 #pragma mark - 设置 移动按钮 样式
@@ -1178,6 +1173,7 @@
     if(operation){
         self.deleteView.hidden = YES;
         self.iSViewEditor = YES;
+        self.HeadHight.constant = 0.f;
         self.rightAddBtn.hidden = YES;
         self.rightEditBtn.hidden = YES;
         //默认操作状态为批量编辑状态
@@ -1228,6 +1224,7 @@
         }
         self.operationBottomBgView.hidden = YES;
         self.iSViewEditor = NO;
+        self.HeadHight.constant = 40.f;
         //默认操作状态为无状态
         self.operationStateEnum = OperationStateEnum0;
         self.operationAllSelectButton.hidden = NO;

+ 1 - 0
smartRhino/Project/VCModel/ChatMessage/View/ChatMsgListCell.h

@@ -49,6 +49,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic) IBOutlet UIButton *cell6SelectBtn;
 
 @property (weak, nonatomic) IBOutlet UIImageView *IsTopView;
+@property (weak, nonatomic) IBOutlet UILabel *bottomL;
 
 + (CGFloat)configCell0Height;
 + (CGFloat)configCell1Height;

+ 17 - 3
smartRhino/Project/VCModel/ChatMessage/View/ChatMsgListCell.xib

@@ -74,22 +74,36 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0oD-Oi-ctz">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="80"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="79.5"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                     </view>
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="czq-5F-sql">
+                        <rect key="frame" x="0.0" y="79.5" width="320" height="0.5"/>
+                        <color key="backgroundColor" red="0.89803921568627454" green="0.89803921568627454" blue="0.89803921568627454" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="0.5" id="cNV-kX-0XX"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="textColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
                 </subviews>
                 <constraints>
-                    <constraint firstAttribute="bottom" secondItem="0oD-Oi-ctz" secondAttribute="bottom" id="S2I-li-fSV"/>
+                    <constraint firstItem="czq-5F-sql" firstAttribute="leading" secondItem="dRh-Bp-163" secondAttribute="leading" id="9Eg-Nx-ayd"/>
                     <constraint firstItem="0oD-Oi-ctz" firstAttribute="leading" secondItem="dRh-Bp-163" secondAttribute="leading" id="b27-K8-dK6"/>
                     <constraint firstItem="0oD-Oi-ctz" firstAttribute="top" secondItem="dRh-Bp-163" secondAttribute="top" id="fUD-kt-S4U"/>
+                    <constraint firstItem="czq-5F-sql" firstAttribute="top" secondItem="0oD-Oi-ctz" secondAttribute="bottom" id="gt7-D6-PC8"/>
+                    <constraint firstAttribute="bottom" secondItem="czq-5F-sql" secondAttribute="bottom" id="ssb-ak-EbE"/>
                     <constraint firstAttribute="trailing" secondItem="0oD-Oi-ctz" secondAttribute="trailing" id="szw-bw-5LF"/>
+                    <constraint firstAttribute="trailing" secondItem="czq-5F-sql" secondAttribute="trailing" id="zmp-ez-o28"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="520-dZ-mlc"/>
             <connections>
+                <outlet property="bottomL" destination="czq-5F-sql" id="Xxk-Hy-BHO"/>
                 <outlet property="cell1ContentBgView" destination="0oD-Oi-ctz" id="lGo-81-8UC"/>
             </connections>
-            <point key="canvasLocation" x="132" y="169"/>
+            <point key="canvasLocation" x="131.8840579710145" y="168.75"/>
         </tableViewCell>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ChatMsgListCell2" id="kGg-7T-U7m" customClass="ChatMsgListCell">
             <rect key="frame" x="0.0" y="0.0" width="320" height="69"/>

+ 11 - 1
smartRhino/Project/VCModel/Home/OtherHomeVC/ClickOK/AddChannel/AddChannelController.m

@@ -60,6 +60,16 @@
     workModel.ArticleGroupName = @"待办工作";
     workModel.IsSelect = NO;
     [self.channelSelectArr addObject:workModel];
+    ChannelModel * sModel = [[ChannelModel alloc] init];
+    sModel.ArticleGroupId = 2;
+    sModel.ArticleGroupName = @"信源听说";
+    sModel.IsSelect = NO;
+    [self.channelSelectArr addObject:sModel];
+    ChannelModel * mModel = [[ChannelModel alloc] init];
+    mModel.ArticleGroupId = 3;
+    mModel.ArticleGroupName = @"名校";
+    mModel.IsSelect = NO;
+    [self.channelSelectArr addObject:mModel];
 }
 - (void)getData
 {
@@ -234,7 +244,7 @@
         }
     } else {
         cell.deleteButton.hidden = NO;
-        if ((indexPath.item == 0) || (indexPath.item == 1)) {
+        if ((indexPath.item == 0) || (indexPath.item == 1)||(indexPath.item == 2)||(indexPath.item == 3)) {
             cell.deleteButton.hidden = YES;
         }
         cell.deleteButton.tag = indexPath.row;

+ 3 - 3
smartRhino/Project/VCModel/Home/OtherHomeVC/MyTDTopic/VC/MyTDTopicGroupUserVC.m

@@ -412,8 +412,8 @@
         headerLabel.textColor = RGB(153, 153, 153);
     }else{
         [headerView setBackgroundColor:[UIColor whiteColor]];
-        [headerView setFrame:CGRectMake(0, 0, SCREEN_WIDTH, 50)];
-        MyTDGroupView * view = [[MyTDGroupView alloc] init];
+        [headerView setFrame:CGRectMake(0, 0, SCREEN_WIDTH, 44)];
+        MyTDGroupView * view = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
         [headerView addSubview:view];
         WS(weakSelf);
         UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
@@ -434,7 +434,7 @@
     if(section > 0){
         return 30;
     }
-    return 50.f;
+    return 44.f;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
 {

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

@@ -825,8 +825,8 @@
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
     if (section == 0) {
-        UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 50)];
-        MyTDGroupView * groupView = [[MyTDGroupView alloc] init];
+        UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 44)];
+        MyTDGroupView * groupView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
         [view addSubview:groupView];
         view.backgroundColor = UIColorHex(FFFFFF);
         UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(pushSearchVC)];

+ 603 - 1
smartRhino/Project/VCModel/Home/VC/BookStore/BookStore.storyboard

@@ -5,6 +5,7 @@
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="collection view cell content view" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -98,8 +99,9 @@
                                     <constraint firstAttribute="height" constant="40" id="S61-L2-dW7"/>
                                 </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="P7O-Ou-oGU">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="P7O-Ou-oGU">
                                 <rect key="frame" x="0.0" y="104" width="414" height="632"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </tableView>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
@@ -127,9 +129,609 @@
             </objects>
             <point key="canvasLocation" x="-252.17391304347828" y="95.380434782608702"/>
         </scene>
+        <!--Book MingVC-->
+        <scene sceneID="9rE-kI-esq">
+            <objects>
+                <viewController storyboardIdentifier="BookMingVC" id="lZG-fr-XT4" customClass="BookMingVC" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="53f-qx-Om6">
+                        <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="Eqm-UL-Ihd" customClass="WQNavigationBar">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IJk-67-qkh">
+                                        <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="puv-fK-ZmV">
+                                                <rect key="frame" x="0.0" y="0.0" width="50" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="44" id="B9D-f5-WSk"/>
+                                                    <constraint firstAttribute="width" constant="50" id="eIr-bU-cff"/>
+                                                </constraints>
+                                                <state key="normal" image="back_black_icon"/>
+                                                <connections>
+                                                    <action selector="backAction:" destination="lZG-fr-XT4" eventType="touchUpInside" id="gqv-N1-Kfy"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ty8-Vh-9C3">
+                                                <rect key="frame" x="50" y="0.0" width="35" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="35" id="TVa-nC-vmC"/>
+                                                    <constraint firstAttribute="height" constant="44" id="blo-zu-48a"/>
+                                                </constraints>
+                                                <state key="normal" image="menu_black_icon"/>
+                                                <connections>
+                                                    <action selector="menuAction:" destination="lZG-fr-XT4" eventType="touchUpInside" id="3Sw-ak-301"/>
+                                                </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="tsn-nb-UnH">
+                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" 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="tsn-nb-UnH" firstAttribute="centerX" secondItem="IJk-67-qkh" secondAttribute="centerX" id="449-75-wZp"/>
+                                            <constraint firstItem="tsn-nb-UnH" firstAttribute="centerY" secondItem="puv-fK-ZmV" secondAttribute="centerY" id="8hO-Qs-AjS"/>
+                                            <constraint firstItem="puv-fK-ZmV" firstAttribute="leading" secondItem="IJk-67-qkh" secondAttribute="leading" id="Nhg-wR-BJb"/>
+                                            <constraint firstAttribute="height" constant="44" id="NyW-3a-SkH"/>
+                                            <constraint firstItem="ty8-Vh-9C3" firstAttribute="bottom" secondItem="puv-fK-ZmV" secondAttribute="bottom" id="QsZ-DB-Dud"/>
+                                            <constraint firstItem="ty8-Vh-9C3" firstAttribute="top" secondItem="puv-fK-ZmV" secondAttribute="top" id="p8S-w3-1RB"/>
+                                            <constraint firstItem="ty8-Vh-9C3" firstAttribute="leading" secondItem="puv-fK-ZmV" secondAttribute="trailing" id="tar-g1-8cl"/>
+                                            <constraint firstAttribute="bottom" secondItem="puv-fK-ZmV" secondAttribute="bottom" id="ugg-HZ-SpH"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstItem="IJk-67-qkh" firstAttribute="leading" secondItem="7lm-HA-1Ui" secondAttribute="leading" id="1dG-3Z-oEs"/>
+                                    <constraint firstItem="7lm-HA-1Ui" firstAttribute="bottom" secondItem="IJk-67-qkh" secondAttribute="bottom" id="IQx-Dl-Xu5"/>
+                                    <constraint firstAttribute="height" constant="64" id="aG4-SP-uWf"/>
+                                    <constraint firstItem="IJk-67-qkh" firstAttribute="trailing" secondItem="7lm-HA-1Ui" secondAttribute="trailing" id="jPl-oS-yFh"/>
+                                </constraints>
+                                <viewLayoutGuide key="safeArea" id="7lm-HA-1Ui"/>
+                                <connections>
+                                    <outlet property="height" destination="aG4-SP-uWf" id="ZhP-Aw-WMQ"/>
+                                </connections>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fQq-Ys-W9K">
+                                <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="oRK-pR-ZRb"/>
+                                </constraints>
+                            </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="1CE-DD-Xpv">
+                                <rect key="frame" x="0.0" y="104" width="414" height="632"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="jVt-kX-2iM" firstAttribute="trailing" secondItem="1CE-DD-Xpv" secondAttribute="trailing" id="2as-O0-YXB"/>
+                            <constraint firstItem="1CE-DD-Xpv" firstAttribute="top" secondItem="fQq-Ys-W9K" secondAttribute="bottom" id="38A-8r-6FV"/>
+                            <constraint firstItem="fQq-Ys-W9K" firstAttribute="trailing" secondItem="jVt-kX-2iM" secondAttribute="trailing" id="Ciw-c7-gEb"/>
+                            <constraint firstItem="jVt-kX-2iM" firstAttribute="bottom" secondItem="1CE-DD-Xpv" secondAttribute="bottom" id="FSN-rJ-d9V"/>
+                            <constraint firstItem="Eqm-UL-Ihd" firstAttribute="trailing" secondItem="jVt-kX-2iM" secondAttribute="trailing" id="MVH-t7-9My"/>
+                            <constraint firstItem="Eqm-UL-Ihd" firstAttribute="top" secondItem="53f-qx-Om6" secondAttribute="top" id="P49-DG-Ex9"/>
+                            <constraint firstItem="1CE-DD-Xpv" firstAttribute="leading" secondItem="jVt-kX-2iM" secondAttribute="leading" id="ew0-W0-xnd"/>
+                            <constraint firstItem="fQq-Ys-W9K" firstAttribute="top" secondItem="Eqm-UL-Ihd" secondAttribute="bottom" id="kEm-17-7EQ"/>
+                            <constraint firstItem="fQq-Ys-W9K" firstAttribute="leading" secondItem="jVt-kX-2iM" secondAttribute="leading" id="oxf-P5-CMy"/>
+                            <constraint firstItem="Eqm-UL-Ihd" firstAttribute="leading" secondItem="jVt-kX-2iM" secondAttribute="leading" id="tJb-0E-Xfh"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="jVt-kX-2iM"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="DPM-R9-fSm"/>
+                    <connections>
+                        <outlet property="HeadView" destination="fQq-Ys-W9K" id="ZZy-lh-J7g"/>
+                        <outlet property="TitleL" destination="tsn-nb-UnH" id="HHz-Zh-TYP"/>
+                        <outlet property="tableView" destination="1CE-DD-Xpv" id="TgC-yF-AKg"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="3pb-nD-avQ" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="458" y="95"/>
+        </scene>
+        <!--Book All LookVC-->
+        <scene sceneID="CbT-FK-H89">
+            <objects>
+                <viewController storyboardIdentifier="BookAllLookVC" id="5ta-HV-6WJ" customClass="BookAllLookVC" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="7zZ-Ei-75G">
+                        <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="egX-5m-hg8" customClass="WQNavigationBar">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TqR-PE-WsC">
+                                        <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="WIG-yk-jRo">
+                                                <rect key="frame" x="0.0" y="0.0" width="50" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="44" id="AUh-bF-PPf"/>
+                                                    <constraint firstAttribute="width" constant="50" id="ICf-37-LbH"/>
+                                                </constraints>
+                                                <state key="normal" image="back_black_icon"/>
+                                                <connections>
+                                                    <action selector="backAction:" destination="5ta-HV-6WJ" eventType="touchUpInside" id="jzU-yP-Doh"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eNa-v3-kPc">
+                                                <rect key="frame" x="50" y="0.0" width="35" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="35" id="1Kj-xk-KVz"/>
+                                                    <constraint firstAttribute="height" constant="44" id="rEW-ps-DO1"/>
+                                                </constraints>
+                                                <state key="normal" image="menu_black_icon"/>
+                                                <connections>
+                                                    <action selector="menuAction:" destination="5ta-HV-6WJ" eventType="touchUpInside" id="0hV-JN-qqp"/>
+                                                </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="hm5-b0-bGy">
+                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" 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>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jWc-hc-S5t">
+                                                <rect key="frame" x="0.0" y="43.666666666666664" width="414" height="0.3333333333333357"/>
+                                                <color key="backgroundColor" red="0.89803921568627454" green="0.89803921568627454" blue="0.89803921568627454" alpha="1" colorSpace="calibratedRGB"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="0.5" id="rih-Bq-2Ai"/>
+                                                </constraints>
+                                            </view>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="44" id="2c1-II-DHj"/>
+                                            <constraint firstAttribute="trailing" secondItem="jWc-hc-S5t" secondAttribute="trailing" id="4vc-1m-uGg"/>
+                                            <constraint firstItem="eNa-v3-kPc" firstAttribute="top" secondItem="WIG-yk-jRo" secondAttribute="top" id="9wh-V5-8k9"/>
+                                            <constraint firstAttribute="bottom" secondItem="jWc-hc-S5t" secondAttribute="bottom" id="FJ2-5e-IX1"/>
+                                            <constraint firstItem="eNa-v3-kPc" firstAttribute="bottom" secondItem="WIG-yk-jRo" secondAttribute="bottom" id="Kru-vz-uth"/>
+                                            <constraint firstItem="WIG-yk-jRo" firstAttribute="leading" secondItem="TqR-PE-WsC" secondAttribute="leading" id="MUO-bP-twh"/>
+                                            <constraint firstItem="hm5-b0-bGy" firstAttribute="centerY" secondItem="WIG-yk-jRo" secondAttribute="centerY" id="NeD-nL-eQ8"/>
+                                            <constraint firstItem="hm5-b0-bGy" firstAttribute="centerX" secondItem="TqR-PE-WsC" secondAttribute="centerX" id="VOE-lg-Gij"/>
+                                            <constraint firstItem="eNa-v3-kPc" firstAttribute="leading" secondItem="WIG-yk-jRo" secondAttribute="trailing" id="csH-3h-aez"/>
+                                            <constraint firstItem="jWc-hc-S5t" firstAttribute="leading" secondItem="TqR-PE-WsC" secondAttribute="leading" id="gCF-r6-Rsf"/>
+                                            <constraint firstAttribute="bottom" secondItem="WIG-yk-jRo" secondAttribute="bottom" id="pjs-0a-H33"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="64" id="6YE-Gq-oWm"/>
+                                    <constraint firstItem="TqR-PE-WsC" firstAttribute="leading" secondItem="3k4-BQ-Wn6" secondAttribute="leading" id="NlA-ZD-aCz"/>
+                                    <constraint firstItem="TqR-PE-WsC" firstAttribute="trailing" secondItem="3k4-BQ-Wn6" secondAttribute="trailing" id="RKD-uF-uW6"/>
+                                    <constraint firstItem="3k4-BQ-Wn6" firstAttribute="bottom" secondItem="TqR-PE-WsC" secondAttribute="bottom" id="ocL-8H-GQZ"/>
+                                </constraints>
+                                <viewLayoutGuide key="safeArea" id="3k4-BQ-Wn6"/>
+                                <connections>
+                                    <outlet property="height" destination="6YE-Gq-oWm" id="qRT-gB-XZy"/>
+                                </connections>
+                            </view>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="T7Z-F3-Qyb">
+                                <rect key="frame" x="0.0" y="64" width="414" height="672"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="cNO-W5-GVu">
+                                    <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>
+                                <cells>
+                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="1Ks-79-nxX">
+                                        <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="PSa-wS-B5B">
+                                            <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </collectionViewCellContentView>
+                                    </collectionViewCell>
+                                </cells>
+                            </collectionView>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="egX-5m-hg8" firstAttribute="top" secondItem="7zZ-Ei-75G" secondAttribute="top" id="441-dt-GMQ"/>
+                            <constraint firstItem="Vrj-GD-fcK" firstAttribute="bottom" secondItem="T7Z-F3-Qyb" secondAttribute="bottom" id="APv-Sj-yZV"/>
+                            <constraint firstItem="T7Z-F3-Qyb" firstAttribute="top" secondItem="egX-5m-hg8" secondAttribute="bottom" id="QNM-NS-jaa"/>
+                            <constraint firstItem="T7Z-F3-Qyb" firstAttribute="leading" secondItem="Vrj-GD-fcK" secondAttribute="leading" id="aKl-7f-0ij"/>
+                            <constraint firstItem="egX-5m-hg8" firstAttribute="leading" secondItem="Vrj-GD-fcK" secondAttribute="leading" id="mLX-nD-YlJ"/>
+                            <constraint firstItem="egX-5m-hg8" firstAttribute="trailing" secondItem="Vrj-GD-fcK" secondAttribute="trailing" id="n7D-df-srN"/>
+                            <constraint firstItem="Vrj-GD-fcK" firstAttribute="trailing" secondItem="T7Z-F3-Qyb" secondAttribute="trailing" id="w58-Sp-0xv"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="Vrj-GD-fcK"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="BbI-iV-j6z"/>
+                    <connections>
+                        <outlet property="TitleL" destination="hm5-b0-bGy" id="C6M-BJ-qDA"/>
+                        <outlet property="collectionView" destination="T7Z-F3-Qyb" id="hc5-Pp-SQZ"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="ABp-Ba-9mM" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1150.7246376811595" y="94.565217391304358"/>
+        </scene>
+        <!--Book Content NavVC-->
+        <scene sceneID="yQT-ue-5Rm">
+            <objects>
+                <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"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="37l-Mm-J9n" customClass="WQNavigationBar">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="DBI-9z-5EJ">
+                                        <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="hXt-dX-YZ4">
+                                                <rect key="frame" x="0.0" y="0.0" width="50" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="50" id="6oI-Jy-lU8"/>
+                                                    <constraint firstAttribute="height" constant="44" id="9YN-AX-cSj"/>
+                                                </constraints>
+                                                <state key="normal" image="back_black_icon"/>
+                                                <connections>
+                                                    <action selector="backAction:" destination="hJI-SY-M4N" eventType="touchUpInside" id="4YN-JQ-BFC"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wR6-MK-W5y">
+                                                <rect key="frame" x="50" y="0.0" width="35" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="35" id="8ac-5A-Tl8"/>
+                                                    <constraint firstAttribute="height" constant="44" id="JUc-xw-GgG"/>
+                                                </constraints>
+                                                <state key="normal" image="menu_black_icon"/>
+                                                <connections>
+                                                    <action selector="menuAction:" destination="hJI-SY-M4N" eventType="touchUpInside" id="xJx-FC-hro"/>
+                                                </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="Fah-vC-JzT">
+                                                <rect key="frame" x="188.66666666666666" y="11.666666666666668" width="37" 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="Fah-vC-JzT" firstAttribute="centerX" secondItem="DBI-9z-5EJ" secondAttribute="centerX" id="5cS-yJ-4HT"/>
+                                            <constraint firstItem="Fah-vC-JzT" firstAttribute="centerY" secondItem="hXt-dX-YZ4" secondAttribute="centerY" id="GGp-WG-E5x"/>
+                                            <constraint firstItem="hXt-dX-YZ4" firstAttribute="leading" secondItem="DBI-9z-5EJ" secondAttribute="leading" id="Su3-jP-dg0"/>
+                                            <constraint firstItem="wR6-MK-W5y" firstAttribute="leading" secondItem="hXt-dX-YZ4" secondAttribute="trailing" id="Txy-D0-CPV"/>
+                                            <constraint firstAttribute="height" constant="44" id="cDK-qc-gZi"/>
+                                            <constraint firstItem="wR6-MK-W5y" firstAttribute="top" secondItem="hXt-dX-YZ4" secondAttribute="top" id="fVc-Sp-HNH"/>
+                                            <constraint firstAttribute="bottom" secondItem="hXt-dX-YZ4" secondAttribute="bottom" id="mU0-nZ-bzW"/>
+                                            <constraint firstItem="wR6-MK-W5y" firstAttribute="bottom" secondItem="hXt-dX-YZ4" secondAttribute="bottom" id="z4a-xD-mhj"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="64" id="3ce-XC-Qkw"/>
+                                    <constraint firstItem="AuC-nu-bbT" firstAttribute="bottom" secondItem="DBI-9z-5EJ" secondAttribute="bottom" id="ZRO-Me-1z3"/>
+                                    <constraint firstItem="DBI-9z-5EJ" firstAttribute="trailing" secondItem="AuC-nu-bbT" secondAttribute="trailing" id="fSx-Xg-ueb"/>
+                                    <constraint firstItem="DBI-9z-5EJ" firstAttribute="leading" secondItem="AuC-nu-bbT" secondAttribute="leading" id="gAJ-zo-ZBI"/>
+                                </constraints>
+                                <viewLayoutGuide key="safeArea" id="AuC-nu-bbT"/>
+                                <connections>
+                                    <outlet property="height" destination="3ce-XC-Qkw" id="XAM-jy-ccu"/>
+                                </connections>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RCI-he-2Y3">
+                                <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="QLT-bT-IlU"/>
+                                </constraints>
+                            </view>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="ALj-0X-ei3">
+                                <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="7H5-jZ-ncS"/>
+                                </constraints>
+                            </tableView>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" bounces="NO" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Bhc-Gs-CiI">
+                                <rect key="frame" x="80" y="104" width="80" height="632"/>
+                                <color key="backgroundColor" red="0.8666666666666667" green="0.8666666666666667" blue="0.8666666666666667" alpha="1" colorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="80" id="uhj-65-3eq"/>
+                                </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="cUG-yW-Hh1">
+                                <rect key="frame" x="160" y="151" width="254" height="585"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            </tableView>
+                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="AwI-E2-DTb">
+                                <rect key="frame" x="160" y="104" width="207" height="47"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="47" id="PAE-BO-npc"/>
+                                </constraints>
+                                <collectionViewFlowLayout key="collectionViewLayout" automaticEstimatedItemSize="YES" minimumLineSpacing="10" minimumInteritemSpacing="10" id="jNH-mV-Wig">
+                                    <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>
+                                <cells>
+                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="2qg-nD-y0g">
+                                        <rect key="frame" x="0.0" y="0.0" width="50.000000000000014" height="50"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                        <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="xyX-JR-hNB">
+                                            <rect key="frame" x="0.0" y="0.0" width="50.000000000000014" height="50"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                        </collectionViewCellContentView>
+                                    </collectionViewCell>
+                                </cells>
+                            </collectionView>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ixV-1L-FUX">
+                                <rect key="frame" x="367" y="104" width="47" height="47"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="47" id="b9f-11-kco"/>
+                                    <constraint firstAttribute="height" constant="47" id="fHn-FY-7b2"/>
+                                </constraints>
+                                <state key="normal" image="Book_shaisuan_right"/>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="RCI-he-2Y3" firstAttribute="leading" secondItem="zhq-BA-y66" secondAttribute="leading" id="30P-qS-82J"/>
+                            <constraint firstItem="RCI-he-2Y3" firstAttribute="top" secondItem="37l-Mm-J9n" secondAttribute="bottom" id="8Yl-Lm-pxm"/>
+                            <constraint firstItem="37l-Mm-J9n" firstAttribute="top" secondItem="A6a-7S-1Uq" secondAttribute="top" id="Ack-bM-91O"/>
+                            <constraint firstItem="cUG-yW-Hh1" firstAttribute="leading" secondItem="Bhc-Gs-CiI" secondAttribute="trailing" id="DJ8-1b-GTd"/>
+                            <constraint firstItem="RCI-he-2Y3" firstAttribute="trailing" secondItem="zhq-BA-y66" secondAttribute="trailing" id="FCp-ii-Hn1"/>
+                            <constraint firstItem="Bhc-Gs-CiI" firstAttribute="leading" secondItem="ALj-0X-ei3" secondAttribute="trailing" id="I6A-UH-OFa"/>
+                            <constraint firstItem="Bhc-Gs-CiI" firstAttribute="top" secondItem="RCI-he-2Y3" secondAttribute="bottom" id="KOW-u7-T5c"/>
+                            <constraint firstItem="ALj-0X-ei3" firstAttribute="leading" secondItem="zhq-BA-y66" secondAttribute="leading" id="Kq3-F1-F9K"/>
+                            <constraint firstItem="zhq-BA-y66" firstAttribute="bottom" secondItem="ALj-0X-ei3" secondAttribute="bottom" id="Nah-My-c5M"/>
+                            <constraint firstItem="ixV-1L-FUX" firstAttribute="leading" secondItem="AwI-E2-DTb" secondAttribute="trailing" id="UDu-oA-TDq"/>
+                            <constraint firstItem="AwI-E2-DTb" firstAttribute="leading" secondItem="Bhc-Gs-CiI" secondAttribute="trailing" id="VRb-g7-htU"/>
+                            <constraint firstItem="zhq-BA-y66" firstAttribute="trailing" secondItem="cUG-yW-Hh1" secondAttribute="trailing" id="WwE-uC-Q6p"/>
+                            <constraint firstItem="37l-Mm-J9n" firstAttribute="leading" secondItem="zhq-BA-y66" secondAttribute="leading" id="aYm-yx-T3y"/>
+                            <constraint firstItem="AwI-E2-DTb" firstAttribute="top" secondItem="RCI-he-2Y3" secondAttribute="bottom" id="o7h-lI-OZC"/>
+                            <constraint firstItem="ixV-1L-FUX" firstAttribute="top" secondItem="RCI-he-2Y3" secondAttribute="bottom" id="pEe-YQ-eIj"/>
+                            <constraint firstItem="ALj-0X-ei3" firstAttribute="top" secondItem="RCI-he-2Y3" secondAttribute="bottom" id="pc6-DH-uqx"/>
+                            <constraint firstItem="zhq-BA-y66" firstAttribute="trailing" secondItem="ixV-1L-FUX" secondAttribute="trailing" id="rwc-TK-7Y0"/>
+                            <constraint firstItem="37l-Mm-J9n" firstAttribute="trailing" secondItem="zhq-BA-y66" secondAttribute="trailing" id="vve-4F-EBd"/>
+                            <constraint firstItem="zhq-BA-y66" firstAttribute="bottom" secondItem="cUG-yW-Hh1" secondAttribute="bottom" id="xro-mK-4iQ"/>
+                            <constraint firstItem="cUG-yW-Hh1" firstAttribute="top" secondItem="AwI-E2-DTb" secondAttribute="bottom" id="y7D-V2-Qz9"/>
+                            <constraint firstItem="zhq-BA-y66" firstAttribute="bottom" secondItem="Bhc-Gs-CiI" secondAttribute="bottom" id="yOt-CK-9Xp"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="zhq-BA-y66"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="9er-w3-HgE"/>
+                    <connections>
+                        <outlet property="HeadView" destination="RCI-he-2Y3" id="Jps-1T-5rk"/>
+                        <outlet property="TitleL" destination="Fah-vC-JzT" id="rVu-qB-YTj"/>
+                        <outlet property="collectionView" destination="AwI-E2-DTb" id="cFO-qc-xCS"/>
+                        <outlet property="leftTableV" destination="ALj-0X-ei3" id="c5S-4P-ocz"/>
+                        <outlet property="leftW" destination="7H5-jZ-ncS" id="oeZ-Kt-lix"/>
+                        <outlet property="middleTableV" destination="Bhc-Gs-CiI" id="2QL-7p-hAO"/>
+                        <outlet property="middleW" destination="uhj-65-3eq" id="1ei-Cd-ole"/>
+                        <outlet property="rightTableV" destination="cUG-yW-Hh1" id="YIT-IB-d1U"/>
+                        <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>
+                <viewController storyboardIdentifier="BookPlayListVC" id="oGg-c0-m9m" customClass="BookPlayListVC" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Jq1-gT-idn">
+                        <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="EPj-sC-u2x" customClass="WQNavigationBar">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gg6-27-z2D">
+                                        <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="NDO-Fq-Mgw">
+                                                <rect key="frame" x="0.0" y="0.0" width="50" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="50" id="csZ-uq-xey"/>
+                                                    <constraint firstAttribute="height" constant="44" id="sJ6-hv-0q5"/>
+                                                </constraints>
+                                                <state key="normal" image="back_black_icon"/>
+                                                <connections>
+                                                    <action selector="backAction:" destination="oGg-c0-m9m" eventType="touchUpInside" id="kaL-Vg-dG6"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kz4-mk-4qy">
+                                                <rect key="frame" x="50" y="0.0" width="35" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="35" id="9MU-2B-J2B"/>
+                                                    <constraint firstAttribute="height" constant="44" id="xa8-pw-cQx"/>
+                                                </constraints>
+                                                <state key="normal" image="menu_black_icon"/>
+                                                <connections>
+                                                    <action selector="menuAction:" destination="oGg-c0-m9m" eventType="touchUpInside" id="1eh-5r-2Cq"/>
+                                                </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="6EQ-yo-Aue">
+                                                <rect key="frame" x="170.33333333333334" y="11.666666666666668" width="73.666666666666657" 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>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KLG-2U-2I7">
+                                                <rect key="frame" x="0.0" y="43.666666666666664" width="414" height="0.3333333333333357"/>
+                                                <color key="backgroundColor" red="0.8980392157" green="0.8980392157" blue="0.8980392157" alpha="1" colorSpace="calibratedRGB"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="0.5" id="MnR-dV-gX1"/>
+                                                </constraints>
+                                            </view>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jhT-er-jrI">
+                                                <rect key="frame" x="337" y="0.0" width="62" height="43.666666666666664"/>
+                                                <state key="normal" title="全部购买">
+                                                    <color key="titleColor" red="0.22352941176470587" green="0.47450980392156861" blue="0.82745098039215681" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                </state>
+                                            </button>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstItem="kz4-mk-4qy" firstAttribute="top" secondItem="NDO-Fq-Mgw" secondAttribute="top" id="45v-x2-Y5H"/>
+                                            <constraint firstItem="kz4-mk-4qy" firstAttribute="bottom" secondItem="NDO-Fq-Mgw" secondAttribute="bottom" id="6Yb-Jt-Vpw"/>
+                                            <constraint firstItem="KLG-2U-2I7" firstAttribute="leading" secondItem="gg6-27-z2D" secondAttribute="leading" id="FdC-Hc-ueu"/>
+                                            <constraint firstAttribute="trailing" secondItem="KLG-2U-2I7" secondAttribute="trailing" id="JBo-Ho-Ulo"/>
+                                            <constraint firstItem="jhT-er-jrI" firstAttribute="top" secondItem="gg6-27-z2D" secondAttribute="top" id="KAw-2W-mZo"/>
+                                            <constraint firstItem="kz4-mk-4qy" firstAttribute="leading" secondItem="NDO-Fq-Mgw" secondAttribute="trailing" id="LYY-vh-vPj"/>
+                                            <constraint firstAttribute="height" constant="44" id="OdH-oa-f9G"/>
+                                            <constraint firstItem="KLG-2U-2I7" firstAttribute="top" secondItem="jhT-er-jrI" secondAttribute="bottom" id="T0m-Js-8fg"/>
+                                            <constraint firstItem="6EQ-yo-Aue" firstAttribute="centerX" secondItem="gg6-27-z2D" secondAttribute="centerX" id="Ust-1u-3DD"/>
+                                            <constraint firstAttribute="bottom" secondItem="KLG-2U-2I7" secondAttribute="bottom" id="Wnd-xA-bSz"/>
+                                            <constraint firstItem="NDO-Fq-Mgw" firstAttribute="leading" secondItem="gg6-27-z2D" secondAttribute="leading" id="XDd-U8-phh"/>
+                                            <constraint firstItem="6EQ-yo-Aue" firstAttribute="centerY" secondItem="NDO-Fq-Mgw" secondAttribute="centerY" id="dYO-u4-ilA"/>
+                                            <constraint firstAttribute="trailing" secondItem="jhT-er-jrI" secondAttribute="trailing" constant="15" id="pvi-cJ-drb"/>
+                                            <constraint firstAttribute="bottom" secondItem="NDO-Fq-Mgw" secondAttribute="bottom" id="yhw-Ds-C6M"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="64" id="2pt-AX-Zd9"/>
+                                    <constraint firstItem="gg6-27-z2D" firstAttribute="trailing" secondItem="Jug-Ep-9BI" secondAttribute="trailing" id="B4V-YS-ldc"/>
+                                    <constraint firstItem="Jug-Ep-9BI" firstAttribute="bottom" secondItem="gg6-27-z2D" secondAttribute="bottom" id="Okg-A7-WUj"/>
+                                    <constraint firstItem="gg6-27-z2D" firstAttribute="leading" secondItem="Jug-Ep-9BI" secondAttribute="leading" id="euT-dj-hUz"/>
+                                </constraints>
+                                <viewLayoutGuide key="safeArea" id="Jug-Ep-9BI"/>
+                                <connections>
+                                    <outlet property="height" destination="2pt-AX-Zd9" id="P8t-Nl-weA"/>
+                                </connections>
+                            </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="RDz-yI-Cgy">
+                                <rect key="frame" x="0.0" y="64" width="414" height="672"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="EPj-sC-u2x" firstAttribute="trailing" secondItem="Zyb-DE-ndk" secondAttribute="trailing" id="Skc-wk-dga"/>
+                            <constraint firstItem="Zyb-DE-ndk" firstAttribute="trailing" secondItem="RDz-yI-Cgy" secondAttribute="trailing" id="ZYz-g2-dyq"/>
+                            <constraint firstItem="EPj-sC-u2x" firstAttribute="leading" secondItem="Zyb-DE-ndk" secondAttribute="leading" id="cYM-c1-hB5"/>
+                            <constraint firstItem="RDz-yI-Cgy" firstAttribute="leading" secondItem="Zyb-DE-ndk" secondAttribute="leading" id="gbU-Ak-o2G"/>
+                            <constraint firstItem="Zyb-DE-ndk" firstAttribute="bottom" secondItem="RDz-yI-Cgy" secondAttribute="bottom" id="ggC-kQ-W6K"/>
+                            <constraint firstItem="RDz-yI-Cgy" firstAttribute="top" secondItem="EPj-sC-u2x" secondAttribute="bottom" id="t0D-t1-mR2"/>
+                            <constraint firstItem="EPj-sC-u2x" firstAttribute="top" secondItem="Jq1-gT-idn" secondAttribute="top" id="tdj-fP-zMq"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="Zyb-DE-ndk"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="18p-ID-ant"/>
+                    <connections>
+                        <outlet property="buyBtn" destination="jhT-er-jrI" id="BsM-oQ-3h9"/>
+                        <outlet property="tableView" destination="RDz-yI-Cgy" id="UJn-qh-sQV"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="B7K-N4-Nzq" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="458" 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="menu_black_icon" width="16.666666030883789" height="14.666666984558105"/>
+        <image name="menu_white_icon" width="17" height="15.666666984558105"/>
     </resources>
 </document>

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

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

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

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

+ 26 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookContentModel.h

@@ -0,0 +1,26 @@
+//
+//  BookContentModel.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/14.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseModel.h"
+typedef enum BookContentType{
+    BookContentBook = 0,
+    BookContentVideo = 1,
+    BookContentCourse = 2,
+    BookContentMusic = 3,
+}BookContentType;
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookContentModel : BaseModel
+@property (nonatomic, copy) NSString             * title;
+@property (nonatomic, copy) NSString             * name;
+@property (nonatomic, copy) NSString             * subtitle;
+@property (nonatomic, copy) NSString             * time;
+@property (nonatomic, assign) BookContentType      type;
+@end
+
+NS_ASSUME_NONNULL_END

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

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

+ 18 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookContentTopModel.h

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

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

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

+ 22 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookHomeModel.h

@@ -0,0 +1,22 @@
+//
+//  BookHomeModel.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/13.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookHomeModel : BaseModel
+@property (nonatomic, copy) NSString   * title;
+@property (nonatomic, copy) NSString   * img;
+@property (nonatomic, copy) NSString   * subtitle;
+@property (nonatomic, copy) NSString   * time;
+@property (nonatomic, copy) NSArray    * dataArray;
+@property (nonatomic, assign) BookHomeType   type;
+@end
+
+NS_ASSUME_NONNULL_END

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

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

+ 21 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/Model/BookHomeSubModel.h

@@ -0,0 +1,21 @@
+//
+//  BookHomeSubModel.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/13.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookHomeSubModel : BaseModel
+@property (nonatomic, copy) NSString   * title;
+@property (nonatomic, copy) NSString   * img;
+@property (nonatomic, copy) NSString   * name;
+@property (nonatomic, copy) NSString   * subtitle;
+@property (nonatomic, assign) BookHomeType   type;
+@end
+
+NS_ASSUME_NONNULL_END

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

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

+ 18 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookAllLookVC.h

@@ -0,0 +1,18 @@
+//
+//  BookAllLookVC.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/13.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookAllLookVC : BaseViewController
+@property (nonatomic, copy) NSString     * titleStr;
++(BookAllLookVC *)initBookAllLookVC;
+@end
+
+NS_ASSUME_NONNULL_END

+ 134 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookAllLookVC.m

@@ -0,0 +1,134 @@
+//
+//  BookAllLookVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/13.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BookAllLookVC.h"
+#import "MyTDGroupView.h"
+#import "ChatMsgListCell.h"
+#import "ChatMsgCollectionCell.h"
+#import "TDGroupInfoListModel.h"
+#import "TDGroupInfoListCell.h"
+#import "NoteBookVC.h"
+#import "OtherNoteBookVC.h"
+#import "MailListDetailVC.h"
+#import "MyFavoriteVC.h"
+#import "MyTDGroupViewController.h"
+#import "MoveViewController.h"
+#import "OtherFavoriteVC.h"
+#import "TDGroupInfoListVC.h"
+#import "WorkFlowDetailsController.h"
+#import "MyApprovalPageDetail.h"
+#import "DownFileViewController.h"
+#import "ShareListVC.h"
+#import "TDInterLeterHomeViewController.h"
+#import "MyTDTopicViewController.h"
+#import "MailListVC.h"
+#import "WaitWorkVC.h"
+#import "MyTDTopicSearchVC.h"
+#import "SourceGroupVC.h"
+#import "ChatMsgListVC.h"
+#import "BookAllLookCell.h"
+
+@interface BookAllLookVC ()<UICollectionViewDelegate,UICollectionViewDataSource>
+@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
+@property (weak, nonatomic) IBOutlet UILabel     *TitleL;
+@property (strong, nonatomic) MyTDGroupView             *SearchView;
+@property (strong, nonatomic) NSMutableArray            *dataArray;
+@property (copy, nonatomic)   FlowAttachmentsModel      *sendModel;
+@property (assign, nonatomic) BOOL                       isReturn;
+@end
+
+@implementation BookAllLookVC
++(BookAllLookVC *)initBookAllLookVC{
+    BookAllLookVC *controller = [StoryboardManager.shared.Book instantiateViewControllerWithIdentifier:@"BookAllLookVC"];
+    return controller;
+}
+
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
+
+-(NSMutableArray *)dataArray{
+    if(!_dataArray){
+        _dataArray = [[NSMutableArray alloc] init];
+    }
+    return _dataArray;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    self.view.backgroundColor = RGB(240, 239, 244);
+    self.collectionView.delegate = self;
+    self.collectionView.dataSource = self;
+    UICollectionViewFlowLayout * layout = [[UICollectionViewFlowLayout alloc]init];
+    layout.scrollDirection = UICollectionViewScrollDirectionVertical;
+    layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0);
+    [self.collectionView setCollectionViewLayout:layout];
+    self.collectionView.backgroundColor = [UIColor whiteColor];
+//    [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.collectionView registerNib:[UINib nibWithNibName:@"BookAllLookCell" bundle:nil] forCellWithReuseIdentifier:@"BookAllLookCell"];
+    self.TitleL.text = self.titleStr;
+    [self setDataModel];
+    [self.collectionView reloadData];
+    WS(weakSelf);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [weakSelf.collectionView reloadData];
+    });
+}
+
+- (void)setDataModel
+{
+    [self.dataArray removeAllObjects];
+    for (NSInteger i = 0; i < 12; i ++) {
+        BookHomeSubModel * subModel = [[BookHomeSubModel alloc] init];
+        subModel.title = @"意识形态研究";
+        subModel.name = @"实施乡村振兴战略,要坚持党管农村工 作,坚持农业农村优先发展";
+        subModel.type = BookHomeE;
+        subModel.subtitle = @"我们看重的是教给学生多少知识。在教育者眼中,学生就是一个装知识的容器,那个时候教育的成…";
+        [self.dataArray addObject:subModel];
+    }
+}
+
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section
+{
+    return 0.f;
+}
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section
+{
+    return 0.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(SCREEN_WIDTH, 120);
+}
+
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    BookAllLookCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"BookAllLookCell" forIndexPath:indexPath];
+    BookHomeSubModel * model = [self.dataArray objectAtIndex:indexPath.item];
+    [cell setDataWithModel:model];
+    return cell;
+}
+@end

+ 18 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookContentNavVC.h

@@ -0,0 +1,18 @@
+//
+//  BookContentNavVC.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/14.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookContentNavVC : BaseViewController
+@property (nonatomic, copy) NSString     * titleStr;
++(BookContentNavVC *)initBookContentNavVC;
+@end
+
+NS_ASSUME_NONNULL_END

+ 419 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookContentNavVC.m

@@ -0,0 +1,419 @@
+//
+//  BookContentNavVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/14.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BookContentNavVC.h"
+#import "MyTDGroupView.h"
+#import "ChatMsgListCell.h"
+#import "ChatMsgCollectionCell.h"
+#import "TDGroupInfoListModel.h"
+#import "TDGroupInfoListCell.h"
+#import "NoteBookVC.h"
+#import "OtherNoteBookVC.h"
+#import "MailListDetailVC.h"
+#import "MyFavoriteVC.h"
+#import "MyTDGroupViewController.h"
+#import "MoveViewController.h"
+#import "OtherFavoriteVC.h"
+#import "TDGroupInfoListVC.h"
+#import "WorkFlowDetailsController.h"
+#import "MyApprovalPageDetail.h"
+#import "DownFileViewController.h"
+#import "ShareListVC.h"
+#import "TDInterLeterHomeViewController.h"
+#import "MyTDTopicViewController.h"
+#import "MailListVC.h"
+#import "WaitWorkVC.h"
+#import "MyTDTopicSearchVC.h"
+#import "SourceGroupVC.h"
+#import "ChatMsgListVC.h"
+#import "BookContentCell.h"
+#import "BookContentLeftCell.h"
+#import "BookContentLeftModel.h"
+#import "BookContentTopModel.h"
+#import "BookContentModel.h"
+#import "BookContentTopCell.h"
+
+@interface BookContentNavVC ()<UITableViewDelegate,UITableViewDataSource,UICollectionViewDelegate,UICollectionViewDataSource>
+@property (weak, nonatomic) IBOutlet UITableView *leftTableV;
+@property (weak, nonatomic) IBOutlet UITableView *middleTableV;
+@property (weak, nonatomic) IBOutlet UITableView *rightTableV;
+@property (weak, nonatomic) IBOutlet UICollectionView *collectionView;
+@property (weak, nonatomic) IBOutlet UIButton *showBtn;
+@property (weak, nonatomic) IBOutlet UIView      *HeadView;
+@property (weak, nonatomic) IBOutlet UILabel     *TitleL;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *leftW;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *middleW;
+@property (strong, nonatomic) MyTDGroupView             *SearchView;
+@property (strong, nonatomic) NSMutableArray            *dataArray;
+@property (assign, nonatomic) NSInteger                  leftRow;
+@property (assign, nonatomic) NSInteger                  middleRow;
+@property (assign, nonatomic) BOOL                  leftHidden;
+@property (assign, nonatomic) BOOL                  middleHidden;
+@end
+
+@implementation BookContentNavVC
++(BookContentNavVC *)initBookContentNavVC{
+    BookContentNavVC *controller = [StoryboardManager.shared.Book instantiateViewControllerWithIdentifier:@"BookContentNavVC"];
+    return controller;
+}
+
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
+
+-(NSMutableArray *)dataArray{
+    if(!_dataArray){
+        _dataArray = [[NSMutableArray alloc] init];
+    }
+    return _dataArray;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    self.leftTableV.delegate = self;
+    self.leftTableV.dataSource = self;
+    self.middleTableV.delegate = self;
+    self.middleTableV.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.middleHidden = YES;
+    self.TitleL.text = self.titleStr;
+    self.collectionView.delegate = self;
+    self.collectionView.dataSource = self;
+    UICollectionViewFlowLayout * layout = [[UICollectionViewFlowLayout alloc]init];
+    layout.scrollDirection = UICollectionViewScrollDirectionHorizontal;
+    layout.sectionInset = UIEdgeInsetsMake(0, 0, 0, 0);
+    [self.collectionView setCollectionViewLayout:layout];
+    [self.collectionView registerNib:[UINib nibWithNibName:@"BookContentTopCell" bundle:nil] forCellWithReuseIdentifier:@"BookContentTopCell"];
+    [self setDataModel];
+}
+
+- (void)setDataModel
+{
+    [self.dataArray removeAllObjects];
+    NSArray * array = @[@"大众",@"教育",@"文化传媒",@"大众",@"教育",@"文化传媒",@"大众",@"教育",@"文化传媒",@"大众",@"教育",@"文化传媒"];
+    NSArray * subArray = @[@"时尚生活",@"财经商业",@"文化传媒",@"文学艺术"];
+    NSArray * topArray = @[@"全部",@"最热",@"最新",@"好评",@"全部",@"最热",@"最新",@"好评",@"全部",@"最热",@"最新",@"好评"];
+    for (NSInteger i= 0; i < array.count; i ++) {
+        BookContentLeftModel * leftModel = [[BookContentLeftModel alloc] init];
+        leftModel.title = array[i];
+        leftModel.isSelect = i == 0 ? YES : NO;
+        NSMutableArray * subData = [NSMutableArray array];
+        for (NSInteger j = 0; j < subArray.count; j ++) {
+            BookContentLeftModel * subModel = [[BookContentLeftModel alloc] init];
+            subModel.title = subArray[j];
+            subModel.isSelect = j == 0 ? YES : NO;
+            NSMutableArray * sData = [NSMutableArray array];
+            for (NSInteger s = 0; s < topArray.count; s ++) {
+                BookContentTopModel * smodel = [[BookContentTopModel alloc] init];
+                smodel.title = topArray[s];
+                smodel.isSelect = s == 0 ? YES : NO;
+                [sData addObject:smodel];
+            }
+            subModel.topArray = [NSMutableArray arrayWithArray:sData];
+            
+            NSMutableArray * cData = [NSMutableArray array];
+            for (NSInteger k = 0; k < 4; k ++) {
+                BookContentModel * model = [[BookContentModel alloc] init];
+                model.title = @"翻转教学11法";
+                model.name = @"叶龙";
+                model.subtitle = @"畅销书从优秀教师的改善学生课堂表及";
+                model.time = @"";
+                switch (k) {
+                    case 0:
+                        model.type = BookContentBook;
+                        break;
+                    case 1:
+                        model.type = BookContentVideo;
+                        break;
+                    case 2:
+                        model.type = BookContentCourse;
+                        break;
+                    default:
+                        model.type = BookContentMusic;
+                        break;
+                }
+                [cData addObject:model];
+            }
+            subModel.dataArray = [NSMutableArray arrayWithArray:cData];
+            [subData addObject:subModel];
+        }
+        leftModel.dataArray = [NSMutableArray arrayWithArray:subData];
+        [self.dataArray addObject:leftModel];
+    }
+    [self reloadData];
+}
+#pragma mark - UITableViewDelegate
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    if (tableView == self.leftTableV) {
+        return self.dataArray.count;
+    }else if(tableView == self.middleTableV){
+        BookContentLeftModel * model = [self.dataArray objectAtIndex:self.leftRow];
+        return model.dataArray.count;
+    }else{
+        BookContentLeftModel * model = [self.dataArray objectAtIndex:self.leftRow];
+        BookContentLeftModel * subModel = [model.dataArray objectAtIndex:self.middleRow];
+        return subModel.dataArray.count;
+    }
+}
+
+
+- (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;
+        }
+    }
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    if (tableView == self.leftTableV) {
+        return 47.f;
+    }else if(tableView == self.middleTableV){
+        return 47.f;
+    }else{
+        return 0.01f;
+    }
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
+{
+    return 0.01f;
+}
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    UIView * headerView = [[UIView alloc] init];
+    if (tableView == self.leftTableV) {
+        [headerView setFrame:CGRectMake(0, 0, SCREEN_WIDTH, 47)];
+        UILabel * label = [UILabel new];
+        [headerView addSubview:label];
+        label.font = [UIFont systemFontOfSize:16];
+        label.textColor = UIColorHex(0x0A0A0A);
+        [label mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.center.mas_equalTo(headerView);
+        }];
+        label.text = @"推荐";
+        headerView.backgroundColor = UIColorHex(0xEBEBEB);
+    }else if(tableView == self.middleTableV){
+        [headerView setFrame:CGRectMake(0, 0, SCREEN_WIDTH, 47)];
+        UILabel * label = [UILabel new];
+        [headerView addSubview:label];
+        label.font = [UIFont systemFontOfSize:16];
+        label.textColor = UIColorHex(0x0A0A0A);
+        [label mas_makeConstraints:^(MASConstraintMaker *make) {
+            make.center.mas_equalTo(headerView);
+        }];
+        NSMutableAttributedString * attStr = [[NSMutableAttributedString alloc] init];
+        NSTextAttachment *attach = [[NSTextAttachment alloc] init];
+        attach.image = [UIImage imageNamed:@"Book_shuangjian_left"];
+        attach.bounds = CGRectMake(0, 0, 11, 11);
+        NSAttributedString *collegeStr = [NSAttributedString attributedStringWithAttachment:attach];
+        [attStr appendAttributedString:collegeStr];
+        NSAttributedString *placeStr = [[NSAttributedString alloc] initWithString:@" 大众" attributes:@{NSFontAttributeName:[UIFont systemFontOfSize:16],NSForegroundColorAttributeName:UIColorHex(0x999999)}];
+        [attStr appendAttributedString:placeStr];
+        label.attributedText = attStr;
+        headerView.backgroundColor = UIColorHex(0xFFFFFF);
+        WS(weakSelf);
+        UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+            weakSelf.leftHidden = NO;
+            [weakSelf reloadData];
+        }];
+        [headerView addGestureRecognizer:tap];
+    }else{}
+    return headerView;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    if (tableView == self.leftTableV) {
+        BookContentLeftModel * model = [self.dataArray objectAtIndex:indexPath.row];
+        BookContentLeftCell * cell = [BookContentLeftCell configCell:tableView indexPath:indexPath];
+        [cell setDataWithModel:model middleHidden:self.middleHidden];
+        return cell;
+    }else if(tableView == self.middleTableV){
+        BookContentLeftCell * cell = [BookContentLeftCell configCell:tableView indexPath:indexPath];
+        BookContentLeftModel * model = [self.dataArray objectAtIndex:self.leftRow];
+        BookContentLeftModel * subModel = [model.dataArray objectAtIndex:indexPath.row];
+        [cell setDataWithsubModel:subModel leftHidden:self.leftHidden];
+        return cell;
+    }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:
+            {
+                BookContentCell * cell = [BookContentCell configCell0:tableView indexPath:indexPath];
+                [cell setDataWithModel:cModel];
+                return cell;
+            }
+                break;
+            case BookContentVideo:
+            {
+                BookContentCell * cell = [BookContentCell configCell1:tableView indexPath:indexPath];
+                [cell setDataWithModel:cModel];
+                return cell;
+            }
+                break;
+            case BookContentCourse:
+            {
+                BookContentCell * cell = [BookContentCell configCell1:tableView indexPath:indexPath];
+                cell.playImgV.hidden = YES;
+                [cell setDataWithModel:cModel];
+                return cell;
+            }
+                break;
+            default:
+            {
+                BookContentCell * cell = [BookContentCell configCell2:tableView indexPath:indexPath];
+                [cell setDataWithModel:cModel];
+                return cell;
+            }
+                break;
+        }
+    }
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    if (tableView == self.leftTableV) {
+        self.leftRow = indexPath.row;
+        self.middleHidden = NO;
+        self.leftHidden = NO;
+        BookContentLeftModel * smodel = [self.dataArray objectAtIndex:self.leftRow];
+        for (BookContentLeftModel * model in self.dataArray) {
+            model.isSelect = NO;
+        }
+        smodel.isSelect = YES;
+        [self reloadData];
+    }else if(tableView == self.middleTableV){
+        self.middleRow = indexPath.row;
+        BookContentLeftModel * model = [self.dataArray objectAtIndex:self.leftRow];
+        BookContentLeftModel * subModel = [model.dataArray objectAtIndex:self.middleRow];
+        for (BookContentLeftModel * ssmodel in model.dataArray) {
+            ssmodel.isSelect = NO;
+        }
+        subModel.isSelect = YES;
+        self.leftHidden = YES;
+        self.middleHidden = NO;
+        [self reloadData];
+    }else{
+        NSLog(@"safasdf");
+    }
+}
+- (void)reloadData
+{
+    [self.leftTableV reloadData];
+    if (self.middleHidden) {
+        self.middleW.constant = 0.f;
+    }else{
+        self.middleW.constant = 80.f;
+    }
+    if (self.leftHidden) {
+        self.leftW.constant = 0.f;
+    }else{
+        self.leftW.constant = 80.f;
+    }
+    [self.middleTableV reloadData];
+    [self.collectionView reloadData];
+    [self.rightTableV beginUpdates];
+    [self.rightTableV reloadData];
+    WS(weakSelf);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [weakSelf.rightTableV endUpdates];
+    });
+}
+#pragma mark - UICollectionViewDelegate
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumLineSpacingForSectionAtIndex:(NSInteger)section
+{
+    return 0.f;
+}
+- (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout minimumInteritemSpacingForSectionAtIndex:(NSInteger)section
+{
+    return 0.f;
+}
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    BookContentLeftModel * model = [self.dataArray objectAtIndex:self.leftRow];
+    BookContentLeftModel * subModel = [model.dataArray objectAtIndex:self.middleRow];
+    return subModel.topArray.count;
+}
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
+{
+    return 1;
+}
+-(CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    BookContentLeftModel * model = [self.dataArray objectAtIndex:self.leftRow];
+    BookContentLeftModel * subModel = [model.dataArray objectAtIndex:self.middleRow];
+    BookContentTopModel * tmodel = [subModel.topArray objectAtIndex:indexPath.item];
+    CGSize constrainedSize = CGSizeMake(SCREEN_WIDTH, 47);
+    NSDictionary * attribute = @{NSFontAttributeName:[UIFont systemFontOfSize:14]};
+    CGSize size = [tmodel.title boundingRectWithSize:constrainedSize options:NSStringDrawingTruncatesLastVisibleLine | NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:attribute context:nil].size;
+    return CGSizeMake(size.width + 20, 47);
+}
+
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    BookContentLeftModel * model = [self.dataArray objectAtIndex:self.leftRow];
+    BookContentLeftModel * subModel = [model.dataArray objectAtIndex:self.middleRow];
+    BookContentTopModel * tmodel = [subModel.topArray objectAtIndex:indexPath.item];
+    BookContentTopCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"BookContentTopCell" forIndexPath:indexPath];
+    [cell setDataWithModel:tmodel];
+    return cell;
+}
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    [collectionView deselectItemAtIndexPath:indexPath animated:YES];
+    BookContentLeftModel * model = [self.dataArray objectAtIndex:self.leftRow];
+    BookContentLeftModel * subModel = [model.dataArray objectAtIndex:self.middleRow];
+    BookContentTopModel * tmodel = [subModel.topArray objectAtIndex:indexPath.item];
+    for (BookContentTopModel * ssmodel in subModel.topArray) {
+        ssmodel.isSelect = NO;
+    }
+    tmodel.isSelect = YES;
+    [self.collectionView reloadData];
+    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

+ 18 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookMingVC.h

@@ -0,0 +1,18 @@
+//
+//  BookMingVC.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/13.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface BookMingVC : BaseViewController
+@property (nonatomic, copy) NSString     * titleStr;
++(BookMingVC *)initBookMingVC;
+@end
+
+NS_ASSUME_NONNULL_END

+ 215 - 0
smartRhino/Project/VCModel/Home/VC/BookStore/VC/BookMingVC.m

@@ -0,0 +1,215 @@
+//
+//  BookMingVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/13.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BookMingVC.h"
+#import "MyTDGroupView.h"
+#import "ChatMsgListCell.h"
+#import "ChatMsgCollectionCell.h"
+#import "TDGroupInfoListModel.h"
+#import "TDGroupInfoListCell.h"
+#import "NoteBookVC.h"
+#import "OtherNoteBookVC.h"
+#import "MailListDetailVC.h"
+#import "MyFavoriteVC.h"
+#import "MyTDGroupViewController.h"
+#import "MoveViewController.h"
+#import "OtherFavoriteVC.h"
+#import "TDGroupInfoListVC.h"
+#import "WorkFlowDetailsController.h"
+#import "MyApprovalPageDetail.h"
+#import "DownFileViewController.h"
+#import "ShareListVC.h"
+#import "TDInterLeterHomeViewController.h"
+#import "MyTDTopicViewController.h"
+#import "MailListVC.h"
+#import "WaitWorkVC.h"
+#import "MyTDTopicSearchVC.h"
+#import "SourceGroupVC.h"
+#import "ChatMsgListVC.h"
+#import "BookHomeCell.h"
+#import "BookHomeSubModel.h"
+#import "BookAllLookVC.h"
+
+@interface BookMingVC ()<UITableViewDelegate,UITableViewDataSource>
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIView      *HeadView;
+@property (weak, nonatomic) IBOutlet UILabel     *TitleL;
+@property (strong, nonatomic) MyTDGroupView             *SearchView;
+@property (strong, nonatomic) NSMutableArray            *dataArray;
+@property (copy, nonatomic)   FlowAttachmentsModel      *sendModel;
+@property (assign, nonatomic) BOOL                       isReturn;
+@end
+
+@implementation BookMingVC
++(BookMingVC *)initBookMingVC{
+    BookMingVC *controller = [StoryboardManager.shared.Book instantiateViewControllerWithIdentifier:@"BookMingVC"];
+    return controller;
+}
+
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
+
+-(NSMutableArray *)dataArray{
+    if(!_dataArray){
+        _dataArray = [[NSMutableArray alloc] init];
+    }
+    return _dataArray;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    self.view.backgroundColor = RGB(240, 239, 244);
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    self.tableView.backgroundColor = [UIColor whiteColor];
+    [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.TitleL.text = self.titleStr;
+    [self setDataModel];
+    [self.tableView beginUpdates];
+    [self.tableView reloadData];
+    WS(weakSelf);
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [weakSelf.tableView endUpdates];
+    });
+}
+
+- (void)setDataModel
+{
+    [self.dataArray removeAllObjects];
+    BookHomeModel * model = [[BookHomeModel alloc] init];
+    model.title = @"教育";
+    NSMutableArray * array = [NSMutableArray array];
+    for (NSInteger i = 0; i < 12; i ++) {
+        BookHomeSubModel * subModel = [[BookHomeSubModel alloc] init];
+        subModel.title = @"意识形态研究";
+        subModel.name = @"实施乡村振兴战略,要坚持党管农村工 作,坚持农业农村优先发展";
+        subModel.type = BookHomeD;
+        subModel.subtitle = @"我们看重的是教给学生多少知识。在教育者眼中,学生就是一个装知识的容器,那个时候教育的成…";
+        [array addObject:subModel];
+    }
+    model.type = BookHomeD;
+    model.dataArray = array;
+    [self.dataArray addObject:model];
+    
+    BookHomeModel * bmodel = [[BookHomeModel alloc] init];
+    bmodel.title = @"社会";
+    NSMutableArray * barray = [NSMutableArray array];
+    for (NSInteger i = 0; i < 9; i ++) {
+        BookHomeSubModel * subModel = [[BookHomeSubModel alloc] init];
+        subModel.title = @"新零售时代";
+        subModel.name = @"在教育者眼中,学生就是一个装知识的容器,那个时候教育的";
+        subModel.type = BookHomeD;
+        subModel.subtitle = @"生多少知识。在教育者眼中,学生就是一个装知识的容器,那个时候教育的";
+        [barray addObject:subModel];
+    }
+    bmodel.dataArray = barray;
+    bmodel.type = BookHomeD;
+    [self.dataArray addObject:bmodel];
+    
+    BookHomeModel * cmodel = [[BookHomeModel alloc] init];
+    cmodel.title = @"科技";
+    NSMutableArray * carray = [NSMutableArray array];
+    for (NSInteger i = 0; i < 6; i ++) {
+        BookHomeSubModel * subModel = [[BookHomeSubModel alloc] init];
+        subModel.title = @"特色小镇建设";
+        subModel.name = @"中美之间的经贸交流、对话空前频密。 从知识产权保护、贸易逆差以及人民";
+        subModel.type = BookHomeD;
+        subModel.subtitle = @"生多少知识。在教育者眼中,学生就是一个装知识的容器,那个时候教育的";
+        [carray addObject:subModel];
+    }
+    cmodel.dataArray = carray;
+    cmodel.type = BookHomeD;
+    [self.dataArray addObject:cmodel];
+
+}
+#pragma mark - UITableViewDelegate
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+    return self.dataArray.count;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    return 1;
+}
+
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    return 101 * 3;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
+{
+    return 65.f;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
+{
+    return 70.f;
+}
+- (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
+{
+    BookHomeModel * model = [self.dataArray objectAtIndex:section];
+    UIView * headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 65)];
+    UILabel *label1 = [[UILabel alloc] init];
+    [headerView addSubview:label1];
+    [label1 mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_offset(20);
+        make.centerY.mas_equalTo(headerView);
+    }];
+    label1.text = model.title;
+    label1.font = [UIFont boldSystemFontOfSize:22];
+    label1.textColor = UIColorHex(0x2D3542);
+    [headerView setBackgroundColor:section % 2 == 0 ? UIColorHex(0xFFFFFF) : UIColorHex(0xF7F7F9)];
+    return headerView;
+}
+- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section
+{
+    BookHomeModel * model = [self.dataArray objectAtIndex:section];
+    UIView * footerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 70)];
+    [footerView removeAllSubviews];
+    UIButton *btn = [[UIButton alloc] init];
+    [footerView addSubview:btn];
+    [btn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.mas_offset(UIEdgeInsetsMake(0, 20, 26, 20));
+    }];
+    [btn setTitle:@"查看全部" forState:UIControlStateNormal];
+    btn.titleLabel.font = [UIFont systemFontOfSize:14];
+    btn.backgroundColor = [UIColor whiteColor];
+    [btn setTitleColor:UIColorHex(0x1B88EE) forState:UIControlStateNormal];
+    btn.layer.cornerRadius = 10.f;
+    btn.layer.borderColor = UIColorHex(0xE0E0E0).CGColor;
+    btn.layer.borderWidth = 0.5f;
+    btn.layer.masksToBounds = YES;
+    WS(weakSelf);
+    [btn setAction:^{
+        BookAllLookVC * vc = [BookAllLookVC initBookAllLookVC];
+        vc.titleStr = model.title;
+        [weakSelf.navigationController pushViewController:vc animated:YES];
+    }];
+    [footerView setBackgroundColor:section % 2 == 0 ? UIColorHex(0xFFFFFF) : UIColorHex(0xF7F7F9)];
+    return footerView;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    BookHomeCell * cell = [BookHomeCell configCell1:tableView indexPath:indexPath];
+    BookHomeModel * model = [self.dataArray objectAtIndex:indexPath.section];
+    [cell setDataWith:model andType:BookHomeD andItem:indexPath.section];
+    return cell;
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+}
+
+@end

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

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

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

@@ -0,0 +1,42 @@
+//
+//  BookPlayListVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/16.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BookPlayListVC.h"
+#import "HomeWeiCousreCell.h"
+
+@interface BookPlayListVC ()<UITableViewDelegate,UITableViewDataSource>
+@property (weak, nonatomic) IBOutlet UIButton *buyBtn;
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+
+@end
+
+@implementation BookPlayListVC
++(BookPlayListVC *)initBookPlayListVC{
+    BookPlayListVC *controller = [StoryboardManager.shared.Book instantiateViewControllerWithIdentifier:@"BookPlayListVC"];
+    return controller;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+}
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return 10;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return UITableViewAutomaticDimension;
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    HomeWeiCousreCell * cell = [HomeWeiCousreCell configCell:tableView indexPath:indexPath];
+    return cell;
+}
+@end

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


Some files were not shown because too many files changed in this diff