HF_Q 5 年之前
父節點
當前提交
0b4feee169
共有 100 個文件被更改,包括 3186 次插入96 次删除
  1. 136 0
      smartRhino.xcodeproj/project.pbxproj
  2. 二進制
      smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/UserInterfaceState.xcuserstate
  3. 10 34
      smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  4. 二進制
      smartRhino/Assets.xcassets/ChatMsg/ChatMsg_new_topic.imageset/ChatMsg_new_topic@2x.png
  5. 二進制
      smartRhino/Assets.xcassets/ChatMsg/ChatMsg_new_topic.imageset/ChatMsg_new_topic@3x.png
  6. 22 0
      smartRhino/Assets.xcassets/ChatMsg/ChatMsg_new_topic.imageset/Contents.json
  7. 22 0
      smartRhino/Assets.xcassets/ChatMsg/Source_Group_Icon.imageset/Contents.json
  8. 二進制
      smartRhino/Assets.xcassets/ChatMsg/Source_Group_Icon.imageset/Source_Group_Icon@2x.png
  9. 二進制
      smartRhino/Assets.xcassets/ChatMsg/Source_Group_Icon.imageset/Source_Group_Icon@3x.png
  10. 22 0
      smartRhino/Assets.xcassets/ChatMsg/Source_Group_tree.imageset/Contents.json
  11. 二進制
      smartRhino/Assets.xcassets/ChatMsg/Source_Group_tree.imageset/Source_Group_tree@2x.png
  12. 二進制
      smartRhino/Assets.xcassets/ChatMsg/Source_Group_tree.imageset/Source_Group_tree@3x.png
  13. 22 0
      smartRhino/Assets.xcassets/ChatMsg/Source_topic.imageset/Contents.json
  14. 二進制
      smartRhino/Assets.xcassets/ChatMsg/Source_topic.imageset/Source_topic@2x.png
  15. 二進制
      smartRhino/Assets.xcassets/ChatMsg/Source_topic.imageset/Source_topic@3x.png
  16. 22 0
      smartRhino/Assets.xcassets/ChatMsg/Source_user.imageset/Contents.json
  17. 二進制
      smartRhino/Assets.xcassets/ChatMsg/Source_user.imageset/Source_user@2x.png
  18. 二進制
      smartRhino/Assets.xcassets/ChatMsg/Source_user.imageset/Source_user@3x.png
  19. 0 1
      smartRhino/Assets.xcassets/ChatMsg/chatmsg_rightArrow_icon.imageset/Contents.json
  20. 二進制
      smartRhino/Assets.xcassets/ChatMsg/chatmsg_rightArrow_icon.imageset/chatmsg_rightArrow_icon.png
  21. 二進制
      smartRhino/Assets.xcassets/ChatMsg/chatmsg_rightArrow_icon.imageset/chatmsg_rightArrow_icon@2x.png
  22. 二進制
      smartRhino/Assets.xcassets/ChatMsg/chatmsg_rightArrow_icon.imageset/chatmsg_rightArrow_icon@3x.png
  23. 22 0
      smartRhino/Assets.xcassets/ChatMsg/chatmsg_sixin_icon.imageset/Contents.json
  24. 二進制
      smartRhino/Assets.xcassets/ChatMsg/chatmsg_sixin_icon.imageset/chatmsg_sixin_icon@2x.png
  25. 二進制
      smartRhino/Assets.xcassets/ChatMsg/chatmsg_sixin_icon.imageset/chatmsg_sixin_icon@3x.png
  26. 22 0
      smartRhino/Assets.xcassets/ChatMsg/source_blue.imageset/Contents.json
  27. 二進制
      smartRhino/Assets.xcassets/ChatMsg/source_blue.imageset/source_blue@2x.png
  28. 二進制
      smartRhino/Assets.xcassets/ChatMsg/source_blue.imageset/source_blue@3x.png
  29. 二進制
      smartRhino/Assets.xcassets/Common/Common_note_icon.imageset/Common_note_icon@2x.png
  30. 二進制
      smartRhino/Assets.xcassets/Common/Common_note_icon.imageset/Common_note_icon@3x.png
  31. 22 0
      smartRhino/Assets.xcassets/Common/Common_note_icon.imageset/Contents.json
  32. 二進制
      smartRhino/Assets.xcassets/Common/Common_set.imageset/Common_set@2x.png
  33. 二進制
      smartRhino/Assets.xcassets/Common/Common_set.imageset/Common_set@3x.png
  34. 22 0
      smartRhino/Assets.xcassets/Common/Common_set.imageset/Contents.json
  35. 22 0
      smartRhino/Assets.xcassets/我的/mine_account.imageset/Contents.json
  36. 二進制
      smartRhino/Assets.xcassets/我的/mine_account.imageset/mine_account@2x.png
  37. 二進制
      smartRhino/Assets.xcassets/我的/mine_account.imageset/mine_account@3x.png
  38. 22 0
      smartRhino/Assets.xcassets/我的/mine_agree_icon.imageset/Contents.json
  39. 二進制
      smartRhino/Assets.xcassets/我的/mine_agree_icon.imageset/mine_agree_icon@2x.png
  40. 二進制
      smartRhino/Assets.xcassets/我的/mine_agree_icon.imageset/mine_agree_icon@3x.png
  41. 22 0
      smartRhino/Assets.xcassets/我的/mine_book_icon.imageset/Contents.json
  42. 二進制
      smartRhino/Assets.xcassets/我的/mine_book_icon.imageset/mine_book_icon@2x.png
  43. 二進制
      smartRhino/Assets.xcassets/我的/mine_book_icon.imageset/mine_book_icon@3x.png
  44. 22 0
      smartRhino/Assets.xcassets/我的/mine_buy_btn.imageset/Contents.json
  45. 二進制
      smartRhino/Assets.xcassets/我的/mine_buy_btn.imageset/mine_buy_btn@2x.png
  46. 二進制
      smartRhino/Assets.xcassets/我的/mine_buy_btn.imageset/mine_buy_btn@3x.png
  47. 22 0
      smartRhino/Assets.xcassets/我的/mine_cardBg_icon.imageset/Contents.json
  48. 二進制
      smartRhino/Assets.xcassets/我的/mine_cardBg_icon.imageset/mine_cardBg_icon@2x.png
  49. 二進制
      smartRhino/Assets.xcassets/我的/mine_cardBg_icon.imageset/mine_cardBg_icon@3x.png
  50. 22 0
      smartRhino/Assets.xcassets/我的/mine_card_icon.imageset/Contents.json
  51. 二進制
      smartRhino/Assets.xcassets/我的/mine_card_icon.imageset/mine_card_icon@2x.png
  52. 二進制
      smartRhino/Assets.xcassets/我的/mine_card_icon.imageset/mine_card_icon@3x.png
  53. 22 0
      smartRhino/Assets.xcassets/我的/mine_frist_month.imageset/Contents.json
  54. 二進制
      smartRhino/Assets.xcassets/我的/mine_frist_month.imageset/mine_frist_month@2x.png
  55. 二進制
      smartRhino/Assets.xcassets/我的/mine_frist_month.imageset/mine_frist_month@3x.png
  56. 22 0
      smartRhino/Assets.xcassets/我的/mine_man_icon.imageset/Contents.json
  57. 二進制
      smartRhino/Assets.xcassets/我的/mine_man_icon.imageset/mine_man_icon@2x.png
  58. 二進制
      smartRhino/Assets.xcassets/我的/mine_man_icon.imageset/mine_man_icon@3x.png
  59. 22 0
      smartRhino/Assets.xcassets/我的/mine_net_icon.imageset/Contents.json
  60. 二進制
      smartRhino/Assets.xcassets/我的/mine_net_icon.imageset/mine_net_icon@2x.png
  61. 二進制
      smartRhino/Assets.xcassets/我的/mine_net_icon.imageset/mine_net_icon@3x.png
  62. 22 0
      smartRhino/Assets.xcassets/我的/mine_ting_icon.imageset/Contents.json
  63. 二進制
      smartRhino/Assets.xcassets/我的/mine_ting_icon.imageset/mine_ting_icon@2x.png
  64. 二進制
      smartRhino/Assets.xcassets/我的/mine_ting_icon.imageset/mine_ting_icon@3x.png
  65. 22 0
      smartRhino/Assets.xcassets/我的/mine_wuxianka.imageset/Contents.json
  66. 二進制
      smartRhino/Assets.xcassets/我的/mine_wuxianka.imageset/mine_wuxianka@2x.png
  67. 二進制
      smartRhino/Assets.xcassets/我的/mine_wuxianka.imageset/mine_wuxianka@3x.png
  68. 1 1
      smartRhino/FwzAppConfig.h
  69. 3 1
      smartRhino/Project/Base/SubClass/TabBarController/TabBarController.m
  70. 1 0
      smartRhino/Project/Other/Util/StoryboardManager/StoryboardManager.h
  71. 9 0
      smartRhino/Project/Other/Util/StoryboardManager/StoryboardManager.m
  72. 3 2
      smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/View/MyTDGroupView.m
  73. 2 0
      smartRhino/Project/VCModel/ChatMessage/Model/MoreAppModel.h
  74. 16 12
      smartRhino/Project/VCModel/ChatMessage/View/ChatMsgCollectionCell.xib
  75. 2 22
      smartRhino/Project/VCModel/ChatMessage/View/ChatMsgListCell.xib
  76. 17 0
      smartRhino/Project/VCModel/My_Center/Controller/MyAccountVC.h
  77. 44 0
      smartRhino/Project/VCModel/My_Center/Controller/MyAccountVC.m
  78. 17 0
      smartRhino/Project/VCModel/My_Center/Controller/MyCardVC.h
  79. 107 0
      smartRhino/Project/VCModel/My_Center/Controller/MyCardVC.m
  80. 8 16
      smartRhino/Project/VCModel/My_Center/Controller/My_CenterVC.m
  81. 2 2
      smartRhino/Project/VCModel/My_Center/Controller/NoteBook/Controller/NoteBookVC.m
  82. 1 1
      smartRhino/Project/VCModel/My_Center/Controller/NoteBook/NoteBook.storyboard
  83. 502 1
      smartRhino/Project/VCModel/My_Center/My_Center.storyboard
  84. 21 0
      smartRhino/Project/VCModel/My_Center/View/MyAccountCell.h
  85. 35 0
      smartRhino/Project/VCModel/My_Center/View/MyAccountCell.m
  86. 76 0
      smartRhino/Project/VCModel/My_Center/View/MyAccountCell.xib
  87. 1 1
      smartRhino/Project/VCModel/My_Center/View/My_CenterCell.m
  88. 2 2
      smartRhino/Project/VCModel/My_Center/View/My_CenterCell.xib
  89. 27 0
      smartRhino/Project/VCModel/My_Center/View/PayAlert.h
  90. 54 0
      smartRhino/Project/VCModel/My_Center/View/PayAlert.m
  91. 360 0
      smartRhino/Project/VCModel/My_Center/View/PayAlert.xib
  92. 24 0
      smartRhino/Project/VCModel/My_Center/View/PayAlertCell.h
  93. 35 0
      smartRhino/Project/VCModel/My_Center/View/PayAlertCell.m
  94. 82 0
      smartRhino/Project/VCModel/My_Center/View/PayAlertCell.xib
  95. 17 0
      smartRhino/Project/VCModel/Source/Controller/GroupSquareVC.h
  96. 151 0
      smartRhino/Project/VCModel/Source/Controller/GroupSquareVC.m
  97. 17 0
      smartRhino/Project/VCModel/Source/Controller/SourceGroupVC.h
  98. 946 0
      smartRhino/Project/VCModel/Source/Controller/SourceGroupVC.m
  99. 17 0
      smartRhino/Project/VCModel/Source/Controller/SourceHomeVC.h
  100. 0 0
      smartRhino/Project/VCModel/Source/Controller/SourceHomeVC.m

+ 136 - 0
smartRhino.xcodeproj/project.pbxproj

@@ -806,6 +806,12 @@
 		EB77B293239F9A4F0050A3C0 /* ChatNewRowVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB77B292239F9A4F0050A3C0 /* ChatNewRowVC.m */; };
 		EB77B297239FCAF90050A3C0 /* ChatNewRowCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB77B295239FCAF90050A3C0 /* ChatNewRowCell.m */; };
 		EB77B298239FCAF90050A3C0 /* ChatNewRowCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB77B296239FCAF90050A3C0 /* ChatNewRowCell.xib */; };
+		EB7DD22C2462620100C6048F /* SourceHomeVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7DD22B2462620100C6048F /* SourceHomeVC.m */; };
+		EB7DD23524629A1B00C6048F /* Source.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = EB7DD23424629A1B00C6048F /* Source.storyboard */; };
+		EB7DD2382462AB5B00C6048F /* GroupSquareVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7DD2372462AB5B00C6048F /* GroupSquareVC.m */; };
+		EB7DD23C2462B62600C6048F /* GroupSquareCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7DD23A2462B62600C6048F /* GroupSquareCell.m */; };
+		EB7DD23D2462B62600C6048F /* GroupSquareCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB7DD23B2462B62600C6048F /* GroupSquareCell.xib */; };
+		EB7DD2402462BC8F00C6048F /* GroupSquareModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EB7DD23F2462BC8F00C6048F /* GroupSquareModel.m */; };
 		EB8143BD2440502B00C439A9 /* HomeListWorkCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB8143BB2440502B00C439A9 /* HomeListWorkCell.m */; };
 		EB8143BE2440502B00C439A9 /* HomeListWorkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EB8143BC2440502B00C439A9 /* HomeListWorkCell.xib */; };
 		EB8143C224407A3E00C439A9 /* AddChanelNoDataCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EB8143C024407A3E00C439A9 /* AddChanelNoDataCell.m */; };
@@ -1059,6 +1065,7 @@
 		EB98E7B524061CD00087C4E2 /* NoteBookSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB98E7B424061CD00087C4E2 /* NoteBookSearchVC.m */; };
 		EB9BBE4D23D1A5D400436A0E /* MailListMoveVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB9BBE4C23D1A5D400436A0E /* MailListMoveVC.m */; };
 		EB9BBE5023D1BF1A00436A0E /* MailListSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EB9BBE4F23D1BF1A00436A0E /* MailListSearchVC.m */; };
+		EBAA1F242463A4F200272F13 /* SourceGroupVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBAA1F232463A4F200272F13 /* SourceGroupVC.m */; };
 		EBAACA902406475100F44B67 /* ShowBtn.m in Sources */ = {isa = PBXBuildFile; fileRef = EBAACA8F2406475100F44B67 /* ShowBtn.m */; };
 		EBAACA932406730C00F44B67 /* MyFavoriteSearchVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBAACA922406730C00F44B67 /* MyFavoriteSearchVC.m */; };
 		EBB6886A23C9C0C300E24DD9 /* MMDatabaseConn.m in Sources */ = {isa = PBXBuildFile; fileRef = EBB6883823C9C0C300E24DD9 /* MMDatabaseConn.m */; };
@@ -1106,12 +1113,24 @@
 		EBDE08C324582BA6005D426C /* CommonListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBDE08C124582BA6005D426C /* CommonListCell.m */; };
 		EBDE08C424582BA6005D426C /* CommonListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBDE08C224582BA6005D426C /* CommonListCell.xib */; };
 		EBDE08C7245837BF005D426C /* CommonListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EBDE08C6245837BF005D426C /* CommonListModel.m */; };
+		EBDE08CA24583D47005D426C /* CommonWorkVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBDE08C924583D47005D426C /* CommonWorkVC.m */; };
+		EBDE08CD24583D6B005D426C /* CommonToolVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBDE08CC24583D6B005D426C /* CommonToolVC.m */; };
 		EBE36C3723A7208E002BE674 /* NewTopicCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE36C3523A7208E002BE674 /* NewTopicCell.m */; };
 		EBE36C3823A7208E002BE674 /* NewTopicCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBE36C3623A7208E002BE674 /* NewTopicCell.xib */; };
 		EBE36C3B23A72AFA002BE674 /* NewTopicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE36C3A23A72AFA002BE674 /* NewTopicModel.m */; };
 		EBE36C4423A791A9002BE674 /* ChatMsgWorkModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE36C4323A791A9002BE674 /* ChatMsgWorkModel.m */; };
 		EBE36C4723A863FC002BE674 /* NewTopicTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE36C4623A863FC002BE674 /* NewTopicTextView.m */; };
 		EBE36C4F23A8E413002BE674 /* TopicListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE36C4E23A8E413002BE674 /* TopicListModel.m */; };
+		EBE5EF192459478A00AD59C4 /* CommonToolMoveVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE5EF182459478A00AD59C4 /* CommonToolMoveVC.m */; };
+		EBE5EF1C2459645800AD59C4 /* CommonNoteVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE5EF1B2459645800AD59C4 /* CommonNoteVC.m */; };
+		EBE5EF1F2459841B00AD59C4 /* MyAccountVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE5EF1E2459841B00AD59C4 /* MyAccountVC.m */; };
+		EBE5EF232459853100AD59C4 /* MyAccountCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE5EF212459853100AD59C4 /* MyAccountCell.m */; };
+		EBE5EF242459853100AD59C4 /* MyAccountCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBE5EF222459853100AD59C4 /* MyAccountCell.xib */; };
+		EBE5EF2724598F8600AD59C4 /* MyCardVC.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE5EF2624598F8600AD59C4 /* MyCardVC.m */; };
+		EBE96EC1245ABEB6008BDBA8 /* PayAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBE96EC0245ABEB6008BDBA8 /* PayAlert.xib */; };
+		EBE96EC4245ABECB008BDBA8 /* PayAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE96EC3245ABECB008BDBA8 /* PayAlert.m */; };
+		EBE96EC8245AD77B008BDBA8 /* PayAlertCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBE96EC6245AD77B008BDBA8 /* PayAlertCell.m */; };
+		EBE96EC9245AD77B008BDBA8 /* PayAlertCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBE96EC7245AD77B008BDBA8 /* PayAlertCell.xib */; };
 		EBEC966C23D69CC5001115FE /* MyFavoriteCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EBEC966A23D69CC5001115FE /* MyFavoriteCell.m */; };
 		EBEC966D23D69CC5001115FE /* MyFavoriteCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = EBEC966B23D69CC5001115FE /* MyFavoriteCell.xib */; };
 		EBF1A8C823B1EF6700FA6F4B /* WaitWorkModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EBF1A8C723B1EF6700FA6F4B /* WaitWorkModel.m */; };
@@ -2566,6 +2585,16 @@
 		EB77B294239FCAF90050A3C0 /* ChatNewRowCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ChatNewRowCell.h; sourceTree = "<group>"; };
 		EB77B295239FCAF90050A3C0 /* ChatNewRowCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChatNewRowCell.m; sourceTree = "<group>"; };
 		EB77B296239FCAF90050A3C0 /* ChatNewRowCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ChatNewRowCell.xib; sourceTree = "<group>"; };
+		EB7DD22A2462620100C6048F /* SourceHomeVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SourceHomeVC.h; sourceTree = "<group>"; };
+		EB7DD22B2462620100C6048F /* SourceHomeVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SourceHomeVC.m; sourceTree = "<group>"; };
+		EB7DD23424629A1B00C6048F /* Source.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Source.storyboard; sourceTree = "<group>"; };
+		EB7DD2362462AB5B00C6048F /* GroupSquareVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GroupSquareVC.h; sourceTree = "<group>"; };
+		EB7DD2372462AB5B00C6048F /* GroupSquareVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroupSquareVC.m; sourceTree = "<group>"; };
+		EB7DD2392462B62600C6048F /* GroupSquareCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GroupSquareCell.h; sourceTree = "<group>"; };
+		EB7DD23A2462B62600C6048F /* GroupSquareCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroupSquareCell.m; sourceTree = "<group>"; };
+		EB7DD23B2462B62600C6048F /* GroupSquareCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GroupSquareCell.xib; sourceTree = "<group>"; };
+		EB7DD23E2462BC8F00C6048F /* GroupSquareModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GroupSquareModel.h; sourceTree = "<group>"; };
+		EB7DD23F2462BC8F00C6048F /* GroupSquareModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GroupSquareModel.m; sourceTree = "<group>"; };
 		EB8143BA2440502B00C439A9 /* HomeListWorkCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HomeListWorkCell.h; sourceTree = "<group>"; };
 		EB8143BB2440502B00C439A9 /* HomeListWorkCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HomeListWorkCell.m; sourceTree = "<group>"; };
 		EB8143BC2440502B00C439A9 /* HomeListWorkCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeListWorkCell.xib; sourceTree = "<group>"; };
@@ -2957,6 +2986,8 @@
 		EBA9F904239287C30013BDDA /* Social.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Social.framework; path = System/Library/Frameworks/Social.framework; sourceTree = SDKROOT; };
 		EBA9F906239287CD0013BDDA /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
 		EBA9F909239287DC0013BDDA /* libbz2.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libbz2.tbd; path = usr/lib/libbz2.tbd; sourceTree = SDKROOT; };
+		EBAA1F222463A4F200272F13 /* SourceGroupVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SourceGroupVC.h; sourceTree = "<group>"; };
+		EBAA1F232463A4F200272F13 /* SourceGroupVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SourceGroupVC.m; sourceTree = "<group>"; };
 		EBAACA8E2406475100F44B67 /* ShowBtn.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShowBtn.h; sourceTree = "<group>"; };
 		EBAACA8F2406475100F44B67 /* ShowBtn.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShowBtn.m; sourceTree = "<group>"; };
 		EBAACA912406730C00F44B67 /* MyFavoriteSearchVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyFavoriteSearchVC.h; sourceTree = "<group>"; };
@@ -3047,6 +3078,10 @@
 		EBDE08C224582BA6005D426C /* CommonListCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CommonListCell.xib; sourceTree = "<group>"; };
 		EBDE08C5245837BF005D426C /* CommonListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonListModel.h; sourceTree = "<group>"; };
 		EBDE08C6245837BF005D426C /* CommonListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CommonListModel.m; sourceTree = "<group>"; };
+		EBDE08C824583D47005D426C /* CommonWorkVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonWorkVC.h; sourceTree = "<group>"; };
+		EBDE08C924583D47005D426C /* CommonWorkVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CommonWorkVC.m; sourceTree = "<group>"; };
+		EBDE08CB24583D6B005D426C /* CommonToolVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonToolVC.h; sourceTree = "<group>"; };
+		EBDE08CC24583D6B005D426C /* CommonToolVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CommonToolVC.m; sourceTree = "<group>"; };
 		EBE36C3423A7208E002BE674 /* NewTopicCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NewTopicCell.h; sourceTree = "<group>"; };
 		EBE36C3523A7208E002BE674 /* NewTopicCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewTopicCell.m; sourceTree = "<group>"; };
 		EBE36C3623A7208E002BE674 /* NewTopicCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewTopicCell.xib; sourceTree = "<group>"; };
@@ -3058,6 +3093,23 @@
 		EBE36C4623A863FC002BE674 /* NewTopicTextView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewTopicTextView.m; sourceTree = "<group>"; };
 		EBE36C4D23A8E413002BE674 /* TopicListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TopicListModel.h; sourceTree = "<group>"; };
 		EBE36C4E23A8E413002BE674 /* TopicListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TopicListModel.m; sourceTree = "<group>"; };
+		EBE5EF172459478A00AD59C4 /* CommonToolMoveVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonToolMoveVC.h; sourceTree = "<group>"; };
+		EBE5EF182459478A00AD59C4 /* CommonToolMoveVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CommonToolMoveVC.m; sourceTree = "<group>"; };
+		EBE5EF1A2459645800AD59C4 /* CommonNoteVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CommonNoteVC.h; sourceTree = "<group>"; };
+		EBE5EF1B2459645800AD59C4 /* CommonNoteVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CommonNoteVC.m; sourceTree = "<group>"; };
+		EBE5EF1D2459841B00AD59C4 /* MyAccountVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyAccountVC.h; sourceTree = "<group>"; };
+		EBE5EF1E2459841B00AD59C4 /* MyAccountVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyAccountVC.m; sourceTree = "<group>"; };
+		EBE5EF202459853100AD59C4 /* MyAccountCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyAccountCell.h; sourceTree = "<group>"; };
+		EBE5EF212459853100AD59C4 /* MyAccountCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyAccountCell.m; sourceTree = "<group>"; };
+		EBE5EF222459853100AD59C4 /* MyAccountCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyAccountCell.xib; sourceTree = "<group>"; };
+		EBE5EF2524598F8600AD59C4 /* MyCardVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyCardVC.h; sourceTree = "<group>"; };
+		EBE5EF2624598F8600AD59C4 /* MyCardVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyCardVC.m; sourceTree = "<group>"; };
+		EBE96EC0245ABEB6008BDBA8 /* PayAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PayAlert.xib; sourceTree = "<group>"; };
+		EBE96EC2245ABECB008BDBA8 /* PayAlert.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PayAlert.h; sourceTree = "<group>"; };
+		EBE96EC3245ABECB008BDBA8 /* PayAlert.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PayAlert.m; sourceTree = "<group>"; };
+		EBE96EC5245AD77B008BDBA8 /* PayAlertCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PayAlertCell.h; sourceTree = "<group>"; };
+		EBE96EC6245AD77B008BDBA8 /* PayAlertCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PayAlertCell.m; sourceTree = "<group>"; };
+		EBE96EC7245AD77B008BDBA8 /* PayAlertCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PayAlertCell.xib; sourceTree = "<group>"; };
 		EBEC966923D69CC5001115FE /* MyFavoriteCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MyFavoriteCell.h; sourceTree = "<group>"; };
 		EBEC966A23D69CC5001115FE /* MyFavoriteCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MyFavoriteCell.m; sourceTree = "<group>"; };
 		EBEC966B23D69CC5001115FE /* MyFavoriteCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MyFavoriteCell.xib; sourceTree = "<group>"; };
@@ -4040,6 +4092,10 @@
 				C6F2E1AD236C594A009E6903 /* EditPhoneOrEmailVC.m */,
 				3274780123A87E97003B5F49 /* FileLookupVC.h */,
 				3274780223A87E97003B5F49 /* FileLookupVC.m */,
+				EBE5EF1D2459841B00AD59C4 /* MyAccountVC.h */,
+				EBE5EF1E2459841B00AD59C4 /* MyAccountVC.m */,
+				EBE5EF2524598F8600AD59C4 /* MyCardVC.h */,
+				EBE5EF2624598F8600AD59C4 /* MyCardVC.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -4059,6 +4115,15 @@
 				C6F2E1A1236C44D8009E6903 /* ShowGenderAlertView.h */,
 				C6F2E1A2236C44D8009E6903 /* ShowGenderAlertView.m */,
 				C6F2E1A4236C4554009E6903 /* ShowGenderAlertView.xib */,
+				EBE5EF202459853100AD59C4 /* MyAccountCell.h */,
+				EBE5EF212459853100AD59C4 /* MyAccountCell.m */,
+				EBE5EF222459853100AD59C4 /* MyAccountCell.xib */,
+				EBE96EC2245ABECB008BDBA8 /* PayAlert.h */,
+				EBE96EC3245ABECB008BDBA8 /* PayAlert.m */,
+				EBE96EC0245ABEB6008BDBA8 /* PayAlert.xib */,
+				EBE96EC5245AD77B008BDBA8 /* PayAlertCell.h */,
+				EBE96EC6245AD77B008BDBA8 /* PayAlertCell.m */,
+				EBE96EC7245AD77B008BDBA8 /* PayAlertCell.xib */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -6593,6 +6658,7 @@
 		C7F61623238C046B008AF22D /* VCModel */ = {
 			isa = PBXGroup;
 			children = (
+				EB7DD226246261E100C6048F /* Source */,
 				EBDE08AD24581782005D426C /* common */,
 				C622157E23719C84006F5D7F /* Login */,
 				C7D6BBB9235DA1CD00770E7C /* WorkFlow */,
@@ -6709,6 +6775,49 @@
 			path = VC;
 			sourceTree = "<group>";
 		};
+		EB7DD226246261E100C6048F /* Source */ = {
+			isa = PBXGroup;
+			children = (
+				EB7DD23424629A1B00C6048F /* Source.storyboard */,
+				EB7DD227246261E100C6048F /* Controller */,
+				EB7DD228246261E100C6048F /* Model */,
+				EB7DD229246261E100C6048F /* View */,
+			);
+			path = Source;
+			sourceTree = "<group>";
+		};
+		EB7DD227246261E100C6048F /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				EB7DD22A2462620100C6048F /* SourceHomeVC.h */,
+				EB7DD22B2462620100C6048F /* SourceHomeVC.m */,
+				EBAA1F222463A4F200272F13 /* SourceGroupVC.h */,
+				EBAA1F232463A4F200272F13 /* SourceGroupVC.m */,
+				EB7DD2362462AB5B00C6048F /* GroupSquareVC.h */,
+				EB7DD2372462AB5B00C6048F /* GroupSquareVC.m */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		EB7DD228246261E100C6048F /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				EB7DD23E2462BC8F00C6048F /* GroupSquareModel.h */,
+				EB7DD23F2462BC8F00C6048F /* GroupSquareModel.m */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		EB7DD229246261E100C6048F /* View */ = {
+			isa = PBXGroup;
+			children = (
+				EB7DD2392462B62600C6048F /* GroupSquareCell.h */,
+				EB7DD23A2462B62600C6048F /* GroupSquareCell.m */,
+				EB7DD23B2462B62600C6048F /* GroupSquareCell.xib */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 		EB8E2B7B239666A800CDFBDA /* Helper */ = {
 			isa = PBXGroup;
 			children = (
@@ -7467,6 +7576,14 @@
 			children = (
 				EBDE08AE2458179B005D426C /* CommonHomeVC.h */,
 				EBDE08AF2458179B005D426C /* CommonHomeVC.m */,
+				EBDE08C824583D47005D426C /* CommonWorkVC.h */,
+				EBDE08C924583D47005D426C /* CommonWorkVC.m */,
+				EBDE08CB24583D6B005D426C /* CommonToolVC.h */,
+				EBDE08CC24583D6B005D426C /* CommonToolVC.m */,
+				EBE5EF172459478A00AD59C4 /* CommonToolMoveVC.h */,
+				EBE5EF182459478A00AD59C4 /* CommonToolMoveVC.m */,
+				EBE5EF1A2459645800AD59C4 /* CommonNoteVC.h */,
+				EBE5EF1B2459645800AD59C4 /* CommonNoteVC.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -7661,12 +7778,14 @@
 				C625AAB5236FFFAA0010E967 /* WorkingGroup.storyboard in Resources */,
 				C7EE367923BB2D57002EB3BF /* NewMeetingFecordDetailsController.xib in Resources */,
 				324D963E23A4D47F00C7D9E8 /* NoteBook.storyboard in Resources */,
+				EBE96EC1245ABEB6008BDBA8 /* PayAlert.xib in Resources */,
 				C7D6BC9E235DA1CE00770E7C /* MyDetailViewController.xib in Resources */,
 				EB8E2D84239666A900CDFBDA /* msg_bg_send@3x.png in Resources */,
 				EB8E2D3A239666A900CDFBDA /* icon_022_cover.png in Resources */,
 				EB8E2D15239666A900CDFBDA /* alert_error@3x.png in Resources */,
 				EB8E2D53239666A900CDFBDA /* chat_audio_red@3x.png in Resources */,
 				EB8E2CDD239666A900CDFBDA /* back_gary@3x.png in Resources */,
+				EBE96EC9245AD77B008BDBA8 /* PayAlertCell.xib in Resources */,
 				C622708E236C09FC00E2E3BF /* mj_sun_black@3x.png in Resources */,
 				C6227090236C09FC00E2E3BF /* mj_air@3x.png in Resources */,
 				EBFC605C23FE52EE00A6874B /* HomeCommentView.xib in Resources */,
@@ -7710,6 +7829,7 @@
 				EB8E2D60239666A900CDFBDA /* chatbar_face@2x.png in Resources */,
 				3237321A23BC6B2700CC048D /* WZSendInfoCell.xib in Resources */,
 				C622708F236C09FC00E2E3BF /* mj_sun@2x.png in Resources */,
+				EBE5EF242459853100AD59C4 /* MyAccountCell.xib in Resources */,
 				C6227099236C09FC00E2E3BF /* mj_car@2x.png in Resources */,
 				EB8E2D6F239666A900CDFBDA /* chatbar_map@3x.png in Resources */,
 				EB8E2D1C239666A900CDFBDA /* alert_info@2x.png in Resources */,
@@ -7740,6 +7860,7 @@
 				EB8E2D57239666A900CDFBDA /* chat_audio_blue@3x.png in Resources */,
 				EB8E2D35239666A900CDFBDA /* icon_030_cover.png in Resources */,
 				C69A8DCC2373AFB50098FA26 /* MailListDetailCell.xib in Resources */,
+				EB7DD23D2462B62600C6048F /* GroupSquareCell.xib in Resources */,
 				C7525DE62388F25F004B9D71 /* MyWordCell.xib in Resources */,
 				C701EE4B23C2D97800082463 /* InPutGongWenImageCell.xib in Resources */,
 				C625AAC6237011D50010E967 /* ChatMsgNotice.storyboard in Resources */,
@@ -7859,6 +7980,7 @@
 				C7D6BB3A235DA18A00770E7C /* MyChanelCollectionViewCell.xib in Resources */,
 				EB8E2CE7239666A900CDFBDA /* user_avatar_gray@3x.png in Resources */,
 				C7D6BC82235DA1CE00770E7C /* MyViewController.xib in Resources */,
+				EB7DD23524629A1B00C6048F /* Source.storyboard in Resources */,
 				C7974A4B236C4D2A004D5470 /* MyWorkWordCell.xib in Resources */,
 				C7D6BCA4235DA1CE00770E7C /* MyTableViewCell.xib in Resources */,
 				C7D6BC8D235DA1CE00770E7C /* MyClubApplicationViewController.xib in Resources */,
@@ -7948,6 +8070,7 @@
 				C7D6BB98235DA18A00770E7C /* H5ViewController.m in Sources */,
 				EBB6887723C9C0C300E24DD9 /* MMRichEditAccessoryView.m in Sources */,
 				C7D6BB9D235DA18A00770E7C /* ZDTostView.m in Sources */,
+				EBDE08CD24583D6B005D426C /* CommonToolVC.m in Sources */,
 				C7037FED236FC1E6008EA3E4 /* SendInfoGroupModel.m in Sources */,
 				C625AAA4236FEF130010E967 /* ZLCellFakeView.m in Sources */,
 				C59D0C0623825DE1007D0760 /* YYFrameImage.m in Sources */,
@@ -7983,6 +8106,7 @@
 				32580E5E23ADB3D2005DF500 /* NoteBookSelectFinderVC.m in Sources */,
 				C59D0C2A23825DE1007D0760 /* UIScrollView+YYAdd.m in Sources */,
 				EBB6887D23C9C0C300E24DD9 /* NSString+NSDate.m in Sources */,
+				EBE5EF232459853100AD59C4 /* MyAccountCell.m in Sources */,
 				EB5A587323AB7D5800B93149 /* MyTDTopicSearchVC.m in Sources */,
 				EBB83E4E23B35FD300A8C4BC /* ChangeTopicCell.m in Sources */,
 				C59D0C1523825DE1007D0760 /* YYTextLayout.m in Sources */,
@@ -7997,6 +8121,7 @@
 				EB77B293239F9A4F0050A3C0 /* ChatNewRowVC.m in Sources */,
 				C6F2E1E6236D126B009E6903 /* UIView+XTExtension.m in Sources */,
 				327E375D23A9C86600842F47 /* NoteBookCell.m in Sources */,
+				EB7DD2382462AB5B00C6048F /* GroupSquareVC.m in Sources */,
 				C7D6BBA4235DA18A00770E7C /* NSString+HTML.m in Sources */,
 				C6F2E186236C26EC009E6903 /* MyInfoCell.m in Sources */,
 				EB8E2D51239666A900CDFBDA /* EMChatBarEmoticonView.m in Sources */,
@@ -8060,6 +8185,7 @@
 				C62270A8236C09FC00E2E3BF /* GHBlankView.m in Sources */,
 				C59D0C2723825DE1007D0760 /* UIDevice+YYAdd.m in Sources */,
 				C7D6BB40235DA18A00770E7C /* SearchHistoryCell.m in Sources */,
+				EBE96EC4245ABECB008BDBA8 /* PayAlert.m in Sources */,
 				EB0DBF0423ADA8A200E977ED /* MyTDTopicSelectExtentCell.m in Sources */,
 				EB52714E2428555C00B37D2A /* TDInterLeterSearchVC.m in Sources */,
 				C7D6BBB6235DA18A00770E7C /* XLTextCalculateHelper.m in Sources */,
@@ -8186,9 +8312,11 @@
 				C72351C12382907B0037E4F6 /* NSImage+WebCache.m in Sources */,
 				EB8E2D2E239666A900CDFBDA /* EMReadReceiptTableViewCell.m in Sources */,
 				EB8E2CD7239666A900CDFBDA /* UIViewController+Util.m in Sources */,
+				EBE5EF1F2459841B00AD59C4 /* MyAccountVC.m in Sources */,
 				EB98E7B524061CD00087C4E2 /* NoteBookSearchVC.m in Sources */,
 				EBF2D55123C2E85600EC35C4 /* MHTopicFrame.m in Sources */,
 				C7D6BB42235DA18A00770E7C /* SearchTypeCell.m in Sources */,
+				EBE5EF2724598F8600AD59C4 /* MyCardVC.m in Sources */,
 				C625AA8E236FCDD30010E967 /* ChatMsgSearchHistoryVC.m in Sources */,
 				C59D0C3D23825DE1007D0760 /* NSNotificationCenter+YYAdd.m in Sources */,
 				C62270AE236C09FC00E2E3BF /* LeeTagItemViewModel.m in Sources */,
@@ -8213,6 +8341,7 @@
 				EB92E88E23B09AD5008E94CF /* GFCalendar.m in Sources */,
 				EB568FBD239B369D000827B0 /* FindChatItemsModel.m in Sources */,
 				C7525DE52388F25F004B9D71 /* MyWordCell.m in Sources */,
+				EB7DD2402462BC8F00C6048F /* GroupSquareModel.m in Sources */,
 				C622159C2372C0F9006F5D7F /* MailListVC.m in Sources */,
 				EB71EEFC240E565B0089B1A6 /* FlowAttachmentsModel.m in Sources */,
 				EBE36C4423A791A9002BE674 /* ChatMsgWorkModel.m in Sources */,
@@ -8221,6 +8350,7 @@
 				C59D0C4423825DE1007D0760 /* YYThreadSafeDictionary.m in Sources */,
 				C59D0C3323825DE1007D0760 /* NSNumber+YYAdd.m in Sources */,
 				C7037FEA236FB65A008EA3E4 /* SendInfoGroupVC.m in Sources */,
+				EBE5EF1C2459645800AD59C4 /* CommonNoteVC.m in Sources */,
 				EB6D1C1623F6B590000D2EF8 /* FileOpenViewController.m in Sources */,
 				C7D6BB3F235DA18A00770E7C /* HomeSearchDetailController.m in Sources */,
 				EBFDDADA241B9DA100875D8A /* ReadSearchVC.m in Sources */,
@@ -8252,6 +8382,7 @@
 				C62270A1236C09FC00E2E3BF /* GHRefreshCollectionView.m in Sources */,
 				C625AACF2370125D0010E967 /* ChatMsgNoticeVC.m in Sources */,
 				C56AC85F2384DB1000D46052 /* EaseSDKHelper.m in Sources */,
+				EBAA1F242463A4F200272F13 /* SourceGroupVC.m in Sources */,
 				EB8E2CF4239666A900CDFBDA /* wav.mm in Sources */,
 				C62215A42372CC89006F5D7F /* MailListByZuVC.m in Sources */,
 				C7D6BC85235DA1CE00770E7C /* NoticeViewController.m in Sources */,
@@ -8385,6 +8516,7 @@
 				EB8E2CDA239666A900CDFBDA /* EMEmoticonGroup.m in Sources */,
 				EBDD70BB23B4876F00AC0BF4 /* MyWorkCarVC.m in Sources */,
 				C752D21123751F1600913F97 /* DownFileViewController.m in Sources */,
+				EBE96EC8245AD77B008BDBA8 /* PayAlertCell.m in Sources */,
 				EBCFA0FA23ACEBE600A62645 /* MyTDTopicCreateVC.m in Sources */,
 				C6F2E197236C334A009E6903 /* LYLPhotoTailoringTool.m in Sources */,
 				C59D0C0B23825DE1007D0760 /* CALayer+YYWebImage.m in Sources */,
@@ -8466,6 +8598,7 @@
 				C59D0C3623825DE1007D0760 /* NSData+YYAdd.m in Sources */,
 				C7743F9D23A8B2D800973D70 /* WorkFlowHomeCell.m in Sources */,
 				EBF2D55423C2E8A000EC35C4 /* MHComment.m in Sources */,
+				EBDE08CA24583D47005D426C /* CommonWorkVC.m in Sources */,
 				C59D0C4623825DE1007D0760 /* YYTransaction.m in Sources */,
 				C59D0A432382468A007D0760 /* JSONModelError.m in Sources */,
 				C59D0C1123825DE1007D0760 /* YYTextMagnifier.m in Sources */,
@@ -8479,6 +8612,7 @@
 				EBCFA0F723AC6CBC00A62645 /* MyTDTopicUserMoveVC.m in Sources */,
 				C7D6BBB3235DA18A00770E7C /* TDButton.m in Sources */,
 				C59D0C4323825DE1007D0760 /* YYAsyncLayer.m in Sources */,
+				EB7DD22C2462620100C6048F /* SourceHomeVC.m in Sources */,
 				C7D6BCAB235DA1CE00770E7C /* BlacklistViewController.m in Sources */,
 				EB581CEE23A0F5C800C451B0 /* WaitWorkVC.m in Sources */,
 				EBF2D55723C2E8F200EC35C4 /* MHUser.m in Sources */,
@@ -8589,6 +8723,7 @@
 				C76745152373A6C4001675FA /* BYHLabelsLayout.m in Sources */,
 				C625AAA7236FEF130010E967 /* SPPageMenu.m in Sources */,
 				C69A8DF32374455C0098FA26 /* ChatInfoUserModel.m in Sources */,
+				EB7DD23C2462B62600C6048F /* GroupSquareCell.m in Sources */,
 				EB0F64D323AA096A00AD56A0 /* MyTDTopicGroupUserVC.m in Sources */,
 				EB8E2D1D239666A900CDFBDA /* UIViewController+Search.m in Sources */,
 				EB8E2D0D239666A900CDFBDA /* SDWebImageDecoder.m in Sources */,
@@ -8658,6 +8793,7 @@
 				C795C62F23744CD00042300F /* GoDisscussView.m in Sources */,
 				C7D6BC7E235DA1CE00770E7C /* MyOrderViewController.m in Sources */,
 				C59D0C1623825DE1007D0760 /* YYTextLine.m in Sources */,
+				EBE5EF192459478A00AD59C4 /* CommonToolMoveVC.m in Sources */,
 				EBB6886F23C9C0C300E24DD9 /* MMDraftUtil.m in Sources */,
 				C74E72EA23D2FF2B00BD1271 /* DepartureController.m in Sources */,
 				EB8E2D02239666A900CDFBDA /* PSTCollectionViewCell.m in Sources */,

二進制
smartRhino.xcworkspace/xcuserdata/niuzhen.xcuserdatad/UserInterfaceState.xcuserstate


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

@@ -7,7 +7,7 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
          <BreakpointContent
-            uuid = "251C02AB-C854-4BD2-A697-B50A4F76F4AB"
+            uuid = "3970A22D-468F-4F18-8BB5-10FD5F994275"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
@@ -18,47 +18,23 @@
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.SymbolicBreakpoint">
          <BreakpointContent
-            uuid = "33E112FB-2A69-481D-BDBE-BE497F28C969"
+            uuid = "BD7D423F-C087-4E51-8772-A6CF3EA04167"
             shouldBeEnabled = "Yes"
             ignoreCount = "0"
             continueAfterRunningActions = "No"
             symbolName = ""
             moduleName = "">
+            <Actions>
+               <BreakpointActionProxy
+                  ActionExtensionID = "Xcode.BreakpointAction.DebuggerCommand">
+                  <ActionContent
+                     consoleCommand = "">
+                  </ActionContent>
+               </BreakpointActionProxy>
+            </Actions>
             <Locations>
             </Locations>
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "473B6B59-A20F-4CC8-9925-D04DD1859AB4"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "smartRhino/AppDelegate.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "292"
-            endingLineNumber = "292"
-            landmarkName = "-application:continueUserActivity:restorationHandler:"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "F0EFA783-BA69-410E-B9CE-B872F5DCB7A5"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/VC/TDGroupInfoListVC.m"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "125"
-            endingLineNumber = "125"
-            landmarkName = "-returnToWechatSession"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

二進制
smartRhino/Assets.xcassets/ChatMsg/ChatMsg_new_topic.imageset/ChatMsg_new_topic@2x.png


二進制
smartRhino/Assets.xcassets/ChatMsg/ChatMsg_new_topic.imageset/ChatMsg_new_topic@3x.png


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

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

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

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

二進制
smartRhino/Assets.xcassets/ChatMsg/Source_Group_Icon.imageset/Source_Group_Icon@2x.png


二進制
smartRhino/Assets.xcassets/ChatMsg/Source_Group_Icon.imageset/Source_Group_Icon@3x.png


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

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

二進制
smartRhino/Assets.xcassets/ChatMsg/Source_Group_tree.imageset/Source_Group_tree@2x.png


二進制
smartRhino/Assets.xcassets/ChatMsg/Source_Group_tree.imageset/Source_Group_tree@3x.png


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

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

二進制
smartRhino/Assets.xcassets/ChatMsg/Source_topic.imageset/Source_topic@2x.png


二進制
smartRhino/Assets.xcassets/ChatMsg/Source_topic.imageset/Source_topic@3x.png


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

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

二進制
smartRhino/Assets.xcassets/ChatMsg/Source_user.imageset/Source_user@2x.png


二進制
smartRhino/Assets.xcassets/ChatMsg/Source_user.imageset/Source_user@3x.png


+ 0 - 1
smartRhino/Assets.xcassets/ChatMsg/chatmsg_rightArrow_icon.imageset/Contents.json

@@ -2,7 +2,6 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "chatmsg_rightArrow_icon.png",
       "scale" : "1x"
     },
     {

二進制
smartRhino/Assets.xcassets/ChatMsg/chatmsg_rightArrow_icon.imageset/chatmsg_rightArrow_icon.png


二進制
smartRhino/Assets.xcassets/ChatMsg/chatmsg_rightArrow_icon.imageset/chatmsg_rightArrow_icon@2x.png


二進制
smartRhino/Assets.xcassets/ChatMsg/chatmsg_rightArrow_icon.imageset/chatmsg_rightArrow_icon@3x.png


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

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

二進制
smartRhino/Assets.xcassets/ChatMsg/chatmsg_sixin_icon.imageset/chatmsg_sixin_icon@2x.png


二進制
smartRhino/Assets.xcassets/ChatMsg/chatmsg_sixin_icon.imageset/chatmsg_sixin_icon@3x.png


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

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

二進制
smartRhino/Assets.xcassets/ChatMsg/source_blue.imageset/source_blue@2x.png


二進制
smartRhino/Assets.xcassets/ChatMsg/source_blue.imageset/source_blue@3x.png


二進制
smartRhino/Assets.xcassets/Common/Common_note_icon.imageset/Common_note_icon@2x.png


二進制
smartRhino/Assets.xcassets/Common/Common_note_icon.imageset/Common_note_icon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/Common/Common_note_icon.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/Common/Common_set.imageset/Common_set@2x.png


二進制
smartRhino/Assets.xcassets/Common/Common_set.imageset/Common_set@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/Common/Common_set.imageset/Contents.json

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

+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_account.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_account.imageset/mine_account@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_account.imageset/mine_account@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_agree_icon.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_agree_icon.imageset/mine_agree_icon@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_agree_icon.imageset/mine_agree_icon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_book_icon.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_book_icon.imageset/mine_book_icon@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_book_icon.imageset/mine_book_icon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_buy_btn.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_buy_btn.imageset/mine_buy_btn@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_buy_btn.imageset/mine_buy_btn@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_cardBg_icon.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_cardBg_icon.imageset/mine_cardBg_icon@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_cardBg_icon.imageset/mine_cardBg_icon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_card_icon.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_card_icon.imageset/mine_card_icon@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_card_icon.imageset/mine_card_icon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_frist_month.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_frist_month.imageset/mine_frist_month@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_frist_month.imageset/mine_frist_month@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_man_icon.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_man_icon.imageset/mine_man_icon@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_man_icon.imageset/mine_man_icon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_net_icon.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_net_icon.imageset/mine_net_icon@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_net_icon.imageset/mine_net_icon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_ting_icon.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_ting_icon.imageset/mine_ting_icon@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_ting_icon.imageset/mine_ting_icon@3x.png


+ 22 - 0
smartRhino/Assets.xcassets/我的/mine_wuxianka.imageset/Contents.json

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

二進制
smartRhino/Assets.xcassets/我的/mine_wuxianka.imageset/mine_wuxianka@2x.png


二進制
smartRhino/Assets.xcassets/我的/mine_wuxianka.imageset/mine_wuxianka@3x.png


+ 1 - 1
smartRhino/FwzAppConfig.h

@@ -264,7 +264,7 @@ typedef enum ChatMsgNoticeType_Source{
     /// 来自 站内信
     ChatMsgNoticeType_Source_2 = 2,
 }ChatMsgNoticeType_Source;
-///1文章 2话题 3 收藏 4笔记 5通知 6站内信 7小组  12 收藏文件夹 13笔记文件夹 14工作流审批  21 新版话题 100 文章 300 文件 301图片 400会议纪要 500会议详情 601 财务报表 602人事报表 603 出版报表
+/// 2话题 3 收藏 4笔记 5通知 6站内信 7小组  12 收藏文件夹 13笔记文件夹 14工作流审批  21 新版话题 100 文章 300 文件 301图片 400会议纪要 500会议详情 601 财务报表 602人事报表 603 出版报表
 typedef enum CollectModelType{
     CollectModel_Text = 1,
     CollectModel_Toipc  = 2,

+ 3 - 1
smartRhino/Project/Base/SubClass/TabBarController/TabBarController.m

@@ -87,7 +87,9 @@ TDShareInstance_implementation(TabBarController)
 //    [self addChildVC:[self className:@"WorkFlowController"] title:@"工作" normalImageName:@"bar_work_off" selectedImageName:@"bar_work_on" isRequiredNavController:true];
 //    [self addChildVC:[self className:@"ChatMessageController"] title:@"信源" normalImageName:@"bar_chat_off" selectedImageName:@"bar_chat_on" isRequiredNavController:true];
     [self addChildVC:[StoryboardManager shared].Common.instantiateInitialViewController title:@"常用" normalImageName:@"bar_work_off" selectedImageName:@"bar_work_on" isRequiredNavController:false];
-    [self addChildVC:[StoryboardManager shared].chatMsg.instantiateInitialViewController title:@"信源" normalImageName:@"bar_chat_off" selectedImageName:@"bar_chat_on" isRequiredNavController:false];
+    [self addChildVC:[StoryboardManager shared].Source.instantiateInitialViewController title:@"信源" normalImageName:@"bar_chat_off" selectedImageName:@"bar_chat_on" isRequiredNavController:false];
+
+//    [self addChildVC:[StoryboardManager shared].chatMsg.instantiateInitialViewController title:@"信源" normalImageName:@"bar_chat_off" selectedImageName:@"bar_chat_on" isRequiredNavController:false];
     [self addChildVC:[StoryboardManager shared].myCenter.instantiateInitialViewController title:@"我的" normalImageName:@"bar_my_off" selectedImageName:@"bar_my_on" isRequiredNavController:false];
 }
 

+ 1 - 0
smartRhino/Project/Other/Util/StoryboardManager/StoryboardManager.h

@@ -34,6 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (weak, nonatomic,readonly) UIStoryboard *myTDTopicExtent;
 @property (weak, nonatomic,readonly) UIStoryboard *Search;
 @property (weak, nonatomic,readonly) UIStoryboard *Common;
+@property (weak, nonatomic,readonly) UIStoryboard *Source;
 
 @end
 

+ 9 - 0
smartRhino/Project/Other/Util/StoryboardManager/StoryboardManager.m

@@ -32,6 +32,8 @@
 @property (weak, nonatomic) UIStoryboard *myTDTopicExtent;
 @property (weak, nonatomic) UIStoryboard *Search;
 @property (weak, nonatomic) UIStoryboard *Common;
+@property (weak, nonatomic) UIStoryboard *Source;
+
 @end
 
 @implementation StoryboardManager
@@ -69,6 +71,7 @@
     }
     return _chatMsg = [UIStoryboard storyboardWithName:@"ChatMsg" bundle:nil];
 }
+
 - (UIStoryboard *)chatMsgSearch {
     if (_chatMsgSearch) {
         return _chatMsgSearch;
@@ -177,4 +180,10 @@
     }
     return _Common = [UIStoryboard storyboardWithName:@"Common" bundle:nil];
 }
+- (UIStoryboard *)Source {
+    if (_Source) {
+        return _Source;
+    }
+    return _Source = [UIStoryboard storyboardWithName:@"Source" bundle:nil];
+}
 @end

+ 3 - 2
smartRhino/Project/VCModel/ChatMessage/Controller/MyTDGroup/View/MyTDGroupView.m

@@ -27,17 +27,18 @@
     }
     return self;
 }
+
 - (instancetype)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];
     if (self) {
         self.backgroundColor = [UIColor whiteColor];
         [self addSubview:self.button];
-        self.button.frame = CGRectMake(15,4,frame.size.width - 30,frame.size.height);
+        self.button.frame = CGRectMake(15,0,frame.size.width - 30,frame.size.height);
         [self.button setBackgroundColor:UIColorHex(0xffffff)];
         [self.button setTitleColor:UIColorHex(0x999999) forState:UIControlStateNormal];
         self.button.layer.borderWidth = 0.5f;
-        self.button.layer.borderColor = UIColorHex(0xEEEEEE).CGColor;
+        self.button.layer.borderColor = UIColorHex(0xDADADA).CGColor;
         self.button.layer.cornerRadius = frame.size.height * 0.5;
         self.button.layer.masksToBounds = YES;
     }

+ 2 - 0
smartRhino/Project/VCModel/ChatMessage/Model/MoreAppModel.h

@@ -22,6 +22,8 @@ typedef enum ChatMenuType {
     ChatMenutopicType = 5,
     ///待办事项
     ChatMenuWaitType = 6,
+    ///私信
+    ChatMenuSiXinType = 7,
 }ChatMenuType;
 @class MoreAppInfoModel;
 

+ 16 - 12
smartRhino/Project/VCModel/ChatMessage/View/ChatMsgCollectionCell.xib

@@ -11,26 +11,30 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ChatMsgCollectionCell" id="gTV-IL-0wX" customClass="ChatMsgCollectionCell">
-            <rect key="frame" x="0.0" y="0.0" width="70" height="90"/>
+            <rect key="frame" x="0.0" y="0.0" width="70" height="98"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                <rect key="frame" x="0.0" y="0.0" width="70" height="90"/>
+                <rect key="frame" x="0.0" y="0.0" width="70" height="98"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1l4-pu-UQi">
-                        <rect key="frame" x="0.0" y="0.0" width="70" height="90"/>
+                        <rect key="frame" x="0.0" y="0.0" width="70" height="98"/>
                         <subviews>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_ht_icon" translatesAutoresizingMaskIntoConstraints="NO" id="UcK-Mt-u7p">
-                                <rect key="frame" x="21" y="17" width="28.5" height="28.5"/>
+                                <rect key="frame" x="20" y="12" width="30" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="UON-XY-NG0"/>
+                                    <constraint firstAttribute="width" constant="30" id="YeZ-VL-YeK"/>
+                                </constraints>
                             </imageView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KnF-GQ-hHW">
-                                <rect key="frame" x="41.5" y="9" width="16" height="16"/>
+                                <rect key="frame" x="42" y="4" width="16" height="16"/>
                                 <color key="backgroundColor" systemColor="systemRedColor" red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="16" id="JRf-LS-RCh"/>
                                     <constraint firstAttribute="width" constant="16" id="yH5-yX-Ho1"/>
                                 </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                 <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <nil key="highlightedColor"/>
                                 <userDefinedRuntimeAttributes>
@@ -40,14 +44,14 @@
                                     <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
                                 </userDefinedRuntimeAttributes>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4EX-kh-Sh3">
-                                <rect key="frame" x="16.5" y="58.5" width="37.5" height="18"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4EX-kh-Sh3">
+                                <rect key="frame" x="16.5" y="50" width="37.5" height="18"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                 <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <view alpha="0.69999999999999996" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="T0P-rv-gzb">
-                                <rect key="frame" x="0.0" y="0.0" width="70" height="90"/>
+                                <rect key="frame" x="0.0" y="0.0" width="70" height="98"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </view>
                         </subviews>
@@ -56,10 +60,10 @@
                             <constraint firstItem="KnF-GQ-hHW" firstAttribute="centerY" secondItem="UcK-Mt-u7p" secondAttribute="top" id="3h8-j7-NY1"/>
                             <constraint firstItem="KnF-GQ-hHW" firstAttribute="centerX" secondItem="UcK-Mt-u7p" secondAttribute="trailing" id="EpX-Sb-UmR"/>
                             <constraint firstItem="UcK-Mt-u7p" firstAttribute="centerX" secondItem="1l4-pu-UQi" secondAttribute="centerX" id="Joh-85-wgI"/>
-                            <constraint firstItem="UcK-Mt-u7p" firstAttribute="top" secondItem="1l4-pu-UQi" secondAttribute="top" constant="17" id="KWq-iY-GpP"/>
+                            <constraint firstItem="UcK-Mt-u7p" firstAttribute="top" secondItem="1l4-pu-UQi" secondAttribute="top" constant="12" id="KWq-iY-GpP"/>
+                            <constraint firstItem="4EX-kh-Sh3" firstAttribute="top" secondItem="UcK-Mt-u7p" secondAttribute="bottom" constant="8" id="Nbx-kl-FJO"/>
                             <constraint firstAttribute="bottom" secondItem="T0P-rv-gzb" secondAttribute="bottom" id="Qfu-58-p91"/>
                             <constraint firstItem="T0P-rv-gzb" firstAttribute="top" secondItem="1l4-pu-UQi" secondAttribute="top" id="WP2-v0-hib"/>
-                            <constraint firstItem="4EX-kh-Sh3" firstAttribute="top" secondItem="1l4-pu-UQi" secondAttribute="top" constant="58.5" id="aNy-ro-nXa"/>
                             <constraint firstAttribute="trailing" secondItem="T0P-rv-gzb" secondAttribute="trailing" id="hyf-SW-na4"/>
                             <constraint firstItem="T0P-rv-gzb" firstAttribute="leading" secondItem="1l4-pu-UQi" secondAttribute="leading" id="uk9-hV-5bd"/>
                             <constraint firstItem="4EX-kh-Sh3" firstAttribute="centerX" secondItem="1l4-pu-UQi" secondAttribute="centerX" id="vd7-g9-NHw"/>
@@ -85,6 +89,6 @@
         </collectionViewCell>
     </objects>
     <resources>
-        <image name="chatmsg_ht_icon" width="28.5" height="28.5"/>
+        <image name="chatmsg_ht_icon" width="36" height="36"/>
     </resources>
 </document>

+ 2 - 22
smartRhino/Project/VCModel/ChatMessage/View/ChatMsgListCell.xib

@@ -75,25 +75,7 @@
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0oD-Oi-ctz">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="90"/>
-                        <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="ycx-QL-wZi">
-                                <rect key="frame" x="298" y="38.5" width="7" height="13.5"/>
-                            </imageView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uk0-BD-xrv">
-                                <rect key="frame" x="297" y="0.0" width="23" height="90"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="23" id="HNu-YW-PoA"/>
-                                    <constraint firstAttribute="height" constant="90" id="MkV-WC-4oD"/>
-                                </constraints>
-                            </button>
-                        </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <constraints>
-                            <constraint firstItem="uk0-BD-xrv" firstAttribute="centerY" secondItem="0oD-Oi-ctz" secondAttribute="centerY" id="3zQ-iY-R5L"/>
-                            <constraint firstAttribute="trailing" secondItem="uk0-BD-xrv" secondAttribute="trailing" id="K3x-3P-oeN"/>
-                            <constraint firstItem="ycx-QL-wZi" firstAttribute="leading" secondItem="uk0-BD-xrv" secondAttribute="leading" constant="1" id="TD0-M8-lST"/>
-                            <constraint firstItem="ycx-QL-wZi" firstAttribute="centerY" secondItem="uk0-BD-xrv" secondAttribute="centerY" id="gvf-RA-xEg"/>
-                        </constraints>
                     </view>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gX1-ax-cOi">
                         <rect key="frame" x="0.0" y="89.5" width="320" height="0.5"/>
@@ -116,8 +98,6 @@
             <viewLayoutGuide key="safeArea" id="520-dZ-mlc"/>
             <connections>
                 <outlet property="cell1ContentBgView" destination="0oD-Oi-ctz" id="lGo-81-8UC"/>
-                <outlet property="cell1RightIntoBtn" destination="uk0-BD-xrv" id="4HG-4a-ma7"/>
-                <outlet property="rightImg" destination="ycx-QL-wZi" id="yPv-kN-YcJ"/>
             </connections>
             <point key="canvasLocation" x="132" y="169"/>
         </tableViewCell>
@@ -477,7 +457,7 @@
                         </constraints>
                     </imageView>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="chatmsg_rightArrow_icon" translatesAutoresizingMaskIntoConstraints="NO" id="vgG-mD-kiR">
-                        <rect key="frame" x="298" y="28" width="7" height="13.5"/>
+                        <rect key="frame" x="298" y="28.5" width="7" height="12"/>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="28分钟前" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uv7-Xf-zfL">
                         <rect key="frame" x="241" y="27.5" width="52" height="14.5"/>
@@ -537,7 +517,7 @@
     </objects>
     <resources>
         <image name="chatmsg_list_testuser_img" width="45" height="45"/>
-        <image name="chatmsg_rightArrow_icon" width="7" height="13.5"/>
+        <image name="chatmsg_rightArrow_icon" width="6.5" height="12"/>
         <image name="chatmsg_search_icon" width="12" height="12"/>
         <image name="find_1" width="37" height="32"/>
         <image name="sendinfo_no" width="38" height="38"/>

+ 17 - 0
smartRhino/Project/VCModel/My_Center/Controller/MyAccountVC.h

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

+ 44 - 0
smartRhino/Project/VCModel/My_Center/Controller/MyAccountVC.m

@@ -0,0 +1,44 @@
+//
+//  MyAccountVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/4/29.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "MyAccountVC.h"
+#import "MyAccountCell.h"
+
+@interface MyAccountVC ()<UITableViewDelegate,UITableViewDataSource>
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+
+@end
+
+@implementation MyAccountVC
++(MyAccountVC *)initMyAccountVC{
+    MyAccountVC *controller = [StoryboardManager.shared.myCenter instantiateViewControllerWithIdentifier:@"MyAccountVC"];
+    return controller;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    [self.view setBackgroundColor:UIColorHex(0xf7f7f7)];
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    [self.tableView reloadData];
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return 5;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [MyAccountCell configCellHeight];
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    MyAccountCell * cell = [MyAccountCell configCell:tableView indexPath:indexPath];
+    return cell;
+}
+@end

+ 17 - 0
smartRhino/Project/VCModel/My_Center/Controller/MyCardVC.h

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

+ 107 - 0
smartRhino/Project/VCModel/My_Center/Controller/MyCardVC.m

@@ -0,0 +1,107 @@
+//
+//  MyCardVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/4/29.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "MyCardVC.h"
+#import "PayAlert.h"
+
+@interface MyCardVC ()
+@property (weak, nonatomic) IBOutlet UIButton *rightBtn;
+@property (weak, nonatomic) IBOutlet UILabel *NameL;
+@property (weak, nonatomic) IBOutlet UILabel *timeL;
+@property (weak, nonatomic) IBOutlet UIButton *BookBtn;
+@property (weak, nonatomic) IBOutlet UIButton *ListenBtn;
+@property (weak, nonatomic) IBOutlet UIButton *ManBtn;
+@property (weak, nonatomic) IBOutlet UIButton *NetBtn;
+@property (weak, nonatomic) IBOutlet UIView *timeView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *timeConstant;
+@property (weak, nonatomic) IBOutlet UIView *subTitleView;
+@property (weak, nonatomic) IBOutlet UIButton *PayBtn;
+@property (weak, nonatomic) IBOutlet UIButton *ServiceBtn;
+@end
+
+@implementation MyCardVC
++(MyCardVC *)initMyCardVC{
+    MyCardVC *controller = [StoryboardManager.shared.myCenter instantiateViewControllerWithIdentifier:@"MyCardVC"];
+    return controller;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    [self setTimeLColor];
+    [self setSubTitleColor];
+    [self setPayBtnColor];
+    [self setServiceColor];
+    [self.rightBtn setAction:^{
+
+    }];
+    [self.PayBtn setAction:^{
+        [[PayAlert share] show];
+    }];
+    [self.ServiceBtn setAction:^{
+
+    }];
+}
+- (void)setTimeLColor
+{
+    self.timeL.text = @"   免费试用 · 5月28日到期  ";
+    CGFloat W = [self.timeL sizeThatFits:CGSizeMake(SCREEN_WIDTH, 24)].width;
+    self.timeConstant.constant = W;
+    CAGradientLayer *gradientLayer = [CAGradientLayer layer];
+    gradientLayer.colors     = @[(__bridge id)UIColorHex(0xD4A75A).CGColor, (__bridge id)UIColorHex(0xE5C182).CGColor];
+    gradientLayer.locations  = @[@0.0, @1.0];
+    gradientLayer.startPoint = CGPointMake(0, 0);
+    gradientLayer.endPoint   = CGPointMake(1.0, 0);
+    gradientLayer.frame      = CGRectMake(0, 0, W, 24);
+    [self.timeView.layer addSublayer:gradientLayer];
+    UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:CGRectMake(0, 0, W, 24) byRoundingCorners:UIRectCornerBottomLeft|UIRectCornerTopLeft cornerRadii:CGSizeMake(12, 12)];
+    CAShapeLayer *maskLayer = [[CAShapeLayer alloc] init];
+    maskLayer.frame = self.timeL.bounds;
+    maskLayer.path = maskPath.CGPath;
+    self.timeView.layer.mask = maskLayer;
+}
+- (void)setSubTitleColor
+{
+    CAGradientLayer *gradientLayer = [CAGradientLayer layer];
+    gradientLayer.colors     = @[(__bridge id)UIColorHex(0x73B9EA).CGColor, (__bridge id)UIColorHex(0x51A2DB).CGColor];
+    gradientLayer.locations  = @[@0.0, @1.0];
+    gradientLayer.startPoint = CGPointMake(0, 0);
+    gradientLayer.endPoint   = CGPointMake(1.0, 0);
+    gradientLayer.frame      = CGRectMake(0, 0,  SCREEN_WIDTH - 32, 40);
+    [self.subTitleView.layer addSublayer:gradientLayer];
+}
+- (void)setPayBtnColor
+{
+    CAGradientLayer *gradientLayer = [CAGradientLayer layer];
+    gradientLayer.colors     = @[(__bridge id)UIColorHex(0xD6B178).CGColor, (__bridge id)UIColorHex(0xFEDCA9).CGColor];
+    gradientLayer.locations  = @[@0.0, @1.0];
+    gradientLayer.startPoint = CGPointMake(0, 0);
+    gradientLayer.endPoint   = CGPointMake(1.0, 0);
+    gradientLayer.frame      = CGRectMake(0, 0,  SCREEN_WIDTH - 32, 48);
+    gradientLayer.cornerRadius = 12;
+    [self.PayBtn.layer addSublayer:gradientLayer];
+}
+- (void)setServiceColor
+{
+    NSString * str = @" 已阅读并同意 会员订阅服务条款";
+    NSTextAttachment * attchment = [[NSTextAttachment alloc] init];
+    attchment.bounds = CGRectMake(0, -2, 12, 12);
+    attchment.image = IMG(@"mine_agree_icon");
+    NSInteger location = 8;
+    NSInteger lenght = 8;
+    NSAttributedString * attstr = [NSAttributedString attributedStringWithAttachment:attchment];
+    NSMutableAttributedString * mstr = [[NSMutableAttributedString alloc] init];
+    [mstr appendAttributedString:attstr];
+    NSMutableAttributedString * textStr = [[NSMutableAttributedString alloc] initWithString:str];
+    [textStr addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x666666) range:NSMakeRange(0, str.length)];
+    [textStr addAttribute:NSUnderlineStyleAttributeName value:@(NSUnderlineStyleSingle) range:NSMakeRange(location, lenght)];
+    [textStr addAttribute:NSUnderlineColorAttributeName value:UIColorHex(0x3D95EE) range:NSMakeRange(location, lenght)];
+    [textStr addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x3D95EE) range:NSMakeRange(location, lenght)];
+    [mstr appendAttributedString:textStr];
+    [self.ServiceBtn setAttributedTitle:mstr forState:UIControlStateNormal];
+}
+@end

+ 8 - 16
smartRhino/Project/VCModel/My_Center/Controller/My_CenterVC.m

@@ -12,7 +12,9 @@
 #import "SettingVC.h"
 #import "FavoritesViewController.h"
 #import "MyFavoriteVC.h"
+#import "MyCardVC.h"
 #import "NoteBookVC.h"
+#import "MyAccountVC.h"
 
 @interface My_CenterVC ()<UITableViewDelegate,UITableViewDataSource>
 
@@ -100,12 +102,12 @@
             My_CenterCell *cell = [My_CenterCell configCell1:tableView indexPath:indexPath];
             switch (indexPath.row) {
                 case 0: {
-                    cell.cell1IconImg.image = [UIImage imageNamed:@"my_conter_sc_icon"];
-                    cell.cell1TitleLabel.text = @"收藏";
+                    cell.cell1IconImg.image = [UIImage imageNamed:@"mine_account"];
+                    cell.cell1TitleLabel.text = @"账户";
                 }break;
                 case 1: {
-                    cell.cell1IconImg.image = [UIImage imageNamed:@"my_conter_biji_icon"];
-                    cell.cell1TitleLabel.text = @"笔记";
+                    cell.cell1IconImg.image = [UIImage imageNamed:@"mine_wuxianka"];
+                    cell.cell1TitleLabel.text = @"无限卡";
                 }break;
                 case 2: {
                     cell.cell1IconImg.image = [UIImage imageNamed:@"my_conter_setting_icon"];
@@ -139,22 +141,12 @@
         case 1:{
             switch (indexPath.row) {
                 case 0:{
-                    MyFavoriteVC *vc = [MyFavoriteVC initMyFavoriteVC];
-                    vc.listType = MyFavoriteListLevelTypeA;
-                    vc.FolderId = 0;
-                    vc.operationStateEnum = OperationStateEnum0;
-                    vc.myTitle = @"我的收藏";
+                    MyAccountVC *vc = [MyAccountVC initMyAccountVC];
                     vc.hidesBottomBarWhenPushed = YES;
                     [self.navigationController pushViewController:vc animated:YES];
-                    
                 }break;
                 case 1:{
-                    NoteBookVC *vc = [NoteBookVC initNoteBookVC];
-                    vc.listType = MyNoteBookListLevelTypeA;
-                    vc.FolderId = 0;
-                    vc.myTitle = @"我的笔记";
-                    vc.VisitUserId = 0;
-                    vc.operationStateEnum = OperationStateEnum0;
+                    MyCardVC * vc = [MyCardVC initMyCardVC];
                     vc.hidesBottomBarWhenPushed = YES;
                     [self.navigationController pushViewController:vc animated:YES];
                 }break;

+ 2 - 2
smartRhino/Project/VCModel/My_Center/Controller/NoteBook/Controller/NoteBookVC.m

@@ -41,7 +41,7 @@
 @property (weak, nonatomic) IBOutlet UIView *searchView;
 @property (weak, nonatomic) IBOutlet UIButton *searchButton;
 @property (weak, nonatomic) IBOutlet UIButton *operationAllSelectButton;
-@property (strong,nonatomic) NSMutableArray *taskActionArray;
+
 @property (weak, nonatomic) IBOutlet UILabel *vcTitleLabel;
 @property (strong,nonatomic) NSMutableArray <MyNoteBookSubModel *>*noteBookArray;
 @property (nonatomic, assign) Boolean isFresh;
@@ -51,7 +51,7 @@
 @property (nonatomic,assign) BOOL iSViewEditor;
 @property (nonatomic,assign) BOOL isAllselect;
 @property (nonatomic,assign) BOOL isRefresh;
-
+@property (strong,nonatomic) NSMutableArray *taskActionArray;
 @property (nonatomic,strong) UIView * operationBottomBgView;
 @property(strong,nonatomic)UIImageView *cellImage;
 @property(strong,nonatomic)NSIndexPath *currentPath;

+ 1 - 1
smartRhino/Project/VCModel/My_Center/Controller/NoteBook/NoteBook.storyboard

@@ -138,7 +138,7 @@
                                         <rect key="frame" x="10" y="40" width="355" height="30"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cfK-V4-OzS">
-                                                <rect key="frame" x="151" y="3" width="53" height="24"/>
+                                                <rect key="frame" x="157" y="6.5" width="41" height="17"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <inset key="imageEdgeInsets" minX="-6.5" minY="0.0" maxX="0.0" maxY="0.0"/>
                                                 <state key="normal" title="搜索" image="chatmsg_search_icon">

+ 502 - 1
smartRhino/Project/VCModel/My_Center/My_Center.storyboard

@@ -160,7 +160,7 @@
         <!--Edit User NickVC-->
         <scene sceneID="VBi-UY-MmP">
             <objects>
-                <viewController storyboardIdentifier="EditUserNickVC" useStoryboardIdentifierAsRestorationIdentifier="YES" id="sAs-dl-6Wl" customClass="EditUserNickVC" customModule="灵犀办公" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="EditUserNickVC" useStoryboardIdentifierAsRestorationIdentifier="YES" id="sAs-dl-6Wl" customClass="EditUserNickVC" customModule="泰德信源" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="c2P-O2-xPN">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -935,10 +935,511 @@
             </objects>
             <point key="canvasLocation" x="-1884" y="488"/>
         </scene>
+        <!--My AccountVC-->
+        <scene sceneID="LR7-mn-sJ2">
+            <objects>
+                <viewController storyboardIdentifier="MyAccountVC" id="5to-lX-YNX" customClass="MyAccountVC" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="EeA-dM-LvM">
+                        <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="Pny-FY-R2I" customClass="WQNavigationBar">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="s0t-o0-sLx">
+                                        <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="6dn-Fp-Y9u">
+                                                <rect key="frame" x="0.0" y="0.0" width="50" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="44" id="xRu-fg-wxa"/>
+                                                    <constraint firstAttribute="width" constant="50" id="zaN-Dv-QuT"/>
+                                                </constraints>
+                                                <state key="normal" image="back_black_icon"/>
+                                                <connections>
+                                                    <action selector="backAction:" destination="5to-lX-YNX" eventType="touchUpInside" id="K92-Ih-0KR"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2Fw-on-bpt">
+                                                <rect key="frame" x="50" y="0.0" width="35" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="44" id="3Xy-2u-nFm"/>
+                                                    <constraint firstAttribute="width" constant="35" id="FQy-ed-0PV"/>
+                                                </constraints>
+                                                <state key="normal" image="menu_black_icon"/>
+                                                <connections>
+                                                    <action selector="menuAction:" destination="5to-lX-YNX" eventType="touchUpInside" id="jNO-EA-fwu"/>
+                                                </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="z9j-hQ-h8C">
+                                                <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>
+                                        </subviews>
+                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstItem="z9j-hQ-h8C" firstAttribute="centerY" secondItem="6dn-Fp-Y9u" secondAttribute="centerY" id="0kQ-u0-bkz"/>
+                                            <constraint firstItem="2Fw-on-bpt" firstAttribute="bottom" secondItem="6dn-Fp-Y9u" secondAttribute="bottom" id="RQR-rm-UFq"/>
+                                            <constraint firstItem="6dn-Fp-Y9u" firstAttribute="leading" secondItem="s0t-o0-sLx" secondAttribute="leading" id="VZ0-Yw-uxy"/>
+                                            <constraint firstItem="2Fw-on-bpt" firstAttribute="top" secondItem="6dn-Fp-Y9u" secondAttribute="top" id="a9x-Wf-9Ja"/>
+                                            <constraint firstItem="z9j-hQ-h8C" firstAttribute="centerX" secondItem="s0t-o0-sLx" secondAttribute="centerX" id="ak0-e4-EwL"/>
+                                            <constraint firstAttribute="bottom" secondItem="6dn-Fp-Y9u" secondAttribute="bottom" id="ktI-Ef-dSi"/>
+                                            <constraint firstItem="2Fw-on-bpt" firstAttribute="leading" secondItem="6dn-Fp-Y9u" secondAttribute="trailing" id="rug-SV-zer"/>
+                                            <constraint firstAttribute="height" constant="44" id="zal-76-ay4"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="s0t-o0-sLx" secondAttribute="bottom" id="JzH-WF-hsK"/>
+                                    <constraint firstAttribute="height" constant="64" id="Nic-f6-DoQ"/>
+                                    <constraint firstItem="s0t-o0-sLx" firstAttribute="leading" secondItem="Pny-FY-R2I" secondAttribute="leading" id="WGb-pe-yGt"/>
+                                    <constraint firstItem="s0t-o0-sLx" firstAttribute="trailing" secondItem="Pny-FY-R2I" secondAttribute="trailing" id="bEv-Ge-HRC"/>
+                                </constraints>
+                                <connections>
+                                    <outlet property="height" destination="Nic-f6-DoQ" id="lZS-zD-m5B"/>
+                                </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="VAX-EZ-sps">
+                                <rect key="frame" x="0.0" y="66" width="414" height="670"/>
+                                <color key="backgroundColor" red="0.96862745098039216" green="0.96862745098039216" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </tableView>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="7cJ-Wx-rhg" firstAttribute="trailing" secondItem="VAX-EZ-sps" secondAttribute="trailing" id="3l3-kM-OiP"/>
+                            <constraint firstItem="Pny-FY-R2I" firstAttribute="leading" secondItem="7cJ-Wx-rhg" secondAttribute="leading" id="EXG-Y2-vky"/>
+                            <constraint firstItem="Pny-FY-R2I" firstAttribute="top" secondItem="EeA-dM-LvM" secondAttribute="top" id="F7S-b8-024"/>
+                            <constraint firstItem="Pny-FY-R2I" firstAttribute="trailing" secondItem="7cJ-Wx-rhg" secondAttribute="trailing" id="K3I-zN-mk2"/>
+                            <constraint firstItem="VAX-EZ-sps" firstAttribute="leading" secondItem="7cJ-Wx-rhg" secondAttribute="leading" id="LDl-ja-f2z"/>
+                            <constraint firstItem="7cJ-Wx-rhg" firstAttribute="bottom" secondItem="VAX-EZ-sps" secondAttribute="bottom" id="ZSv-4A-gxD"/>
+                            <constraint firstItem="VAX-EZ-sps" firstAttribute="top" secondItem="Pny-FY-R2I" secondAttribute="bottom" constant="2" id="qfw-I0-gcT"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="7cJ-Wx-rhg"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="8Dp-dL-rAr"/>
+                    <connections>
+                        <outlet property="tableView" destination="VAX-EZ-sps" id="RvM-qP-akF"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="UI7-6N-Akn" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-1884" y="1186"/>
+        </scene>
+        <!--My CardVC-->
+        <scene sceneID="1aE-Ao-r1H">
+            <objects>
+                <viewController storyboardIdentifier="MyCardVC" id="OKW-zf-5fC" customClass="MyCardVC" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="MYA-Bm-SCg">
+                        <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="YRa-Mq-iHH" customClass="WQNavigationBar">
+                                <rect key="frame" x="0.0" y="0.0" width="414" height="64"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="S3i-BE-OD9">
+                                        <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="hJE-at-geZ">
+                                                <rect key="frame" x="0.0" y="0.0" width="50" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="50" id="YWn-Ju-MUH"/>
+                                                    <constraint firstAttribute="height" constant="44" id="wyW-rQ-uaN"/>
+                                                </constraints>
+                                                <state key="normal" image="back_black_icon"/>
+                                                <connections>
+                                                    <action selector="backAction:" destination="OKW-zf-5fC" eventType="touchUpInside" id="jRW-Vc-c7a"/>
+                                                </connections>
+                                            </button>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ng7-eU-0VI">
+                                                <rect key="frame" x="50" y="0.0" width="35" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="width" constant="35" id="Rxc-SN-UUj"/>
+                                                    <constraint firstAttribute="height" constant="44" id="Yfr-xW-TkJ"/>
+                                                </constraints>
+                                                <state key="normal" image="menu_black_icon"/>
+                                                <connections>
+                                                    <action selector="menuAction:" destination="OKW-zf-5fC" eventType="touchUpInside" id="EaP-OB-RPS"/>
+                                                </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="DFS-Ff-mWl">
+                                                <rect key="frame" x="161" y="11.33333333333333" width="92" height="21.666666666666671"/>
+                                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                                <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
+                                                <nil key="highlightedColor"/>
+                                            </label>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jsx-wp-kfs">
+                                                <rect key="frame" x="334" y="0.0" width="80" height="44"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="44" id="TfV-x7-Eib"/>
+                                                    <constraint firstAttribute="width" constant="80" id="kuu-yI-CYq"/>
+                                                </constraints>
+                                                <state key="normal" title="明细记录">
+                                                    <color key="titleColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
+                                                </state>
+                                            </button>
+                                        </subviews>
+                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <constraints>
+                                            <constraint firstItem="DFS-Ff-mWl" firstAttribute="centerY" secondItem="hJE-at-geZ" secondAttribute="centerY" id="HPn-a5-f6S"/>
+                                            <constraint firstAttribute="bottom" secondItem="hJE-at-geZ" secondAttribute="bottom" id="Hhn-eS-XOv"/>
+                                            <constraint firstItem="hJE-at-geZ" firstAttribute="leading" secondItem="S3i-BE-OD9" secondAttribute="leading" id="JsW-0s-fd0"/>
+                                            <constraint firstItem="Ng7-eU-0VI" firstAttribute="leading" secondItem="hJE-at-geZ" secondAttribute="trailing" id="Nph-Gf-axy"/>
+                                            <constraint firstAttribute="height" constant="44" id="fDj-hK-l0K"/>
+                                            <constraint firstItem="Ng7-eU-0VI" firstAttribute="top" secondItem="hJE-at-geZ" secondAttribute="top" id="gNz-fL-OCy"/>
+                                            <constraint firstItem="Ng7-eU-0VI" firstAttribute="bottom" secondItem="hJE-at-geZ" secondAttribute="bottom" id="pBS-DO-x2e"/>
+                                            <constraint firstItem="DFS-Ff-mWl" firstAttribute="centerX" secondItem="S3i-BE-OD9" secondAttribute="centerX" id="wfb-5M-pSF"/>
+                                            <constraint firstAttribute="bottom" secondItem="jsx-wp-kfs" secondAttribute="bottom" id="xVR-ec-ELp"/>
+                                            <constraint firstAttribute="trailing" secondItem="jsx-wp-kfs" secondAttribute="trailing" id="zpg-R8-cga"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="bottom" secondItem="S3i-BE-OD9" secondAttribute="bottom" id="2jj-vl-Bda"/>
+                                    <constraint firstAttribute="height" constant="64" id="D5e-m6-9XZ"/>
+                                    <constraint firstItem="S3i-BE-OD9" firstAttribute="trailing" secondItem="YRa-Mq-iHH" secondAttribute="trailing" id="LGG-0c-qy2"/>
+                                    <constraint firstItem="S3i-BE-OD9" firstAttribute="leading" secondItem="YRa-Mq-iHH" secondAttribute="leading" id="nKa-Ug-EO9"/>
+                                </constraints>
+                                <connections>
+                                    <outlet property="height" destination="D5e-m6-9XZ" id="rZ9-R8-jUC"/>
+                                </connections>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="880-aj-kOc">
+                                <rect key="frame" x="0.0" y="79" width="414" height="190"/>
+                                <subviews>
+                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_cardBg_icon" translatesAutoresizingMaskIntoConstraints="NO" id="rOV-Gn-kOt">
+                                        <rect key="frame" x="16" y="0.0" width="382" height="190"/>
+                                    </imageView>
+                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_card_icon" translatesAutoresizingMaskIntoConstraints="NO" id="jUy-GE-CvN">
+                                        <rect key="frame" x="38.000000000000007" y="150" width="83.666666666666686" height="19"/>
+                                    </imageView>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张浩清" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Ya-Ba-aaN">
+                                        <rect key="frame" x="38" y="25" width="67" height="26.333333333333329"/>
+                                        <fontDescription key="fontDescription" type="boldSystem" pointSize="22"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sdz-Jv-weg">
+                                        <rect key="frame" x="338" y="26.333333333333329" width="60" height="24"/>
+                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="60" id="O4L-lN-u7l"/>
+                                            <constraint firstAttribute="height" constant="24" id="qbx-od-ivD"/>
+                                        </constraints>
+                                    </view>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  免费试用 · 5月28日好奇   " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dtr-88-9HH">
+                                        <rect key="frame" x="261.66666666666669" y="31.666666666666668" width="136.33333333333331" height="13.333333333333332"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstItem="sdz-Jv-weg" firstAttribute="centerY" secondItem="8Ya-Ba-aaN" secondAttribute="centerY" id="5pS-f6-C3L"/>
+                                    <constraint firstAttribute="trailing" secondItem="sdz-Jv-weg" secondAttribute="trailing" constant="16" id="66A-By-VMV"/>
+                                    <constraint firstItem="jUy-GE-CvN" firstAttribute="leading" secondItem="880-aj-kOc" secondAttribute="leading" constant="38" id="95F-Mg-jp4"/>
+                                    <constraint firstAttribute="height" constant="190" id="Ea4-mh-U73"/>
+                                    <constraint firstItem="rOV-Gn-kOt" firstAttribute="top" secondItem="880-aj-kOc" secondAttribute="top" id="HlT-FB-kXv"/>
+                                    <constraint firstAttribute="bottom" secondItem="jUy-GE-CvN" secondAttribute="bottom" constant="21" id="Ml0-lK-26u"/>
+                                    <constraint firstItem="dtr-88-9HH" firstAttribute="trailing" secondItem="sdz-Jv-weg" secondAttribute="trailing" id="XcH-La-F2L"/>
+                                    <constraint firstItem="dtr-88-9HH" firstAttribute="centerY" secondItem="sdz-Jv-weg" secondAttribute="centerY" id="YWd-OO-lQq"/>
+                                    <constraint firstAttribute="bottom" secondItem="rOV-Gn-kOt" secondAttribute="bottom" id="d0X-tX-IKC"/>
+                                    <constraint firstAttribute="trailing" secondItem="rOV-Gn-kOt" secondAttribute="trailing" constant="16" id="f3Y-dp-7Vn"/>
+                                    <constraint firstItem="8Ya-Ba-aaN" firstAttribute="leading" secondItem="880-aj-kOc" secondAttribute="leading" constant="38" id="i17-jh-nUm"/>
+                                    <constraint firstItem="8Ya-Ba-aaN" firstAttribute="top" secondItem="880-aj-kOc" secondAttribute="top" constant="25" id="kdl-QE-7Aj"/>
+                                    <constraint firstItem="rOV-Gn-kOt" firstAttribute="leading" secondItem="880-aj-kOc" secondAttribute="leading" constant="16" id="y1g-Ej-dEI"/>
+                                </constraints>
+                            </view>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cd0-8N-JRa">
+                                <rect key="frame" x="16" y="293" width="382" height="190"/>
+                                <subviews>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Bfv-7L-o0r">
+                                        <rect key="frame" x="0.0" y="0.0" width="382" height="40"/>
+                                        <color key="backgroundColor" red="0.45098039220000002" green="0.72549019609999998" blue="0.91764705879999997" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="40" id="dbP-eq-eLa"/>
+                                        </constraints>
+                                    </view>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="无限卡权益" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Q1-Vz-Vx5">
+                                        <rect key="frame" x="22.000000000000004" y="13" width="61.333333333333343" height="14.333333333333336"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Sz-8f-e2f">
+                                        <rect key="frame" x="0.0" y="40" width="382" height="150"/>
+                                        <subviews>
+                                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" baselineRelativeArrangement="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5fs-ov-IuR">
+                                                <rect key="frame" x="7" y="0.0" width="368" height="150"/>
+                                                <subviews>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uHo-kb-QW9">
+                                                        <rect key="frame" x="0.0" y="0.0" width="92" height="150"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_book_icon" translatesAutoresizingMaskIntoConstraints="NO" id="why-si-uwb">
+                                                                <rect key="frame" x="20.333333333333339" y="27.999999999999996" width="51.666666666666657" height="51.666666666666657"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全场出版书" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ebh-N6-pcb">
+                                                                <rect key="frame" x="18.000000000000004" y="92.666666666666686" width="56.333333333333343" height="13.333333333333329"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                                <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="免费读" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WRN-kw-55P">
+                                                                <rect key="frame" x="29" y="114" width="34" height="13.333333333333329"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                                <color key="textColor" red="0.79607843137254897" green="0.55294117647058827" blue="0.12549019607843137" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4hw-tI-RCh">
+                                                                <rect key="frame" x="0.0" y="0.0" width="92" height="150"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="WRN-kw-55P" firstAttribute="top" secondItem="ebh-N6-pcb" secondAttribute="bottom" constant="8" id="0Vz-yy-y1d"/>
+                                                            <constraint firstItem="4hw-tI-RCh" firstAttribute="leading" secondItem="uHo-kb-QW9" secondAttribute="leading" id="2IL-jU-3Sx"/>
+                                                            <constraint firstItem="why-si-uwb" firstAttribute="top" secondItem="uHo-kb-QW9" secondAttribute="top" constant="28" id="80M-Gg-Leq"/>
+                                                            <constraint firstAttribute="trailing" secondItem="4hw-tI-RCh" secondAttribute="trailing" id="A5j-WL-YB9"/>
+                                                            <constraint firstItem="4hw-tI-RCh" firstAttribute="top" secondItem="uHo-kb-QW9" secondAttribute="top" id="DY9-Mq-PMm"/>
+                                                            <constraint firstItem="why-si-uwb" firstAttribute="centerX" secondItem="uHo-kb-QW9" secondAttribute="centerX" id="YEU-oK-8Od"/>
+                                                            <constraint firstItem="WRN-kw-55P" firstAttribute="centerX" secondItem="uHo-kb-QW9" secondAttribute="centerX" id="gm8-yF-fzP"/>
+                                                            <constraint firstItem="ebh-N6-pcb" firstAttribute="top" secondItem="why-si-uwb" secondAttribute="bottom" constant="13" id="hPD-Eu-Jnj"/>
+                                                            <constraint firstAttribute="bottom" secondItem="4hw-tI-RCh" secondAttribute="bottom" id="jv2-t1-4cz"/>
+                                                            <constraint firstItem="ebh-N6-pcb" firstAttribute="centerX" secondItem="uHo-kb-QW9" secondAttribute="centerX" id="oiQ-Np-0Ec"/>
+                                                        </constraints>
+                                                    </view>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5rR-Nn-MCG">
+                                                        <rect key="frame" x="92" y="0.0" width="92" height="150"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_ting_icon" translatesAutoresizingMaskIntoConstraints="NO" id="BSt-ax-i34">
+                                                                <rect key="frame" x="20.333333333333339" y="27.999999999999996" width="51.666666666666657" height="51.666666666666657"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全场有声内容" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Hj7-sQ-TgQ">
+                                                                <rect key="frame" x="12.333333333333329" y="92.666666666666686" width="67.666666666666671" height="13.333333333333329"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                                <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="免费听" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tti-oC-eeR">
+                                                                <rect key="frame" x="29" y="114" width="34" height="13.333333333333329"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                                <color key="textColor" red="0.79607843137254897" green="0.55294117647058827" blue="0.12549019607843137" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="YVw-3F-tAM">
+                                                                <rect key="frame" x="0.0" y="0.0" width="92" height="150"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="YVw-3F-tAM" firstAttribute="top" secondItem="5rR-Nn-MCG" secondAttribute="top" id="9Dj-PB-RPx"/>
+                                                            <constraint firstItem="tti-oC-eeR" firstAttribute="centerX" secondItem="5rR-Nn-MCG" secondAttribute="centerX" id="K0F-IC-R10"/>
+                                                            <constraint firstAttribute="bottom" secondItem="YVw-3F-tAM" secondAttribute="bottom" id="LhK-Aw-2Wo"/>
+                                                            <constraint firstItem="Hj7-sQ-TgQ" firstAttribute="top" secondItem="BSt-ax-i34" secondAttribute="bottom" constant="13" id="McM-nr-UFu"/>
+                                                            <constraint firstItem="Hj7-sQ-TgQ" firstAttribute="centerX" secondItem="5rR-Nn-MCG" secondAttribute="centerX" id="RB9-8H-7r1"/>
+                                                            <constraint firstItem="BSt-ax-i34" firstAttribute="top" secondItem="5rR-Nn-MCG" secondAttribute="top" constant="28" id="fEq-BY-BDe"/>
+                                                            <constraint firstItem="BSt-ax-i34" firstAttribute="centerX" secondItem="5rR-Nn-MCG" secondAttribute="centerX" id="miO-YQ-fXQ"/>
+                                                            <constraint firstItem="YVw-3F-tAM" firstAttribute="leading" secondItem="5rR-Nn-MCG" secondAttribute="leading" id="rZg-15-5pD"/>
+                                                            <constraint firstItem="tti-oC-eeR" firstAttribute="top" secondItem="Hj7-sQ-TgQ" secondAttribute="bottom" constant="8" id="sM0-VF-Ebk"/>
+                                                            <constraint firstAttribute="trailing" secondItem="YVw-3F-tAM" secondAttribute="trailing" id="w5d-XE-PXY"/>
+                                                        </constraints>
+                                                    </view>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3qQ-6U-dBj">
+                                                        <rect key="frame" x="184" y="0.0" width="92" height="150"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_man_icon" translatesAutoresizingMaskIntoConstraints="NO" id="ezG-Ut-aS8">
+                                                                <rect key="frame" x="20.333333333333339" y="27.999999999999996" width="51.666666666666657" height="51.666666666666657"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全场漫画书" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bqx-n0-W9U">
+                                                                <rect key="frame" x="18.000000000000004" y="92.666666666666686" width="56.333333333333343" height="13.333333333333329"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                                <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="免费看" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Dt-5L-XII">
+                                                                <rect key="frame" x="29" y="114" width="34" height="13.333333333333329"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                                <color key="textColor" red="0.79607843137254897" green="0.55294117647058827" blue="0.12549019607843137" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xwe-SX-ORB">
+                                                                <rect key="frame" x="0.0" y="0.0" width="92" height="150"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="xwe-SX-ORB" firstAttribute="leading" secondItem="3qQ-6U-dBj" secondAttribute="leading" id="0QL-jX-RLu"/>
+                                                            <constraint firstAttribute="bottom" secondItem="xwe-SX-ORB" secondAttribute="bottom" id="NnU-UQ-k4f"/>
+                                                            <constraint firstItem="Bqx-n0-W9U" firstAttribute="centerX" secondItem="3qQ-6U-dBj" secondAttribute="centerX" id="NzP-5r-Epo"/>
+                                                            <constraint firstAttribute="trailing" secondItem="xwe-SX-ORB" secondAttribute="trailing" id="ekZ-Ds-6sv"/>
+                                                            <constraint firstItem="Bqx-n0-W9U" firstAttribute="top" secondItem="ezG-Ut-aS8" secondAttribute="bottom" constant="13" id="fJ9-21-ixK"/>
+                                                            <constraint firstItem="ezG-Ut-aS8" firstAttribute="top" secondItem="3qQ-6U-dBj" secondAttribute="top" constant="28" id="gNL-s8-r7N"/>
+                                                            <constraint firstItem="2Dt-5L-XII" firstAttribute="top" secondItem="Bqx-n0-W9U" secondAttribute="bottom" constant="8" id="gTc-UO-x4l"/>
+                                                            <constraint firstItem="2Dt-5L-XII" firstAttribute="centerX" secondItem="3qQ-6U-dBj" secondAttribute="centerX" id="kYJ-v2-diz"/>
+                                                            <constraint firstItem="xwe-SX-ORB" firstAttribute="top" secondItem="3qQ-6U-dBj" secondAttribute="top" id="lR2-sa-la0"/>
+                                                            <constraint firstItem="ezG-Ut-aS8" firstAttribute="centerX" secondItem="3qQ-6U-dBj" secondAttribute="centerX" id="syv-V7-Hb2"/>
+                                                        </constraints>
+                                                    </view>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Pe2-Kx-nIg">
+                                                        <rect key="frame" x="276" y="0.0" width="92" height="150"/>
+                                                        <subviews>
+                                                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="mine_net_icon" translatesAutoresizingMaskIntoConstraints="NO" id="FtO-B8-p07">
+                                                                <rect key="frame" x="20.333333333333311" y="27.999999999999996" width="51.666666666666657" height="51.666666666666657"/>
+                                                            </imageView>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="全场网络小说" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="csa-sb-aVp">
+                                                                <rect key="frame" x="12.333333333333314" y="92.666666666666686" width="67.666666666666671" height="13.333333333333329"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                                <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="八折购买" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QWL-Bm-vdF">
+                                                                <rect key="frame" x="23.666666666666686" y="114" width="45" height="13.333333333333329"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                                                <color key="textColor" red="0.79607843137254897" green="0.55294117647058827" blue="0.12549019607843137" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jVl-SD-0YR">
+                                                                <rect key="frame" x="0.0" y="0.0" width="92" height="150"/>
+                                                                <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <state key="normal">
+                                                                    <color key="titleColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                </state>
+                                                            </button>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="csa-sb-aVp" firstAttribute="top" secondItem="FtO-B8-p07" secondAttribute="bottom" constant="13" id="4vH-pd-e3d"/>
+                                                            <constraint firstItem="jVl-SD-0YR" firstAttribute="leading" secondItem="Pe2-Kx-nIg" secondAttribute="leading" id="6Kz-qI-boZ"/>
+                                                            <constraint firstItem="FtO-B8-p07" firstAttribute="centerX" secondItem="Pe2-Kx-nIg" secondAttribute="centerX" id="8ab-TN-Hd9"/>
+                                                            <constraint firstItem="csa-sb-aVp" firstAttribute="centerX" secondItem="Pe2-Kx-nIg" secondAttribute="centerX" id="8wa-jc-F5e"/>
+                                                            <constraint firstItem="QWL-Bm-vdF" firstAttribute="top" secondItem="csa-sb-aVp" secondAttribute="bottom" constant="8" id="BvL-f4-nRI"/>
+                                                            <constraint firstItem="QWL-Bm-vdF" firstAttribute="centerX" secondItem="Pe2-Kx-nIg" secondAttribute="centerX" id="Eqk-as-ig6"/>
+                                                            <constraint firstAttribute="bottom" secondItem="jVl-SD-0YR" secondAttribute="bottom" id="G24-SA-0iv"/>
+                                                            <constraint firstAttribute="trailing" secondItem="jVl-SD-0YR" secondAttribute="trailing" id="KZ8-pg-dB3"/>
+                                                            <constraint firstItem="FtO-B8-p07" firstAttribute="top" secondItem="Pe2-Kx-nIg" secondAttribute="top" constant="28" id="N1N-eI-tV5"/>
+                                                            <constraint firstItem="jVl-SD-0YR" firstAttribute="top" secondItem="Pe2-Kx-nIg" secondAttribute="top" id="gb9-gf-ct5"/>
+                                                        </constraints>
+                                                    </view>
+                                                </subviews>
+                                            </stackView>
+                                        </subviews>
+                                        <color key="backgroundColor" red="0.94901960784313721" green="0.97647058823529409" blue="0.99607843137254903" alpha="1" colorSpace="calibratedRGB"/>
+                                        <constraints>
+                                            <constraint firstAttribute="trailing" secondItem="5fs-ov-IuR" secondAttribute="trailing" constant="7" id="7Rc-GN-nvW"/>
+                                            <constraint firstAttribute="bottom" secondItem="5fs-ov-IuR" secondAttribute="bottom" id="C4J-rc-Qvb"/>
+                                            <constraint firstItem="5fs-ov-IuR" firstAttribute="leading" secondItem="7Sz-8f-e2f" secondAttribute="leading" constant="7" id="Zuh-xw-yZN"/>
+                                            <constraint firstItem="5fs-ov-IuR" firstAttribute="top" secondItem="7Sz-8f-e2f" secondAttribute="top" id="hhM-ti-nEz"/>
+                                        </constraints>
+                                    </view>
+                                </subviews>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <constraints>
+                                    <constraint firstItem="Bfv-7L-o0r" firstAttribute="top" secondItem="Cd0-8N-JRa" secondAttribute="top" id="0pK-kJ-Nm1"/>
+                                    <constraint firstItem="Bfv-7L-o0r" firstAttribute="leading" secondItem="Cd0-8N-JRa" secondAttribute="leading" id="3OY-zK-3Kp"/>
+                                    <constraint firstItem="8Q1-Vz-Vx5" firstAttribute="centerY" secondItem="Bfv-7L-o0r" secondAttribute="centerY" id="7Cy-L1-5Rc"/>
+                                    <constraint firstItem="7Sz-8f-e2f" firstAttribute="leading" secondItem="Cd0-8N-JRa" secondAttribute="leading" id="D29-Xy-gUE"/>
+                                    <constraint firstItem="8Q1-Vz-Vx5" firstAttribute="leading" secondItem="Cd0-8N-JRa" secondAttribute="leading" constant="22" id="FlN-nC-yAm"/>
+                                    <constraint firstAttribute="trailing" secondItem="7Sz-8f-e2f" secondAttribute="trailing" id="Hpu-0f-meD"/>
+                                    <constraint firstAttribute="bottom" secondItem="7Sz-8f-e2f" secondAttribute="bottom" id="I34-i3-Grm"/>
+                                    <constraint firstItem="7Sz-8f-e2f" firstAttribute="top" secondItem="Bfv-7L-o0r" secondAttribute="bottom" id="RIO-SA-sTm"/>
+                                    <constraint firstAttribute="trailing" secondItem="Bfv-7L-o0r" secondAttribute="trailing" id="hcb-Uo-6nM"/>
+                                    <constraint firstAttribute="height" constant="190" id="u9c-C8-7NL"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="15"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                                </userDefinedRuntimeAttributes>
+                            </view>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7gM-9Y-SKG">
+                                <rect key="frame" x="16" y="505" width="382" height="48"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="48" id="OQX-AR-7Xr"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="升级为付费会员">
+                                    <color key="titleColor" red="0.30980392156862746" green="0.22745098039215686" blue="0.098039215686274508" alpha="1" colorSpace="calibratedRGB"/>
+                                </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                        <integer key="value" value="12"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vaq-lg-JqA">
+                                <rect key="frame" x="119.66666666666669" y="693" width="175" height="27"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                <state key="normal" title="已阅读并同意 会员订阅服务条款">
+                                    <color key="titleColor" red="0.15686274509803921" green="0.17254901960784313" blue="0.23529411764705882" alpha="1" colorSpace="calibratedRGB"/>
+                                </state>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="Cd0-8N-JRa" firstAttribute="top" secondItem="880-aj-kOc" secondAttribute="bottom" constant="24" id="9br-y2-KJL"/>
+                            <constraint firstItem="Cd0-8N-JRa" firstAttribute="leading" secondItem="k9U-pt-157" secondAttribute="leading" constant="16" id="Gec-aF-Qb7"/>
+                            <constraint firstItem="7gM-9Y-SKG" firstAttribute="leading" secondItem="k9U-pt-157" secondAttribute="leading" constant="16" id="JYm-yF-hNJ"/>
+                            <constraint firstItem="k9U-pt-157" firstAttribute="trailing" secondItem="7gM-9Y-SKG" secondAttribute="trailing" constant="16" id="M4L-8I-t52"/>
+                            <constraint firstItem="880-aj-kOc" firstAttribute="top" secondItem="YRa-Mq-iHH" secondAttribute="bottom" constant="15" id="Yg1-xL-Zdz"/>
+                            <constraint firstItem="YRa-Mq-iHH" firstAttribute="leading" secondItem="k9U-pt-157" secondAttribute="leading" id="ahX-FA-99T"/>
+                            <constraint firstItem="880-aj-kOc" firstAttribute="leading" secondItem="k9U-pt-157" secondAttribute="leading" id="hSy-wp-ZU5"/>
+                            <constraint firstItem="k9U-pt-157" firstAttribute="trailing" secondItem="Cd0-8N-JRa" secondAttribute="trailing" constant="16" id="hsm-0p-F7T"/>
+                            <constraint firstItem="k9U-pt-157" firstAttribute="bottom" secondItem="vaq-lg-JqA" secondAttribute="bottom" constant="16" id="iuM-pK-rOR"/>
+                            <constraint firstItem="7gM-9Y-SKG" firstAttribute="top" secondItem="Cd0-8N-JRa" secondAttribute="bottom" constant="22" id="jY1-Wj-EIL"/>
+                            <constraint firstItem="YRa-Mq-iHH" firstAttribute="top" secondItem="MYA-Bm-SCg" secondAttribute="top" id="kWa-Fb-aSf"/>
+                            <constraint firstItem="YRa-Mq-iHH" firstAttribute="trailing" secondItem="k9U-pt-157" secondAttribute="trailing" id="lla-Cl-VSt"/>
+                            <constraint firstItem="880-aj-kOc" firstAttribute="trailing" secondItem="k9U-pt-157" secondAttribute="trailing" id="pHr-Av-ptN"/>
+                            <constraint firstItem="vaq-lg-JqA" firstAttribute="centerX" secondItem="MYA-Bm-SCg" secondAttribute="centerX" id="tpJ-u9-dRF"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="k9U-pt-157"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="f1G-xl-vCS"/>
+                    <connections>
+                        <outlet property="BookBtn" destination="4hw-tI-RCh" id="3nC-cG-Aa2"/>
+                        <outlet property="ListenBtn" destination="YVw-3F-tAM" id="UJv-dv-fIe"/>
+                        <outlet property="ManBtn" destination="xwe-SX-ORB" id="fwi-Ur-TA0"/>
+                        <outlet property="NameL" destination="8Ya-Ba-aaN" id="5Uw-pY-jtZ"/>
+                        <outlet property="NetBtn" destination="jVl-SD-0YR" id="0Dl-6C-2mW"/>
+                        <outlet property="PayBtn" destination="7gM-9Y-SKG" id="4rK-1J-T8t"/>
+                        <outlet property="ServiceBtn" destination="vaq-lg-JqA" id="KpW-va-yAY"/>
+                        <outlet property="rightBtn" destination="jsx-wp-kfs" id="zax-TF-FQJ"/>
+                        <outlet property="subTitleView" destination="Bfv-7L-o0r" id="Gs8-PL-Wjw"/>
+                        <outlet property="timeConstant" destination="O4L-lN-u7l" id="StZ-nH-aiq"/>
+                        <outlet property="timeL" destination="dtr-88-9HH" id="IDv-CC-wuI"/>
+                        <outlet property="timeView" destination="sdz-Jv-weg" id="I0I-0B-8oK"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="p1P-kS-T7Y" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-1130.4347826086957" y="1184.5108695652175"/>
+        </scene>
     </scenes>
     <resources>
         <image name="back_black_icon" width="11" height="20"/>
         <image name="menu_black_icon" width="16.666666030883789" height="14.666666984558105"/>
+        <image name="mine_book_icon" width="51.666667938232422" height="51.666667938232422"/>
+        <image name="mine_cardBg_icon" width="343" height="190"/>
+        <image name="mine_card_icon" width="83.666664123535156" height="19"/>
+        <image name="mine_man_icon" width="51.666667938232422" height="51.666667938232422"/>
+        <image name="mine_net_icon" width="51.666667938232422" height="51.666667938232422"/>
+        <image name="mine_ting_icon" width="51.666667938232422" height="51.666667938232422"/>
         <image name="my_edit_phoneOrEmail_icon" width="50.666667938232422" height="85.666664123535156"/>
         <image name="my_qrcode_share_icon" width="19" height="17.666666030883789"/>
         <image name="my_qrcode_testcode" width="175" height="175"/>

+ 21 - 0
smartRhino/Project/VCModel/My_Center/View/MyAccountCell.h

@@ -0,0 +1,21 @@
+//
+//  MyAccountCell.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/4/29.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MyAccountCell : UITableViewCell
+@property (weak, nonatomic) IBOutlet UILabel *titleL;
+@property (weak, nonatomic) IBOutlet UILabel *moneyL;
+@property (weak, nonatomic) IBOutlet UILabel *timeL;
++ (CGFloat)configCellHeight;
++ (MyAccountCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
+@end
+
+NS_ASSUME_NONNULL_END

+ 35 - 0
smartRhino/Project/VCModel/My_Center/View/MyAccountCell.m

@@ -0,0 +1,35 @@
+//
+//  MyAccountCell.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/4/29.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "MyAccountCell.h"
+
+@implementation MyAccountCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
++ (CGFloat)configCellHeight{
+    return 98;
+}
++ (MyAccountCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{
+    static NSString *cellIdentifer = @"MyAccountCell";
+    MyAccountCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifer];
+    if (cell == nil || !cell) {
+        cell = [[[NSBundle mainBundle] loadNibNamed:@"MyAccountCell" owner:nil options:nil] objectAtIndex:0];
+    }
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    return cell;
+}
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end

+ 76 - 0
smartRhino/Project/VCModel/My_Center/View/MyAccountCell.xib

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MyAccountCell">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="98"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="98"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wja-tW-zwc">
+                        <rect key="frame" x="7" y="9" width="306" height="89"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3ef-7P-PrA">
+                                <rect key="frame" x="260" y="20" width="31" height="21"/>
+                                <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2020-04-18 23:05" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5nu-gR-7Wz">
+                                <rect key="frame" x="15" y="52.5" width="123.5" height="20"/>
+                                <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="14"/>
+                                <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="人类简史" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Zt-Iv-NEo">
+                                <rect key="frame" x="15" y="18.5" width="68" height="24"/>
+                                <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="17"/>
+                                <color key="textColor" red="0.039215686274509803" green="0.039215686274509803" blue="0.039215686274509803" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <constraints>
+                            <constraint firstItem="5Zt-Iv-NEo" firstAttribute="centerY" secondItem="3ef-7P-PrA" secondAttribute="centerY" id="0Sp-Sh-k0w"/>
+                            <constraint firstItem="5Zt-Iv-NEo" firstAttribute="leading" secondItem="Wja-tW-zwc" secondAttribute="leading" constant="15" id="7j5-pF-Gr8"/>
+                            <constraint firstAttribute="trailing" secondItem="3ef-7P-PrA" secondAttribute="trailing" constant="15" id="A7l-13-pqy"/>
+                            <constraint firstItem="5nu-gR-7Wz" firstAttribute="top" secondItem="5Zt-Iv-NEo" secondAttribute="bottom" constant="10" id="NfR-Ra-HMm"/>
+                            <constraint firstItem="3ef-7P-PrA" firstAttribute="top" secondItem="Wja-tW-zwc" secondAttribute="top" constant="20" id="odM-NJ-cFG"/>
+                            <constraint firstItem="5nu-gR-7Wz" firstAttribute="leading" secondItem="5Zt-Iv-NEo" secondAttribute="leading" id="pqL-5M-uSV"/>
+                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
+                                <real key="value" value="2.5"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
+                        </userDefinedRuntimeAttributes>
+                    </view>
+                </subviews>
+                <color key="backgroundColor" red="0.96862745098039216" green="0.96862745098039216" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                <constraints>
+                    <constraint firstAttribute="trailing" secondItem="Wja-tW-zwc" secondAttribute="trailing" constant="7" id="Hge-1E-SVq"/>
+                    <constraint firstItem="Wja-tW-zwc" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="9" id="J0y-3b-rIF"/>
+                    <constraint firstAttribute="bottom" secondItem="Wja-tW-zwc" secondAttribute="bottom" id="Let-Ah-pp5"/>
+                    <constraint firstItem="Wja-tW-zwc" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="7" id="geV-e6-VaL"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
+            <connections>
+                <outlet property="moneyL" destination="3ef-7P-PrA" id="mnX-CA-DrO"/>
+                <outlet property="timeL" destination="5nu-gR-7Wz" id="4aO-LG-doE"/>
+                <outlet property="titleL" destination="5Zt-Iv-NEo" id="upp-AF-HNS"/>
+            </connections>
+            <point key="canvasLocation" x="137.68115942028987" y="152.67857142857142"/>
+        </tableViewCell>
+    </objects>
+</document>

+ 1 - 1
smartRhino/Project/VCModel/My_Center/View/My_CenterCell.m

@@ -25,7 +25,7 @@
     return 116 + kStatusBarHeight;
 }
 + (CGFloat)configCell1Height{
-    return 47.5;
+    return 48;
 }
 
 + (My_CenterCell *)configCell0:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{

+ 2 - 2
smartRhino/Project/VCModel/My_Center/View/My_CenterCell.xib

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>

+ 27 - 0
smartRhino/Project/VCModel/My_Center/View/PayAlert.h

@@ -0,0 +1,27 @@
+//
+//  PayAlert.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/4/30.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "BSAlertView.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PayAlert : BSAlertView
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (weak, nonatomic) IBOutlet UIButton *AgreementBtn;
+@property (weak, nonatomic) IBOutlet UIView *AlertView;
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *Constant;
+@property (weak, nonatomic) IBOutlet UIButton *disBtn;
+
+
++ (instancetype)share;
+- (void)show;
+- (void)dismiss;
+@end
+
+NS_ASSUME_NONNULL_END

+ 54 - 0
smartRhino/Project/VCModel/My_Center/View/PayAlert.m

@@ -0,0 +1,54 @@
+//
+//  PayAlert.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/4/30.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "PayAlert.h"
+#import "PayAlertCell.h"
+
+static UINib *ViewNib = nil;
+@interface PayAlert()<UITableViewDelegate,UITableViewDataSource>
+@end
+@implementation PayAlert
++ (instancetype)share
+{
+    if (ViewNib == nil) {
+        ViewNib = [UINib nibWithNibName:@"PayAlert" bundle:nil];
+    }
+    PayAlert *alert = [[ViewNib instantiateWithOwner:nil options:nil] lastObject];
+    [alert setFrame:CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT)];
+    alert.bgColor = [UIColor clearColor];
+    alert.tableView.delegate = alert;
+    alert.tableView.dataSource = alert;
+    [alert.disBtn addTarget:alert action:@selector(dismiss) forControlEvents:UIControlEventTouchUpInside];
+    alert.Constant.constant = 190 + 30 + 70 * 3;
+    [alert.tableView reloadData];
+    return alert;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return 3;
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [PayAlertCell configCellHeight];
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    PayAlertCell * cell = [PayAlertCell configCell:tableView indexPath:indexPath];
+    return cell;
+}
+- (void)show
+{
+    [super show];
+}
+- (void)dismiss
+{
+    [self dismissWithAnimation:kAlertAnimationBottom];
+}
+
+@end

File diff suppressed because it is too large
+ 360 - 0
smartRhino/Project/VCModel/My_Center/View/PayAlert.xib


+ 24 - 0
smartRhino/Project/VCModel/My_Center/View/PayAlertCell.h

@@ -0,0 +1,24 @@
+//
+//  PayAlertCell.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/4/30.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface PayAlertCell : UITableViewCell
+@property (weak, nonatomic) IBOutlet UILabel *moneyL;
+@property (weak, nonatomic) IBOutlet UILabel *subL;
+@property (weak, nonatomic) IBOutlet UIButton *buyBtn;
+@property (weak, nonatomic) IBOutlet UIButton *fristBtn;
+
++ (CGFloat)configCellHeight;
+
++ (PayAlertCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath;
+@end
+
+NS_ASSUME_NONNULL_END

+ 35 - 0
smartRhino/Project/VCModel/My_Center/View/PayAlertCell.m

@@ -0,0 +1,35 @@
+//
+//  PayAlertCell.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/4/30.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "PayAlertCell.h"
+
+@implementation PayAlertCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
++ (CGFloat)configCellHeight{
+    return 70;
+}
+
++ (PayAlertCell *)configCell:(UITableView *)tableView indexPath:(NSIndexPath *)indexPath{
+    static NSString *cellIdentifer = @"PayAlertCell";
+    PayAlertCell *cell = [tableView dequeueReusableCellWithIdentifier:cellIdentifer];
+    if (cell == nil || !cell) {
+        cell = [[[NSBundle mainBundle] loadNibNamed:@"PayAlertCell" owner:nil options:nil] objectAtIndex:0];
+    }
+    return cell;
+}
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end

+ 82 - 0
smartRhino/Project/VCModel/My_Center/View/PayAlertCell.xib

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="KGk-i7-Jjw" customClass="PayAlertCell">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="70"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="70"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="连续包月19元/月 · 自动续期可随时取消" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kPq-ls-Q2N">
+                        <rect key="frame" x="0.0" y="47" width="195" height="13"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                        <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pxF-DB-N0q">
+                        <rect key="frame" x="256" y="21" width="64" height="28"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="64" id="4oP-px-Quo"/>
+                            <constraint firstAttribute="height" constant="28" id="G3o-jS-Qbe"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="boldSystem" pointSize="13"/>
+                        <state key="normal" title="购买" backgroundImage="mine_buy_btn">
+                            <color key="titleColor" red="0.37254901960784315" green="0.26666666666666666" blue="0.10196078431372549" alpha="1" colorSpace="calibratedRGB"/>
+                        </state>
+                    </button>
+                    <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dLA-de-mbW">
+                        <rect key="frame" x="54.5" y="13.5" width="65" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="20" id="C58-uK-AFn"/>
+                            <constraint firstAttribute="width" constant="65" id="YIa-9Q-K1e"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                        <state key="normal" title="首月特惠" backgroundImage="mine_frist_month">
+                            <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        </state>
+                    </button>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="9.00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BYX-5v-YcG">
+                        <rect key="frame" x="0.0" y="10" width="46.5" height="27"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="22"/>
+                        <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+                <color key="backgroundColor" red="0.94901960784313721" green="0.97647058823529409" blue="0.99607843137254903" alpha="1" colorSpace="calibratedRGB"/>
+                <constraints>
+                    <constraint firstAttribute="bottom" secondItem="kPq-ls-Q2N" secondAttribute="bottom" constant="10" id="2tG-ho-vsT"/>
+                    <constraint firstItem="pxF-DB-N0q" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="F53-Lc-V8A"/>
+                    <constraint firstItem="BYX-5v-YcG" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="HeF-Gx-DYa"/>
+                    <constraint firstItem="kPq-ls-Q2N" firstAttribute="top" secondItem="BYX-5v-YcG" secondAttribute="bottom" constant="10" id="KTD-1P-w4v"/>
+                    <constraint firstItem="dLA-de-mbW" firstAttribute="centerY" secondItem="BYX-5v-YcG" secondAttribute="centerY" id="L22-ba-VsI"/>
+                    <constraint firstItem="BYX-5v-YcG" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="L6I-zJ-vzr"/>
+                    <constraint firstAttribute="trailing" secondItem="pxF-DB-N0q" secondAttribute="trailing" id="RF4-eY-Yr5"/>
+                    <constraint firstItem="dLA-de-mbW" firstAttribute="leading" secondItem="BYX-5v-YcG" secondAttribute="trailing" constant="8" id="nUk-A1-83G"/>
+                    <constraint firstItem="kPq-ls-Q2N" firstAttribute="leading" secondItem="BYX-5v-YcG" secondAttribute="leading" id="prA-Vx-kzC"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
+            <connections>
+                <outlet property="buyBtn" destination="pxF-DB-N0q" id="g3f-nD-ohL"/>
+                <outlet property="fristBtn" destination="dLA-de-mbW" id="muF-HL-xMV"/>
+                <outlet property="moneyL" destination="BYX-5v-YcG" id="6IF-4K-LB0"/>
+                <outlet property="subL" destination="kPq-ls-Q2N" id="m0B-Ri-nW9"/>
+            </connections>
+            <point key="canvasLocation" x="139" y="153"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <image name="mine_buy_btn" width="64" height="28"/>
+        <image name="mine_frist_month" width="65.5" height="20"/>
+    </resources>
+</document>

+ 17 - 0
smartRhino/Project/VCModel/Source/Controller/GroupSquareVC.h

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

+ 151 - 0
smartRhino/Project/VCModel/Source/Controller/GroupSquareVC.m

@@ -0,0 +1,151 @@
+//
+//  GroupSquareVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/6.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "GroupSquareVC.h"
+#import "GroupSquareModel.h"
+#import "GroupSquareCell.h"
+#import "MyTDGroupView.h"
+
+@interface GroupSquareVC ()<UITableViewDelegate,UITableViewDataSource>
+@property (weak, nonatomic) IBOutlet UITableView *leftTable;
+@property (weak, nonatomic) IBOutlet UITableView *rightTable;
+@property (weak, nonatomic) IBOutlet UIView      *HeadView;
+@property (strong, nonatomic) MyTDGroupView      *SearchView;
+@property (copy, nonatomic) NSMutableArray       *leftArray;
+@property (copy, nonatomic) NSMutableArray       *rightArray;
+@end
+
+@implementation GroupSquareVC
++(GroupSquareVC *)initGroupSquareVC{
+    GroupSquareVC *controller = [StoryboardManager.shared.Source instantiateViewControllerWithIdentifier:@"GroupSquareVC"];
+    return controller;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    [self.HeadView addSubview:self.SearchView];
+    [self.SearchView  mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.mas_offset(UIEdgeInsetsZero);
+    }];
+    self.leftTable.delegate = self;
+    self.leftTable.dataSource = self;
+    self.rightTable.delegate = self;
+    self.rightTable.dataSource = self;
+    [self setData];
+    self.leftTable.estimatedRowHeight = 0;
+    self.leftTable.estimatedSectionHeaderHeight = 0;
+    self.leftTable.estimatedSectionFooterHeight = 0;
+    self.rightTable.estimatedRowHeight = 0;
+    self.rightTable.estimatedSectionHeaderHeight = 0;
+    self.rightTable.estimatedSectionFooterHeight = 0;
+    [self reloadData];
+}
+- (void)setData
+{
+    [self.leftArray removeAllObjects];
+    [self.rightArray removeAllObjects];
+    GroupSquareModel * model = [[GroupSquareModel alloc] init];
+    model.Title = @"推荐";
+    model.isSelect = YES;
+    [self.leftArray addObject:model];
+    GroupSquareModel * amodel = [[GroupSquareModel alloc] init];
+    amodel.Title = @"本周热门";
+    amodel.isSelect = NO;
+    [self.leftArray addObject:amodel];
+    GroupSquareModel * cmodel = [[GroupSquareModel alloc] init];
+    cmodel.Title = @"阅读馆";
+    cmodel.isSelect = NO;
+    [self.leftArray addObject:cmodel];
+    GroupSquareModel * dmodel = [[GroupSquareModel alloc] init];
+    dmodel.Title = @"人文自然";
+    dmodel.isSelect = NO;
+    [self.leftArray addObject:dmodel];
+    
+    GroupSquareModel * bmodel = [[GroupSquareModel alloc] init];
+    bmodel.Title = @"中国历史研究组";
+    bmodel.Des = @"研究中国上下五千年的文化精粹化精粹";
+    [self.rightArray addObject:bmodel];
+    [self.rightArray addObject:bmodel];
+    [self.rightArray addObject:bmodel];
+    [self.rightArray addObject:bmodel];
+}
+- (void)reloadData
+{
+    [self.leftTable reloadData];
+    [self.rightTable reloadData];
+}
+#pragma mark -UITableViewDelegate
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    if (tableView == self.leftTable) {
+        return self.leftArray.count;
+    }else{
+        return self.rightArray.count;
+    }
+}
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (tableView == self.leftTable) {
+        return [GroupSquareCell configCell0Height];
+    }else{
+        return [GroupSquareCell configCell1Height];
+    }
+}
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if (tableView == self.leftTable) {
+        GroupSquareModel * model = [self.leftArray objectAtIndex:indexPath.row];
+        GroupSquareCell * cell = [GroupSquareCell configCell0:tableView indexPath:indexPath];
+        [cell setLeftDataModel:model];
+        return cell;
+    }else{
+        GroupSquareModel * model = [self.rightArray objectAtIndex:indexPath.row];
+        GroupSquareCell * cell = [GroupSquareCell configCell1:tableView indexPath:indexPath];
+        [cell setRightDataModel:model];
+        return cell;
+    }
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+    if (tableView == self.leftTable) {
+        GroupSquareModel * model = [self.leftArray objectAtIndex:indexPath.row];
+        if (!model.isSelect) {
+            [self.leftArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+                GroupSquareModel * smodel = (GroupSquareModel *)obj;
+                smodel.isSelect = NO;
+            }];
+            model.isSelect = !model.isSelect;
+            [self reloadData];
+        }
+    }
+}
+#pragma mark - Load On Demand
+- (NSMutableArray *)leftArray
+{
+    if (!_leftArray) {
+        _leftArray = [NSMutableArray array];
+    }
+    return _leftArray;
+}
+- (NSMutableArray *)rightArray
+{
+    if (!_rightArray) {
+        _rightArray = [NSMutableArray array];
+    }
+    return _rightArray;
+}
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
+@end

+ 17 - 0
smartRhino/Project/VCModel/Source/Controller/SourceGroupVC.h

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

+ 946 - 0
smartRhino/Project/VCModel/Source/Controller/SourceGroupVC.m

@@ -0,0 +1,946 @@
+//
+//  SourceGroupVC.m
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/7.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "SourceGroupVC.h"
+#import "MyTDGroupView.h"
+#import "TDGroupInfoListCell.h"
+#import "ChatMsgListCell.h"
+#import "TDGroupInfoListModel.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 "MailListVC.h"
+#import "WaitWorkVC.h"
+#import "MyTDTopicSearchVC.h"
+#import "NoteBookShareVC.h"
+#import "GroupSquareVC.h"
+
+@interface SourceGroupVC ()<UITableViewDelegate,UITableViewDataSource,NoteBookShareVCDelegate>
+@property (weak, nonatomic) IBOutlet UIButton    *editBtn;
+@property (weak, nonatomic) IBOutlet UIButton    *squareBtn;
+@property (weak, nonatomic) IBOutlet UIView      *HeadView;
+@property (weak, nonatomic) IBOutlet UITableView *tableView;
+@property (strong, nonatomic) MyTDGroupView      *SearchView;
+@property (copy, nonatomic) NSMutableArray       *dataArray;
+@property (strong, nonatomic) UIView             *groupView;
+@property (strong, nonatomic) NoteBookShareVC           *noteBookShareVC;
+@property (copy, nonatomic)   FlowAttachmentsModel      *sendModel;
+@property (assign, nonatomic) BOOL                       isReturn;
+@end
+
+@implementation SourceGroupVC
++(SourceGroupVC *)initSourceGroupVC{
+    SourceGroupVC *controller = [StoryboardManager.shared.Source instantiateViewControllerWithIdentifier:@"SourceGroupVC"];
+    return controller;
+}
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.fd_prefersNavigationBarHidden = YES;
+    [self addHeaderSubView];
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+    WS(weakSelf);
+    [self.squareBtn setAction:^{
+        GroupSquareVC * vc = [GroupSquareVC initGroupSquareVC];
+        [weakSelf.navigationController pushViewController:vc animated:YES];
+    }];
+    [self.editBtn setAction:^{
+        MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
+        vc.type = CollectModel_NewTopic;
+        vc.upDateBlock = ^{
+            [weakSelf getData];
+        };
+        [weakSelf.navigationController pushViewController:vc animated:YES];
+    }];
+    [self getData];
+}
+
+- (void)addHeaderSubView
+{
+    [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.HeadView addSubview:self.groupView];
+    [self.groupView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(self.SearchView.mas_bottom);
+        make.left.bottom.right.mas_equalTo(self.HeadView);
+    }];
+    UIImageView * imgV = [UIImageView new];
+    imgV.image = IMG(@"Source_Group_Icon");
+    [self.groupView addSubview:imgV];
+    [imgV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_offset(15);
+        make.centerY.mas_equalTo(self.groupView);
+    }];
+    
+    UILabel * lineL = [UILabel new];
+    lineL.backgroundColor = LINEBGCOLOR;
+    [self.groupView addSubview:lineL];
+    [lineL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.bottom.right.mas_equalTo(self.groupView);
+        make.height.mas_offset(0.5);
+    }];
+    
+    UILabel * titleL = [UILabel new];
+    titleL.textColor = UIColorHex(0x0A0A0A);
+    titleL.font = [UIFont systemFontOfSize:15];
+    titleL.text = @"小组";
+    [self.groupView addSubview:titleL];
+    [titleL mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(self.groupView);
+        make.left.mas_equalTo(imgV.mas_right).offset(15);
+    }];
+    UIImageView * rightImgV = [UIImageView new];
+    rightImgV.image = IMG(@"chatmsg_rightArrow_icon");
+    [self.groupView addSubview:rightImgV];
+    [rightImgV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerY.mas_equalTo(self.groupView);
+        make.right.offset(-15);
+    }];
+    WS(weakSelf);
+    UITapGestureRecognizer * tap = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id  _Nonnull sender) {
+        [weakSelf pushGroupVC];
+    }];
+    self.groupView.userInteractionEnabled = YES;
+    [self.groupView addGestureRecognizer:tap];
+}
+- (void)pushGroupVC
+{
+    MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)getData
+{
+    WS(weakSelf);
+    NSDictionary * paraDict = @{@"ParentId":@(0),
+                                @"UserId":@([AppUserModel sharedAppUserModel].Id),
+                                @"Keyword": @"",
+                                @"Page":@(1),
+                                @"TopicGroupIds": @[],
+                                @"PerPage": @(99999999),
+                                @"Sort":@""
+    };
+    [[HttpManager sharedHttpManager] POSTUrl:Host(APP_Topic_Topic_List_Page) parameters:paraDict responseStyle:JOSN success:^(id  _Nonnull responseObject) {
+        NSLog(@"%@",responseObject);
+        [weakSelf.tableView.mj_header endRefreshing];
+        [weakSelf.tableView.mj_footer endRefreshing];
+        TopicListModel * model = [TopicListModel modelWithDictionary:responseObject];
+        [weakSelf.dataArray addObjectsFromArray:model.Items];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [weakSelf.tableView reloadData];
+        });
+    } failure:^(NSError * _Nonnull error) {
+        [weakSelf.tableView.mj_header endRefreshing];
+        [weakSelf.tableView.mj_footer endRefreshing];
+    }];
+}
+#pragma mark - UITableViewDelegate
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView{
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section{
+    return self.dataArray.count;
+}
+
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath{
+    return UITableViewAutomaticDimension;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    WS(weakSelf);
+    TopicListItemModel * model = [self.dataArray objectAtIndex:indexPath.row];
+    switch (model.DataType) {
+        case TopiclistCellImage:
+        {
+            TDGroupInfoListCell * cell;
+            switch (model.Data.count) {
+                case 1:
+                {
+                    cell = [TDGroupInfoListCell configCell1:tableView indexPath:indexPath];
+                    cell.cellImagV1.hidden = NO;
+                    cell.cellImagV2.hidden = YES;
+                    cell.cellImagV3.hidden = YES;
+                    cell.cellImagV4.hidden = YES;
+                    cell.cellImagV5.hidden = YES;
+                    cell.cellImagV6.hidden = YES;
+                    cell.cellImagV7.hidden = YES;
+                    cell.cellImagV8.hidden = YES;
+                    cell.cellImagV9.hidden = YES;
+                    TopicListSubModel * subModel0 = model.Data[0];
+                    [cell.cellImagV1 sd_setImageWithURL:[NSURL URLWithString:subModel0.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                }
+                    break;
+                case 2:
+                {
+                    cell = [TDGroupInfoListCell configCell1:tableView indexPath:indexPath];
+                    cell.cellImagV1.hidden = NO;
+                    cell.cellImagV2.hidden = NO;
+                    cell.cellImagV3.hidden = YES;
+                    cell.cellImagV4.hidden = YES;
+                    cell.cellImagV5.hidden = YES;
+                    cell.cellImagV6.hidden = YES;
+                    cell.cellImagV7.hidden = YES;
+                    cell.cellImagV8.hidden = YES;
+                    cell.cellImagV9.hidden = YES;
+                    TopicListSubModel * subModel0 = model.Data[0];
+                    [cell.cellImagV1 sd_setImageWithURL:[NSURL URLWithString:subModel0.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel1 = model.Data[1];
+                    [cell.cellImagV2 sd_setImageWithURL:[NSURL URLWithString:subModel1.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                }
+                    break;
+                case 3:
+                {
+                    cell = [TDGroupInfoListCell configCell2:tableView indexPath:indexPath];
+                    cell.cellImagV1.hidden = NO;
+                    cell.cellImagV2.hidden = NO;
+                    cell.cellImagV3.hidden = NO;
+                    cell.cellImagV4.hidden = YES;
+                    cell.cellImagV5.hidden = YES;
+                    cell.cellImagV6.hidden = YES;
+                    cell.cellImagV7.hidden = YES;
+                    cell.cellImagV8.hidden = YES;
+                    cell.cellImagV9.hidden = YES;
+                    TopicListSubModel * subModel0 = model.Data[0];
+                    [cell.cellImagV1 sd_setImageWithURL:[NSURL URLWithString:subModel0.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel1 = model.Data[1];
+                    [cell.cellImagV2 sd_setImageWithURL:[NSURL URLWithString:subModel1.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel2 = model.Data[2];
+                    [cell.cellImagV3 sd_setImageWithURL:[NSURL URLWithString:subModel2.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                }
+                    break;
+                case 4:
+                {
+                    cell = [TDGroupInfoListCell configCell3:tableView indexPath:indexPath];
+                    cell.cellImagV1.hidden = NO;
+                    cell.cellImagV2.hidden = NO;
+                    cell.cellImagV3.hidden = NO;
+                    cell.cellImagV4.hidden = NO;
+                    cell.cellImagV5.hidden = YES;
+                    cell.cellImagV6.hidden = YES;
+                    cell.cellImagV7.hidden = YES;
+                    cell.cellImagV8.hidden = YES;
+                    cell.cellImagV9.hidden = YES;
+                    TopicListSubModel * subModel0 = model.Data[0];
+                    [cell.cellImagV1 sd_setImageWithURL:[NSURL URLWithString:subModel0.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel1 = model.Data[1];
+                    [cell.cellImagV2 sd_setImageWithURL:[NSURL URLWithString:subModel1.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel2 = model.Data[2];
+                    [cell.cellImagV3 sd_setImageWithURL:[NSURL URLWithString:subModel2.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel3 = model.Data[3];
+                    [cell.cellImagV4 sd_setImageWithURL:[NSURL URLWithString:subModel3.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                }
+                    break;
+                case 5:
+                {
+                    cell = [TDGroupInfoListCell configCell4:tableView indexPath:indexPath];
+                    cell.cellImagV1.hidden = NO;
+                    cell.cellImagV2.hidden = NO;
+                    cell.cellImagV3.hidden = NO;
+                    cell.cellImagV4.hidden = NO;
+                    cell.cellImagV5.hidden = NO;
+                    cell.cellImagV6.hidden = YES;
+                    cell.cellImagV7.hidden = YES;
+                    cell.cellImagV8.hidden = YES;
+                    cell.cellImagV9.hidden = YES;
+                    TopicListSubModel * subModel0 = model.Data[0];
+                    [cell.cellImagV1 sd_setImageWithURL:[NSURL URLWithString:subModel0.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel1 = model.Data[1];
+                    [cell.cellImagV2 sd_setImageWithURL:[NSURL URLWithString:subModel1.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel2 = model.Data[2];
+                    [cell.cellImagV3 sd_setImageWithURL:[NSURL URLWithString:subModel2.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel3 = model.Data[3];
+                    [cell.cellImagV4 sd_setImageWithURL:[NSURL URLWithString:subModel3.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel4 = model.Data[4];
+                    [cell.cellImagV5 sd_setImageWithURL:[NSURL URLWithString:subModel4.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                }
+                    break;
+                case 6:
+                {
+                    cell = [TDGroupInfoListCell configCell4:tableView indexPath:indexPath];
+                    cell.cellImagV1.hidden = NO;
+                    cell.cellImagV2.hidden = NO;
+                    cell.cellImagV3.hidden = NO;
+                    cell.cellImagV4.hidden = NO;
+                    cell.cellImagV5.hidden = NO;
+                    cell.cellImagV6.hidden = NO;
+                    cell.cellImagV7.hidden = YES;
+                    cell.cellImagV8.hidden = YES;
+                    cell.cellImagV9.hidden = YES;
+                    TopicListSubModel * subModel0 = model.Data[0];
+                    [cell.cellImagV1 sd_setImageWithURL:[NSURL URLWithString:subModel0.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel1 = model.Data[1];
+                    [cell.cellImagV2 sd_setImageWithURL:[NSURL URLWithString:subModel1.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel2 = model.Data[2];
+                    [cell.cellImagV3 sd_setImageWithURL:[NSURL URLWithString:subModel2.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel3 = model.Data[3];
+                    [cell.cellImagV4 sd_setImageWithURL:[NSURL URLWithString:subModel3.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel4 = model.Data[4];
+                    [cell.cellImagV5 sd_setImageWithURL:[NSURL URLWithString:subModel4.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel5 = model.Data[5];
+                    [cell.cellImagV6 sd_setImageWithURL:[NSURL URLWithString:subModel5.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                }
+                    break;
+                case 7:
+                {
+                    cell = [TDGroupInfoListCell configCell5:tableView indexPath:indexPath];
+                    cell.cellImagV1.hidden = NO;
+                    cell.cellImagV2.hidden = NO;
+                    cell.cellImagV3.hidden = NO;
+                    cell.cellImagV4.hidden = NO;
+                    cell.cellImagV5.hidden = NO;
+                    cell.cellImagV6.hidden = NO;
+                    cell.cellImagV7.hidden = NO;
+                    cell.cellImagV8.hidden = YES;
+                    cell.cellImagV9.hidden = YES;
+                    TopicListSubModel * subModel0 = model.Data[0];
+                    [cell.cellImagV1 sd_setImageWithURL:[NSURL URLWithString:subModel0.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel1 = model.Data[1];
+                    [cell.cellImagV2 sd_setImageWithURL:[NSURL URLWithString:subModel1.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel2 = model.Data[2];
+                    [cell.cellImagV3 sd_setImageWithURL:[NSURL URLWithString:subModel2.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel3 = model.Data[3];
+                    [cell.cellImagV4 sd_setImageWithURL:[NSURL URLWithString:subModel3.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel4 = model.Data[4];
+                    [cell.cellImagV5 sd_setImageWithURL:[NSURL URLWithString:subModel4.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel5 = model.Data[5];
+                    [cell.cellImagV6 sd_setImageWithURL:[NSURL URLWithString:subModel5.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel6 = model.Data[6];
+                    [cell.cellImagV7 sd_setImageWithURL:[NSURL URLWithString:subModel6.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                }
+                    break;
+                case 8:
+                {
+                    cell = [TDGroupInfoListCell configCell5:tableView indexPath:indexPath];
+                    cell.cellImagV1.hidden = NO;
+                    cell.cellImagV2.hidden = NO;
+                    cell.cellImagV3.hidden = NO;
+                    cell.cellImagV4.hidden = NO;
+                    cell.cellImagV5.hidden = NO;
+                    cell.cellImagV6.hidden = NO;
+                    cell.cellImagV7.hidden = NO;
+                    cell.cellImagV8.hidden = NO;
+                    cell.cellImagV9.hidden = YES;
+                    TopicListSubModel * subModel0 = model.Data[0];
+                    [cell.cellImagV1 sd_setImageWithURL:[NSURL URLWithString:subModel0.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel1 = model.Data[1];
+                    [cell.cellImagV2 sd_setImageWithURL:[NSURL URLWithString:subModel1.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel2 = model.Data[2];
+                    [cell.cellImagV3 sd_setImageWithURL:[NSURL URLWithString:subModel2.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel3 = model.Data[3];
+                    [cell.cellImagV4 sd_setImageWithURL:[NSURL URLWithString:subModel3.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel4 = model.Data[4];
+                    [cell.cellImagV5 sd_setImageWithURL:[NSURL URLWithString:subModel4.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel5 = model.Data[5];
+                    [cell.cellImagV6 sd_setImageWithURL:[NSURL URLWithString:subModel5.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel6 = model.Data[6];
+                    [cell.cellImagV7 sd_setImageWithURL:[NSURL URLWithString:subModel6.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel7 = model.Data[7];
+                    [cell.cellImagV8 sd_setImageWithURL:[NSURL URLWithString:subModel7.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                }
+                    break;
+                default:
+                {
+                    cell = [TDGroupInfoListCell configCell5:tableView indexPath:indexPath];
+                    cell.cellImagV1.hidden = NO;
+                    cell.cellImagV2.hidden = NO;
+                    cell.cellImagV3.hidden = NO;
+                    cell.cellImagV4.hidden = NO;
+                    cell.cellImagV5.hidden = NO;
+                    cell.cellImagV6.hidden = NO;
+                    cell.cellImagV7.hidden = NO;
+                    cell.cellImagV8.hidden = NO;
+                    cell.cellImagV9.hidden = NO;
+                    TopicListSubModel * subModel0 = model.Data[0];
+                    [cell.cellImagV1 sd_setImageWithURL:[NSURL URLWithString:subModel0.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel1 = model.Data[1];
+                    [cell.cellImagV2 sd_setImageWithURL:[NSURL URLWithString:subModel1.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel2 = model.Data[2];
+                    [cell.cellImagV3 sd_setImageWithURL:[NSURL URLWithString:subModel2.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel3 = model.Data[3];
+                    [cell.cellImagV4 sd_setImageWithURL:[NSURL URLWithString:subModel3.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel4 = model.Data[4];
+                    [cell.cellImagV5 sd_setImageWithURL:[NSURL URLWithString:subModel4.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel5 = model.Data[5];
+                    [cell.cellImagV6 sd_setImageWithURL:[NSURL URLWithString:subModel5.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel6 = model.Data[6];
+                    [cell.cellImagV7 sd_setImageWithURL:[NSURL URLWithString:subModel6.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel7 = model.Data[7];
+                    [cell.cellImagV8 sd_setImageWithURL:[NSURL URLWithString:subModel7.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                    TopicListSubModel * subModel8 = model.Data[8];
+                    [cell.cellImagV9 sd_setImageWithURL:[NSURL URLWithString:subModel8.File] placeholderImage:IMG(@"img_placeHolderVertical")];
+                }
+                    break;
+            }
+            
+            [cell.cellIconV sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:kUserDefaultHeadImage];
+            [cell.fileBtn setTitle:model.FolderResult.FolderName forState:UIControlStateNormal];
+            [cell.fileBtn setAction:^{
+                [weakSelf enterFileWithModel:model];
+            }];
+            cell.ClickUserBlock = ^{
+                [weakSelf showUserInfo:model.UserId];
+            };
+            cell.cellTimeL.text = [model.CreatedDate substringWithRange:NSMakeRange(5, 11)];
+            cell.celltitleL.attributedText = [self setTitleWithStr:model.Title];
+            cell.cellContentL.attributedText = [self setTextWithStr:model.Content];
+            cell.cellNameL.text = model.UserName;
+            cell.cellReadNumL.text = [NSString stringWithFormat:@"阅读:%ld",(long)model.ReadCount];
+            [cell.cellLikeBtn setAction:^{
+                [weakSelf likeAction:model withBtn:cell.cellLikeBtn index:indexPath];
+            }];
+            if (model.CommentCount > 0) {
+                [cell.cellPingBtn setTitle:[NSString stringWithFormat:@"%ld",(long)model.CommentCount] forState:UIControlStateNormal];
+            }else{
+                [cell.cellPingBtn setTitle:@"评论" forState:UIControlStateNormal];
+            }
+            if (model.PraiseCount > 0) {
+                [cell.cellLikeBtn setTitle:[NSString stringWithFormat:@"%ld",(long)model.PraiseCount] forState:UIControlStateNormal];
+            }else{
+                [cell.cellLikeBtn setTitle:@"赞" forState:UIControlStateNormal];
+            }
+            if (model.IsPraise) {
+                [cell.cellLikeBtn setTitleColor:UIColorHex(#009AFF) forState:UIControlStateNormal];
+                [cell.cellLikeBtn setImage:[UIImage imageNamed:@"收藏_赞_select"] forState:UIControlStateNormal];
+            }else{
+                [cell.cellLikeBtn setTitleColor:UIColorHex(#999999) forState:UIControlStateNormal];
+                [cell.cellLikeBtn setImage:[UIImage imageNamed:@"收藏_赞"] forState:UIControlStateNormal];
+            }
+            [cell.cellPingBtn setAction:^{
+                [weakSelf CommentPush:model];
+            }];
+            [cell.cellSendBtn setAction:^{
+                [weakSelf reSend:model];
+            }];
+            if (model.Title.length == 0) {
+                cell.TitleConstant.constant = 0;
+            }else{
+                cell.TitleConstant.constant = 10.f;
+            }
+            if (model.Content.length == 0) {
+                cell.subTitleContant.constant = 0.f;
+            }else{
+                cell.subTitleContant.constant = 7.5f;
+            }
+            cell.fileContant.constant = 0.f;
+            return cell;
+        }
+            break;
+        case TopiclistCellFile:
+        {
+            TDGroupInfoListCell * cell = [TDGroupInfoListCell configCell6:tableView indexPath:indexPath];
+            [cell.cellIconV sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:kUserDefaultHeadImage];
+            [cell.fileBtn setTitle:model.FolderResult.FolderName forState:UIControlStateNormal];
+            [cell.fileBtn setAction:^{
+                [weakSelf enterFileWithModel:model];
+            }];
+            [cell.ClickFileAction setAction:^{
+                [weakSelf pushFileWithModel:model.Data.firstObject];
+            }];
+            cell.cellNameL.text = model.UserName;
+            cell.cellTimeL.text = [model.CreatedDate substringWithRange:NSMakeRange(5, 11)];
+            cell.celltitleL.attributedText = [self setTitleWithStr:model.Title];
+            cell.cellContentL.attributedText = [self setTextWithStr:model.Content];
+            [cell setDataWithCell6:model.Data.firstObject];
+            cell.cellReadNumL.text = [NSString stringWithFormat:@"阅读:%ld",(long)model.ReadCount];
+            [cell.cellLikeBtn setAction:^{
+                [weakSelf likeAction:model withBtn:cell.cellLikeBtn index:indexPath];
+            }];
+            if (model.CommentCount > 0) {
+                [cell.cellPingBtn setTitle:[NSString stringWithFormat:@"%ld",(long)model.CommentCount] forState:UIControlStateNormal];
+            }else{
+                [cell.cellPingBtn setTitle:@"评论" forState:UIControlStateNormal];
+            }
+            if (model.PraiseCount > 0) {
+                [cell.cellLikeBtn setTitle:[NSString stringWithFormat:@"%ld",(long)model.PraiseCount] forState:UIControlStateNormal];
+            }else{
+                [cell.cellLikeBtn setTitle:@"赞" forState:UIControlStateNormal];
+            }
+            if (model.IsPraise) {
+                [cell.cellLikeBtn setTitleColor:UIColorHex(#009AFF) forState:UIControlStateNormal];
+                [cell.cellLikeBtn setImage:[UIImage imageNamed:@"收藏_赞_select"] forState:UIControlStateNormal];
+            }else{
+                [cell.cellLikeBtn setTitleColor:UIColorHex(#999999) forState:UIControlStateNormal];
+                [cell.cellLikeBtn setImage:[UIImage imageNamed:@"收藏_赞"] forState:UIControlStateNormal];
+            }
+            [cell.cellPingBtn setAction:^{
+                [weakSelf CommentPush:model];
+            }];
+            [cell.cellSendBtn setAction:^{
+                [weakSelf reSend:model];
+            }];
+            if (model.Title.length == 0) {
+                cell.TitleConstant.constant = 0;
+            }else{
+                cell.TitleConstant.constant = 10.f;
+            }
+            if (model.Content.length == 0) {
+                cell.subTitleContant.constant = 0.f;
+            }else{
+                cell.subTitleContant.constant = 7.5f;
+            }
+            cell.ClickUserBlock = ^{
+                [weakSelf showUserInfo:model.UserId];
+            };
+            return cell;
+        }
+            break;
+        default:///TopiclistCellNone
+        {
+            TDGroupInfoListCell * cell = [TDGroupInfoListCell configCell0:tableView indexPath:indexPath];
+            [cell.cellIconV sd_setImageWithURL:[NSURL URLWithString:model.AvatarUrl] placeholderImage:kUserDefaultHeadImage];
+            [cell.fileBtn setTitle:model.FolderResult.FolderName forState:UIControlStateNormal];
+            [cell.fileBtn setAction:^{
+                [weakSelf enterFileWithModel:model];
+            }];
+            cell.cellNameL.text = model.UserName;
+            cell.cellTimeL.text = [model.CreatedDate substringWithRange:NSMakeRange(5, 11)];
+            cell.celltitleL.attributedText = [self setTitleWithStr:model.Title];
+            cell.cellContentL.attributedText = [self setTextWithStr:model.Content];
+            cell.cellReadNumL.text = [NSString stringWithFormat:@"阅读:%ld",(long)model.ReadCount];
+            [cell.cellLikeBtn setAction:^{
+                [weakSelf likeAction:model withBtn:cell.cellLikeBtn index:indexPath];
+            }];
+            if (model.CommentCount > 0) {
+                [cell.cellPingBtn setTitle:[NSString stringWithFormat:@"%ld",(long)model.CommentCount] forState:UIControlStateNormal];
+            }else{
+                [cell.cellPingBtn setTitle:@"评论" forState:UIControlStateNormal];
+            }
+            if (model.PraiseCount > 0) {
+                [cell.cellLikeBtn setTitle:[NSString stringWithFormat:@"%ld",(long)model.PraiseCount] forState:UIControlStateNormal];
+            }else{
+                [cell.cellLikeBtn setTitle:@"赞" forState:UIControlStateNormal];
+            }
+            if (model.IsPraise) {
+                [cell.cellLikeBtn setTitleColor:UIColorHex(#009AFF) forState:UIControlStateNormal];
+                [cell.cellLikeBtn setImage:[UIImage imageNamed:@"收藏_赞_select"] forState:UIControlStateNormal];
+            }else{
+                [cell.cellLikeBtn setTitleColor:UIColorHex(#999999) forState:UIControlStateNormal];
+                [cell.cellLikeBtn setImage:[UIImage imageNamed:@"收藏_赞"] forState:UIControlStateNormal];
+            }
+            [cell.cellPingBtn setAction:^{
+                [weakSelf CommentPush:model];
+            }];
+            [cell.cellSendBtn setAction:^{
+                [weakSelf reSend:model];
+            }];
+            if (model.Title.length == 0) {
+                cell.TitleConstant.constant = 0;
+            }else{
+                cell.TitleConstant.constant = 10.f;
+            }
+            if (model.Content.length == 0) {
+                cell.subTitleContant.constant = 0.f;
+            }else{
+                cell.subTitleContant.constant = 7.5f;
+            }
+            cell.ClickUserBlock = ^{
+                [weakSelf showUserInfo:model.UserId];
+            };
+            return cell;
+        }
+            break;
+    }
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    [tableView deselectRowAtIndexPath:indexPath animated:YES];
+}
+
+- (void)enterFileWithModel:(TopicListItemModel *)model
+{
+    if (model.UserId == [AppUserModel sharedAppUserModel].Id) {
+        NoteBookVC *vc = [NoteBookVC initNoteBookVC];
+        vc.listType = MyFavoriteListLevelTypeB;
+        vc.FolderId = model.FolderResult.Id;
+        vc.ParentId = model.FolderResult.Id;
+        vc.myTitle = model.FolderResult.FolderName;
+        vc.VisitUserId = model.UserId;
+        [self.navigationController pushViewController:vc animated:YES];
+    }else{
+        OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
+        vc.listType = MyFavoriteListLevelTypeB;
+        vc.FolderId = model.FolderResult.Id;
+        vc.Author = model.UserName;
+        vc.myTitle = model.FolderResult.FolderName;
+        vc.VisitUserId = model.UserId;
+
+        [self.navigationController pushViewController:vc animated:YES];
+    }
+}
+- (void)showUserInfo:(NSInteger)userId
+{
+    MailListDetailVC * vc = [MailListDetailVC initMailListDetailVC];
+    vc.indexId = userId;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+#pragma mark - 点击评论
+- (void)likeAction:(TopicListItemModel *)model withBtn:(UIButton *)btn index:(NSIndexPath *)indexPath
+{
+    WS(weakSelf);
+    NSDictionary * paraDict = @{@"SourceId":@(model.Id),
+                                @"TypeValue":@(3),///3 笔记
+                                @"AnalyzeType":@(1)
+    };
+    btn.enabled = NO;
+    [[HttpManager sharedHttpManager] POSTUrl:Host(API_APP_Analyze_Set) parameters:paraDict responseStyle:DATA success:^(id  _Nonnull responseObject) {
+        btn.enabled = YES;
+        model.IsPraise = !model.IsPraise;
+        model.PraiseCount = model.IsPraise ? (model.PraiseCount + 1) : (model.PraiseCount - 1);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationNone];
+        });
+    } failure:^(NSError * _Nonnull error) {
+        btn.enabled = YES;
+    }];
+}
+- (void)CommentPush:(TopicListItemModel *)model
+{
+    MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+    vc.type = CollectModel_NewTopic;
+    vc.deleteTopicBlock = ^{
+
+    };
+    vc.Id = model.Id;
+    vc.isComment = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)reSend:(TopicListItemModel *)model
+{
+    FlowAttachmentsModel * topicModel = [[FlowAttachmentsModel alloc] init];
+    topicModel.SoureTypeId = CollectModel_NewTopic;
+    topicModel.Title = model.Title;
+    topicModel.SoureId = model.Id;
+    topicModel.Title = model.Title;
+    topicModel.Author = model.UserName;
+    self.sendModel = topicModel;
+    [self.noteBookShareVC initNoteBookShareData];
+    self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
+}
+- (NoteBookShareVC *)noteBookShareVC{
+    if (_noteBookShareVC == nil) {
+        _noteBookShareVC = [NoteBookShareVC initNoteBookShareVC];
+        [_noteBookShareVC.view setFrame:CGRectMake(0,0, SCREEN_WIDTH, SCREEN_HEIGHT)];
+        [_noteBookShareVC.view setHidden:YES];
+        _noteBookShareVC.delegate = self;
+    }
+    return _noteBookShareVC;
+}
+- (void)userSelectType:(NSString *)typeName WithIndexPath:(NSIndexPath *)indexPath
+{
+    self.noteBookShareVC.view.hidden = !self.noteBookShareVC.view.hidden;
+    if ([typeName isEqualToString:@"发给微信好友"]) {
+        [self returnToWechatSession];
+    }else if ([typeName isEqualToString:@"发到朋友圈"]){
+        [self returnToWechatTimeLine];
+    }else if ([typeName isEqualToString:@"发到微博"]){
+        [self returnToSina];
+    }else if ([typeName isEqualToString:@"发给QQ好友"]){
+        [self returnToQQ];
+    }else if ([typeName isEqualToString:@"发到消息"]){
+        [self returnToMessage];
+    }else if ([typeName isEqualToString:@"发到小组"]){
+        [self returnToGroup];
+    }else if ([typeName isEqualToString:@"发到笔记"]){
+        [self returnToNote];
+    }else if ([typeName isEqualToString:@"发到话题"]){
+        [self returnToTopic];
+    }else{
+        
+    }
+}
+
+- (void)shareWebPageToPlatformType:(UMSocialPlatformType)platformType title:(NSString *)title desc:(NSString *)desc url:(NSString *)url
+{
+    //创建分享消息对象
+    UMSocialMessageObject *messageObject = [UMSocialMessageObject messageObject];
+    
+    messageObject.title = title;
+    //创建网页内容对象
+    UMShareWebpageObject *shareObject = [UMShareWebpageObject shareObjectWithTitle:title descr:desc thumImage:IMG(@"logo_60")];
+    //设置网页地址
+    shareObject.webpageUrl = url;
+    
+    //分享消息对象设置分享内容对象
+    messageObject.shareObject = shareObject;
+    
+    //调用分享接口
+    [[UMSocialManager defaultManager] shareToPlatform:platformType messageObject:messageObject currentViewController:self completion:^(id data, NSError *error) {
+        if (error) {
+            NSLog(@"************Share fail with error %@*********",error);
+        }else{
+            NSLog(@"response data is %@",data);
+        }
+    }];
+}
+- (void)returnToWechatSession
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatSession title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Author] url:[self returnUrl]];
+}
+- (void)returnToWechatTimeLine
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_WechatTimeLine title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Author] url:[self returnUrl]];
+}
+- (void)returnToSina
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_Sina title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Author] url:[self returnUrl]];
+}
+- (void)returnToQQ
+{
+    [self shareWebPageToPlatformType:UMSocialPlatformType_QQ title:self.sendModel.Title desc:[NSString stringWithFormat:@"来自-%@",self.sendModel.Author] url:[self returnUrl]];
+}
+- (NSString *)returnUrl
+{
+    NSString * url = [NSString stringWithFormat:@"%@%ld",Host(@"/admin/mobile/noteDetailsWx?"),(long)self.sendModel.Id];
+    return url;
+}
+#pragma mark - 分享功能
+- (void)returnToMessage
+{
+    ShareListVC * vc = [ShareListVC initShareListVC];
+    vc.sendModel = self.sendModel;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)returnToGroup
+{
+    MyTDGroupViewController * vc = [[MyTDGroupViewController alloc] init];
+    vc.type =  CollectModel_Group;
+    vc.sendModel = self.sendModel;
+    vc.isReturn = YES;
+
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)returnToNote
+{
+    MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
+    vc.type = CollectModel_NoteBook;
+    vc.sendModel = self.sendModel;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (void)returnToTopic
+{
+    MyTDTopicCreateVC * vc = [MyTDTopicCreateVC initMyTDTopicCreateVC];
+    vc.type = CollectModel_NewTopic;
+    vc.sendModel = self.sendModel;
+    vc.isReturn = YES;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
+#pragma mark - 点击文件跳转
+- (void)pushFileWithModel:(TopicListSubModel *)model
+{
+    WS(weakSelf);
+    switch (model.Type) {
+        case CollectModel_Aritle:
+        {
+            SHOWLOADING
+            [[HttpManager sharedHttpManager] GETWithUrl:[NSString stringWithFormat:@"%@%ld",Article_Detail_Get,(long)model.Id] parameters:@{} success:^(id  _Nonnull responseObject) {
+                REMOVESHOW;
+                Item *itemModel = [[Item alloc]initWithDictionary:responseObject error:nil];
+                MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+                vc.type = CollectModel_Aritle;
+                vc.Id = itemModel.Id;
+                [weakSelf.navigationController pushViewController:vc animated:YES];
+            } failure:^(NSError * _Nonnull error) {
+                SHOWERROR([ZYCTool handerResultData:error]);
+            }];
+        }
+            break;
+        case CollectModel_Toipc:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.type = CollectModel_Toipc;
+            vc.Id = model.Id;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_NewTopic:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.type = CollectModel_NewTopic;
+            vc.Id = model.Id;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_Collect:
+        {
+        }
+            break;
+        case CollectModel_NoteBook:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.type = CollectModel_NoteBook;
+            vc.Id = model.Id;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_CollectFile:{
+            if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id) {
+                MyFavoriteVC *vc = [MyFavoriteVC initMyFavoriteVC];
+                vc.listType = model.Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.ParentId = 0;
+                vc.FolderId = model.Id;
+                vc.myTitle =  model.Title;
+                [self.navigationController pushViewController:vc animated:YES];
+            }else{
+                OtherFavoriteVC *vc = [OtherFavoriteVC initOtherFavoriteVC];
+                vc.listType = model.Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.ParentId = 0;
+                vc.FolderId = model.Id;
+                vc.myTitle = model.Title;
+                vc.VisitUserId = model.SourceUserId;
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+        }break;
+        case CollectModel_NoteFile:{
+            if (model.SourceUserId == [AppUserModel sharedAppUserModel].Id) {
+                NoteBookVC *vc = [NoteBookVC initNoteBookVC];
+                vc.listType = model.Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.ParentId = 0;
+                vc.FolderId = model.Id;
+                vc.myTitle = model.Title;
+                vc.VisitUserId = 0;
+                [self.navigationController pushViewController:vc animated:YES];
+            }else{
+                OtherNoteBookVC *vc = [OtherNoteBookVC initOtherNoteBookVC];
+                vc.listType = model.Id == 0 ? MyFavoriteListLevelTypeA : MyFavoriteListLevelTypeB;
+                vc.ParentId = 0;
+                vc.FolderId = model.Id;
+                vc.myTitle = model.Title;
+                vc.VisitUserId = model.SourceUserId;
+                [self.navigationController pushViewController:vc animated:YES];
+            }
+        }break;
+        case CollectModel_Notice:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.type = CollectModel_Notice;
+            vc.Id = model.Id;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_InterMail:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.type = CollectModel_InterMail;
+            vc.Id = model.Id;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_Group:
+        {
+            TDGroupInfoListVC * vc = [TDGroupInfoListVC initTDGroupInfoListVC];
+            vc.GroupId = model.Id;
+            vc.titleStr = model.Title;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_meetMian:
+        {
+            MyTDTopicDetailVC * vc = [MyTDTopicDetailVC initMyTDTopicDetailVC];
+            vc.type = CollectModel_meetMian;
+            vc.Id = model.Id;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_meetDetail:
+        {
+            WorkFlowDetailsController *  vc = [[WorkFlowDetailsController alloc] initWithId:model.Id];
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case CollectModel_work:
+        {
+            MyApprovalPageDetail * vc = [[MyApprovalPageDetail alloc]init];
+            vc.pageType = Type_ONEC;
+            vc.indexId = model.Id;
+            vc.title = model.Title;
+            vc.TodoId = model.Id;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        default:
+        {
+            DownFileViewController *vc = [[DownFileViewController alloc]init];
+            FlowAttachmentsModel * fmodel = [[FlowAttachmentsModel alloc] init];
+            fmodel.SoureId = model.Id;
+            fmodel.Title = model.Title;
+            fmodel.Url = model.File;
+            vc.model = fmodel;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+    }
+}
+- (void)pushSearchVC
+{
+    MyTDTopicSearchVC * vc = [[MyTDTopicSearchVC alloc] init];
+    vc.searchType = TDTopicSearch;
+    [self.navigationController pushViewController:vc animated:YES];
+}
+- (NSAttributedString *)setTextWithStr:(NSString *)str
+{
+    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
+    [attributedString addAttribute:NSFontAttributeName value:[UIFont fontWithName:@"PingFang SC" size:16] range:NSMakeRange(0, str.length)];
+    [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorHex(#484848) range:NSMakeRange(0, str.length)];
+    NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc]init];
+    paraStyle.alignment = NSTextAlignmentJustified;//两端对齐
+    [paraStyle setLineSpacing:5];//行间距
+    [attributedString addAttribute:NSParagraphStyleAttributeName value:paraStyle range:NSMakeRange(0, str.length)];
+    [attributedString addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleNone] range:NSMakeRange(0, str.length)];
+    return attributedString;
+}
+- (NSAttributedString *)setTitleWithStr:(NSString *)str
+{
+    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:str];
+    [attributedString addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:18] range:NSMakeRange(0, str.length)];
+    [attributedString addAttribute:NSForegroundColorAttributeName value:UIColorHex(0x0a0a0a) range:NSMakeRange(0, str.length)];
+    NSMutableParagraphStyle *paraStyle = [[NSMutableParagraphStyle alloc]init];
+    paraStyle.alignment = NSTextAlignmentJustified;//两端对齐
+    [paraStyle setLineSpacing:5];//行间距
+    [attributedString addAttribute:NSParagraphStyleAttributeName value:paraStyle range:NSMakeRange(0, str.length)];
+    [attributedString addAttribute:NSUnderlineStyleAttributeName value:[NSNumber numberWithInteger:NSUnderlineStyleNone] range:NSMakeRange(0, str.length)];
+    return attributedString;
+}
+#pragma mark - Load On Demand
+- (NSMutableArray *)dataArray
+{
+    if (!_dataArray) {
+        _dataArray = [NSMutableArray array];
+    }
+    return _dataArray;
+}
+- (MyTDGroupView *)SearchView
+{
+    if (!_SearchView) {
+        _SearchView = [[MyTDGroupView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 36)];
+    }
+    return _SearchView;
+}
+- (UIView *)groupView
+{
+    if (!_groupView) {
+        _groupView = [UIView new];
+    }
+    return _groupView;
+}
+@end

+ 17 - 0
smartRhino/Project/VCModel/Source/Controller/SourceHomeVC.h

@@ -0,0 +1,17 @@
+//
+//  SourceHomeVC.h
+//  smartRhino
+//
+//  Created by niuzhen on 2020/5/6.
+//  Copyright © 2020 tederen. All rights reserved.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface SourceHomeVC : BaseViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

+ 0 - 0
smartRhino/Project/VCModel/Source/Controller/SourceHomeVC.m


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