Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

Conflicts: LiveVideoCloud.xcodeproj/project.pbxproj LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCTVLiveViewController.h LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCTVLiveViewController.m LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
Conflicts: LiveVideoCloud.xcodeproj/project.pbxproj LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCTVLiveViewController.h LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCTVLiveViewController.m LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
朱林
2 parents 697ba82d e4f5889a
Showing 33 changed files with 501 additions and 230 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/Classes/Sections/LVCHomePageViewController.h → LiveVideoCloud/Classes/Sections/HomePageSections/LVCHomePageViewController.h
LiveVideoCloud/Classes/Sections/LVCHomePageViewController.m → LiveVideoCloud/Classes/Sections/HomePageSections/LVCHomePageViewController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.h → LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.h
LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/LVCMineViewController.m
LiveVideoCloud/Classes/Sections/Mine/Controllers/MineSettingViewController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLiveActivityInfoService.h → LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCLiveActivityInfoService.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLiveActivityInfoService.m → LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCLiveActivityInfoService.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.h → LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListController.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.m → LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.h → LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListView.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.m → LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListView.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.h → LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLivePlayerController.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.m → LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLivePlayerController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveListService.h → LiveVideoCloud/Classes/Sections/UGCSections/Controller/LiveListService.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveListService.m → LiveVideoCloud/Classes/Sections/UGCSections/Controller/LiveListService.m
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLiveListModel.h → LiveVideoCloud/Classes/Sections/UGCSections/Model/LVCUGCLiveListModel.h
@@ -194,16 +194,15 @@
 		D217A24B1E7B76C7003B44CB /* PresentViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2491E7B76C7003B44CB /* PresentViewCell.m */; };
 		D217A24E1E7B77C7003B44CB /* ComboCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A24D1E7B77C7003B44CB /* ComboCell.m */; };
 		D219E86B1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */; };
-		D219E86E1F01002400650F38 /* LVCVodPlayerListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */; };
 		D224B1971E826ED800CC61D0 /* ChatBarrageAnimAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */; };
 		D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830F01E778C0F00627701 /* LiveBaseView.m */; };
 		D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FB1E77C2D900627701 /* BottomToolView.m */; };
 		D22830FF1E77C69E00627701 /* GiftListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FE1E77C69E00627701 /* GiftListView.m */; };
 		D22831091E77D8D500627701 /* GiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D22831081E77D8D500627701 /* GiftModel.m */; };
-		D233EE721EEA88EF00674ED5 /* LVCHomePageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D233EE711EEA88EF00674ED5 /* LVCHomePageViewController.m */; };
 		D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */; };
 		D23696841E7FC6A900E4BF71 /* chatListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D23696831E7FC6A900E4BF71 /* chatListCell.m */; };
 		D23696921E7FC83800E4BF71 /* chatMsgModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23696911E7FC83800E4BF71 /* chatMsgModel.m */; };
+		D2393D011F020D5700D3EE17 /* FeedbackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2393D001F020D5700D3EE17 /* FeedbackViewController.m */; };
 		D23BBDB81EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDB71EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m */; };
 		D23BBDBB1EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDBA1EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.m */; };
 		D23BBDBE1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDBD1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m */; };
@@ -235,28 +234,19 @@
 		D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */; };
 		D25BF87B1E7B8A82007FB138 /* SliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8791E7B8A82007FB138 /* SliderView.m */; };
 		D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */; };
-		D25BF8801E7BD266007FB138 /* LVCUGCLivePlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */; };
-		D25BF8831E7F775F007FB138 /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */; };
 		D25BF8901E7F7F8F007FB138 /* UGCLoading.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */; };
-		D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */; };
 		D25BF8A01E80C4BD007FB138 /* UIImage+LVCVagueImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */; };
 		D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8A21E80C4FC007FB138 /* Accelerate.framework */; };
 		D25BF8A51E80EC76007FB138 /* 头像.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF8A41E80EC76007FB138 /* 头像.jpg */; };
 		D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; };
 		D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; };
 		D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
-		D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB31E6EC154003A77C8 /* HomeViewController.m */; };
-		D28F5FFF1E8BC7EF00914142 /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */; };
 		D2994BA81E8F490400E8D2CC /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; };
 		D2994BA91E8F490400E8D2CC /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D2994BAA1E8F490700E8D2CC /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; };
 		D2994BAB1E8F490700E8D2CC /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; };
 		D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; };
-		D2A089E81E89FA720071412C /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */; };
-		D2A089EB1E8A09CB0071412C /* LVCUGCLivePlayerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */; };
-		D2A089EE1E8A336A0071412C /* LiveListService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089ED1E8A336A0071412C /* LiveListService.m */; };
-		D2A089F11E8A41120071412C /* LVCUGCLiveListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */; };
 		D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; };
 		D2B2ED801E88FC5200F7538A /* LVCUGCLiveEndView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B2ED7F1E88FC5200F7538A /* LVCUGCLiveEndView.m */; };
 		D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */; };
@@ -265,9 +255,18 @@
 		D2CBC13B1ECC157A00E00279 /* LVCVerifyLiveAuthService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2CBC13A1ECC157A00E00279 /* LVCVerifyLiveAuthService.m */; };
 		D2D7D18D1E8A581000217771 /* timg.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D2D7D18C1E8A581000217771 /* timg.jpeg */; };
 		D2EBC8571F01FF9200F198FB /* LVCCommentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */; };
-		D2EBC85A1F02011400F198FB /* LVCVodPlayerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */; };
-		D2EBC85D1F02031400F198FB /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */; };
-		D2F0486A1EE54E860011E39C /* LVCLiveActivityInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */; };
+		D2EBC8641F02105C00F198FB /* LVCHomePageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8631F02105C00F198FB /* LVCHomePageViewController.m */; };
+		D2EBC8711F02108000F198FB /* LiveListService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8661F02108000F198FB /* LiveListService.m */; };
+		D2EBC8721F02108000F198FB /* LVCLiveActivityInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */; };
+		D2EBC8741F02108000F198FB /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */; };
+		D2EBC8751F02108000F198FB /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */; };
+		D2EBC8761F02108000F198FB /* LVCUGCLivePlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */; };
+		D2EBC87B1F02108F00F198FB /* LVCUGCLiveListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8781F02108F00F198FB /* LVCUGCLiveListModel.m */; };
+		D2EBC87C1F02108F00F198FB /* LVCUGCLivePlayerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC87A1F02108F00F198FB /* LVCUGCLivePlayerModel.m */; };
+		D2EBC8831F02109C00F198FB /* LVCUGCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC87E1F02109C00F198FB /* LVCUGCBackgroundView.m */; };
+		D2EBC8841F02109C00F198FB /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8801F02109C00F198FB /* LVCUGCLivePlayerCell.m */; };
+		D2EBC8851F02109C00F198FB /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */; };
+		D2EBC8881F0225D900F198FB /* LVCVodPlayerListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */; };
 /* End PBXBuildFile section */
 /* Begin PBXContainerItemProxy section */
@@ -695,8 +694,6 @@
 		D217A24D1E7B77C7003B44CB /* ComboCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComboCell.m; path = Present/ComboCell.m; sourceTree = "<group>"; };
 		D219E8691EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCBigHorizontalCollectionViewCell.h; sourceTree = "<group>"; };
 		D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCBigHorizontalCollectionViewCell.m; sourceTree = "<group>"; };
-		D219E86C1F01002400650F38 /* LVCVodPlayerListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerListView.h; sourceTree = "<group>"; };
-		D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerListView.m; sourceTree = "<group>"; };
 		D224B1951E826ED800CC61D0 /* ChatBarrageAnimAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageAnimAction.h; sourceTree = "<group>"; };
 		D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageAnimAction.m; sourceTree = "<group>"; };
 		D22830EF1E778C0F00627701 /* LiveBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveBaseView.h; sourceTree = "<group>"; };
@@ -707,14 +704,14 @@
 		D22830FE1E77C69E00627701 /* GiftListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftListView.m; sourceTree = "<group>"; };
 		D22831071E77D8D500627701 /* GiftModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftModel.h; sourceTree = "<group>"; };
 		D22831081E77D8D500627701 /* GiftModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftModel.m; sourceTree = "<group>"; };
-		D233EE701EEA88EF00674ED5 /* LVCHomePageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCHomePageViewController.h; path = ../LVCHomePageViewController.h; sourceTree = "<group>"; };
-		D233EE711EEA88EF00674ED5 /* LVCHomePageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCHomePageViewController.m; path = ../LVCHomePageViewController.m; sourceTree = "<group>"; };
 		D236967C1E7F9E4100E4BF71 /* GiftPayButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftPayButton.h; sourceTree = "<group>"; };
 		D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftPayButton.m; sourceTree = "<group>"; };
 		D23696821E7FC6A900E4BF71 /* chatListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chatListCell.h; sourceTree = "<group>"; };
 		D23696831E7FC6A900E4BF71 /* chatListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = chatListCell.m; sourceTree = "<group>"; };
 		D23696901E7FC83800E4BF71 /* chatMsgModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chatMsgModel.h; sourceTree = "<group>"; };
 		D23696911E7FC83800E4BF71 /* chatMsgModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = chatMsgModel.m; sourceTree = "<group>"; };
+		D2393CFF1F020D5700D3EE17 /* FeedbackViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedbackViewController.h; sourceTree = "<group>"; };
+		D2393D001F020D5700D3EE17 /* FeedbackViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedbackViewController.m; sourceTree = "<group>"; };
 		D23BBDB61EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMainHeaderCollectionReusableView.h; sourceTree = "<group>"; };
 		D23BBDB71EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMainHeaderCollectionReusableView.m; sourceTree = "<group>"; };
 		D23BBDB91EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCBannerAndMarqueeModel.h; sourceTree = "<group>"; };
@@ -775,13 +772,7 @@
 		D25BF8781E7B8A82007FB138 /* SliderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderView.h; sourceTree = "<group>"; };
 		D25BF8791E7B8A82007FB138 /* SliderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SliderView.m; sourceTree = "<group>"; };
 		D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; sourceTree = "<group>"; };
-		D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerController.h; sourceTree = "<group>"; };
-		D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerController.m; sourceTree = "<group>"; };
-		D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCPlayerLoadingView.h; sourceTree = "<group>"; };
-		D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCPlayerLoadingView.m; sourceTree = "<group>"; };
 		D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = UGCLoading.jpeg; sourceTree = "<group>"; };
-		D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCBackgroundView.h; sourceTree = "<group>"; };
-		D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCBackgroundView.m; sourceTree = "<group>"; };
 		D25BF89E1E80C4BD007FB138 /* UIImage+LVCVagueImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+LVCVagueImage.h"; sourceTree = "<group>"; };
 		D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+LVCVagueImage.m"; sourceTree = "<group>"; };
 		D25BF8A21E80C4FC007FB138 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
@@ -792,24 +783,12 @@
 		D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveViewController.m; sourceTree = "<group>"; };
 		D2888DAF1E6EC05F003A77C8 /* TempViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TempViewController.h; sourceTree = "<group>"; };
 		D2888DB01E6EC05F003A77C8 /* TempViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TempViewController.m; sourceTree = "<group>"; };
-		D2888DB21E6EC154003A77C8 /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; };
-		D2888DB31E6EC154003A77C8 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
-		D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCUGCLiveListView.h; path = ../Controller/LVCUGCLiveListView.h; sourceTree = "<group>"; };
-		D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCUGCLiveListView.m; path = ../Controller/LVCUGCLiveListView.m; sourceTree = "<group>"; };
 		D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
 		D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
 		D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePrepareView.h; sourceTree = "<group>"; };
 		D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePrepareView.m; sourceTree = "<group>"; };
 		D29E81EB1E88DC5B008C9906 /* PriChatCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriChatCell.h; sourceTree = "<group>"; };
 		D29E81EC1E88DC5B008C9906 /* PriChatCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PriChatCell.m; sourceTree = "<group>"; };
-		D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerCell.h; sourceTree = "<group>"; };
-		D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerCell.m; sourceTree = "<group>"; };
-		D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerModel.h; sourceTree = "<group>"; };
-		D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerModel.m; sourceTree = "<group>"; };
-		D2A089EC1E8A336A0071412C /* LiveListService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveListService.h; sourceTree = "<group>"; };
-		D2A089ED1E8A336A0071412C /* LiveListService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveListService.m; sourceTree = "<group>"; };
-		D2A089EF1E8A41120071412C /* LVCUGCLiveListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListModel.h; sourceTree = "<group>"; };
-		D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListModel.m; sourceTree = "<group>"; };
 		D2A803061E80BD6F009D6F1C /* TopToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopToolView.h; sourceTree = "<group>"; };
 		D2A803071E80BD6F009D6F1C /* TopToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopToolView.m; sourceTree = "<group>"; };
 		D2B2ED7E1E88FC5200F7538A /* LVCUGCLiveEndView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveEndView.h; sourceTree = "<group>"; };
@@ -825,12 +804,30 @@
 		D2D7D18C1E8A581000217771 /* timg.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = timg.jpeg; sourceTree = "<group>"; };
 		D2EBC8551F01FF9200F198FB /* LVCCommentModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCCommentModel.h; sourceTree = "<group>"; };
 		D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCCommentModel.m; sourceTree = "<group>"; };
-		D2EBC8581F02011400F198FB /* LVCVodPlayerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerTableViewCell.h; sourceTree = "<group>"; };
-		D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerTableViewCell.m; sourceTree = "<group>"; };
-		D2EBC85B1F02031400F198FB /* LVCUGCLiveListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListController.h; sourceTree = "<group>"; };
-		D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListController.m; sourceTree = "<group>"; };
-		D2F048681EE54E860011E39C /* LVCLiveActivityInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveActivityInfoService.h; sourceTree = "<group>"; };
-		D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveActivityInfoService.m; sourceTree = "<group>"; };
+		D2EBC8621F02105C00F198FB /* LVCHomePageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCHomePageViewController.h; sourceTree = "<group>"; };
+		D2EBC8631F02105C00F198FB /* LVCHomePageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCHomePageViewController.m; sourceTree = "<group>"; };
+		D2EBC8651F02108000F198FB /* LiveListService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveListService.h; sourceTree = "<group>"; };
+		D2EBC8661F02108000F198FB /* LiveListService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveListService.m; sourceTree = "<group>"; };
+		D2EBC8671F02108000F198FB /* LVCLiveActivityInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveActivityInfoService.h; sourceTree = "<group>"; };
+		D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveActivityInfoService.m; sourceTree = "<group>"; };
+		D2EBC86B1F02108000F198FB /* LVCUGCLiveListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListController.h; sourceTree = "<group>"; };
+		D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListController.m; sourceTree = "<group>"; };
+		D2EBC86D1F02108000F198FB /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListView.h; sourceTree = "<group>"; };
+		D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListView.m; sourceTree = "<group>"; };
+		D2EBC86F1F02108000F198FB /* LVCUGCLivePlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerController.h; sourceTree = "<group>"; };
+		D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerController.m; sourceTree = "<group>"; };
+		D2EBC8771F02108F00F198FB /* LVCUGCLiveListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListModel.h; sourceTree = "<group>"; };
+		D2EBC8781F02108F00F198FB /* LVCUGCLiveListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListModel.m; sourceTree = "<group>"; };
+		D2EBC8791F02108F00F198FB /* LVCUGCLivePlayerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerModel.h; sourceTree = "<group>"; };
+		D2EBC87A1F02108F00F198FB /* LVCUGCLivePlayerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerModel.m; sourceTree = "<group>"; };
+		D2EBC87D1F02109C00F198FB /* LVCUGCBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCBackgroundView.h; sourceTree = "<group>"; };
+		D2EBC87E1F02109C00F198FB /* LVCUGCBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCBackgroundView.m; sourceTree = "<group>"; };
+		D2EBC87F1F02109C00F198FB /* LVCUGCLivePlayerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerCell.h; sourceTree = "<group>"; };
+		D2EBC8801F02109C00F198FB /* LVCUGCLivePlayerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerCell.m; sourceTree = "<group>"; };
+		D2EBC8811F02109C00F198FB /* LVCUGCPlayerLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCPlayerLoadingView.h; sourceTree = "<group>"; };
+		D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCPlayerLoadingView.m; sourceTree = "<group>"; };
+		D2EBC8861F0225D900F198FB /* LVCVodPlayerListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerListController.h; sourceTree = "<group>"; };
+		D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerListController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 /* Begin PBXFrameworksBuildPhase section */
@@ -879,6 +876,8 @@
 		4B45CE431EB86A590079AFB7 /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
+				D2393CFF1F020D5700D3EE17 /* FeedbackViewController.h */,
+				D2393D001F020D5700D3EE17 /* FeedbackViewController.m */,
 				4B45CE441EB86A590079AFB7 /* BeingAnchorController.h */,
 				4B45CE451EB86A590079AFB7 /* BeingAnchorController.m */,
 				4B45CE461EB86A590079AFB7 /* IDViewController.h */,
@@ -1191,10 +1190,6 @@
 		81A482FC1E88B0130097A80A /* Model */ = {
 			isa = PBXGroup;
 			children = (
-				D2A089EF1E8A41120071412C /* LVCUGCLiveListModel.h */,
-				D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */,
-				D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */,
-				D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */,
 				D2EBC8551F01FF9200F198FB /* LVCCommentModel.h */,
 				D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */,
 			);
@@ -1579,6 +1574,7 @@
 			children = (
 				4B45CE421EB86A590079AFB7 /* mySections */,
 				D2888DA71E6EC014003A77C8 /* homeSections */,
+				D2EBC85E1F020D3D00F198FB /* UGCSections */,
 				8178D41A1F02030500AA78A4 /* PGCSections */,
 				D2888D951E6EBAA7003A77C8 /* LiveSections */,
 				D2575C431E76846900E3A8FC /* InteractionSections */,
@@ -1907,8 +1903,8 @@
 		D233EE741EEE26C700674ED5 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				D233EE701EEA88EF00674ED5 /* LVCHomePageViewController.h */,
-				D233EE711EEA88EF00674ED5 /* LVCHomePageViewController.m */,
+				D2EBC8621F02105C00F198FB /* LVCHomePageViewController.h */,
+				D2EBC8631F02105C00F198FB /* LVCHomePageViewController.m */,
 			);
 			name = Controller;
 			sourceTree = "<group>";
@@ -2136,16 +2132,8 @@
 		D2888DA81E6EC014003A77C8 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
-				D2888DB21E6EC154003A77C8 /* HomeViewController.h */,
-				D2888DB31E6EC154003A77C8 /* HomeViewController.m */,
-				D2EBC85B1F02031400F198FB /* LVCUGCLiveListController.h */,
-				D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */,
-				D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */,
-				D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */,
-				D2A089EC1E8A336A0071412C /* LiveListService.h */,
-				D2A089ED1E8A336A0071412C /* LiveListService.m */,
-				D2F048681EE54E860011E39C /* LVCLiveActivityInfoService.h */,
-				D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */,
+				D2EBC8861F0225D900F198FB /* LVCVodPlayerListController.h */,
+				D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */,
 			);
 			path = Controller;
 			sourceTree = "<group>";
@@ -2153,18 +2141,6 @@
 		D2888DAA1E6EC014003A77C8 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */,
-				D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */,
-				D219E86C1F01002400650F38 /* LVCVodPlayerListView.h */,
-				D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */,
-				D2EBC8581F02011400F198FB /* LVCVodPlayerTableViewCell.h */,
-				D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */,
-				D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */,
-				D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */,
-				D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */,
-				D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */,
-				D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */,
-				D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -2184,6 +2160,57 @@
 			path = ChatBarrageManager;
 			sourceTree = "<group>";
 		};
+		D2EBC85E1F020D3D00F198FB /* UGCSections */ = {
+			isa = PBXGroup;
+			children = (
+				D2EBC85F1F020F3C00F198FB /* Controller */,
+				D2EBC8601F020F3C00F198FB /* Model */,
+				D2EBC8611F020F3C00F198FB /* View */,
+			);
+			path = UGCSections;
+			sourceTree = "<group>";
+		};
+		D2EBC85F1F020F3C00F198FB /* Controller */ = {
+			isa = PBXGroup;
+			children = (
+				D2EBC8651F02108000F198FB /* LiveListService.h */,
+				D2EBC8661F02108000F198FB /* LiveListService.m */,
+				D2EBC8671F02108000F198FB /* LVCLiveActivityInfoService.h */,
+				D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */,
+				D2EBC86B1F02108000F198FB /* LVCUGCLiveListController.h */,
+				D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */,
+				D2EBC86D1F02108000F198FB /* LVCUGCLiveListView.h */,
+				D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */,
+				D2EBC86F1F02108000F198FB /* LVCUGCLivePlayerController.h */,
+				D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */,
+			);
+			path = Controller;
+			sourceTree = "<group>";
+		};
+		D2EBC8601F020F3C00F198FB /* Model */ = {
+			isa = PBXGroup;
+			children = (
+				D2EBC8771F02108F00F198FB /* LVCUGCLiveListModel.h */,
+				D2EBC8781F02108F00F198FB /* LVCUGCLiveListModel.m */,
+				D2EBC8791F02108F00F198FB /* LVCUGCLivePlayerModel.h */,
+				D2EBC87A1F02108F00F198FB /* LVCUGCLivePlayerModel.m */,
+			);
+			path = Model;
+			sourceTree = "<group>";
+		};
+		D2EBC8611F020F3C00F198FB /* View */ = {
+			isa = PBXGroup;
+			children = (
+				D2EBC87D1F02109C00F198FB /* LVCUGCBackgroundView.h */,
+				D2EBC87E1F02109C00F198FB /* LVCUGCBackgroundView.m */,
+				D2EBC87F1F02109C00F198FB /* LVCUGCLivePlayerCell.h */,
+				D2EBC8801F02109C00F198FB /* LVCUGCLivePlayerCell.m */,
+				D2EBC8811F02109C00F198FB /* LVCUGCPlayerLoadingView.h */,
+				D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */,
+			);
+			path = View;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 /* Begin PBXNativeTarget section */
@@ -2337,20 +2364,17 @@
 				4B45CE8A1EB86A590079AFB7 /* LVCPersonCommonCell.m in Sources */,
 				D2029CC01E6EADE10027CD92 /* UIImage+GIF.m in Sources */,
 				4B45CE851EB86A590079AFB7 /* LVCClearCachesCell.m in Sources */,
-				D25BF8831E7F775F007FB138 /* LVCUGCPlayerLoadingView.m in Sources */,
 				4B45CE9B1EB86A760079AFB7 /* ZXUIKit.m in Sources */,
 				D214CB4F1EF7BD890014EEBA /* V8HorizontalPickerView.m in Sources */,
 				D2029BCF1E6EADD70027CD92 /* ZXTabBarController.m in Sources */,
 				D2029CB81E6EADE10027CD92 /* SDImageCache.m in Sources */,
 				D2029CBB1E6EADE10027CD92 /* SDWebImageDownloader.m in Sources */,
 				D2029CA71E6EADE10027CD92 /* MJRefreshAutoGifFooter.m in Sources */,
-				D28F5FFF1E8BC7EF00914142 /* LVCUGCLiveListView.m in Sources */,
 				D2029CC11E6EADE10027CD92 /* UIImage+MultiFormat.m in Sources */,
 				D245715F1E83B09900AA85D6 /* userInfoModel.m in Sources */,
 				8178D4241F02043500AA78A4 /* LVCFullScreenPlayerController.m in Sources */,
 				D2029C861E6EADE10027CD92 /* Tools.m in Sources */,
 				4B42A6C41EC00CC800DA09D7 /* UIAlertView+Blocks.m in Sources */,
-				D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */,
 				D214CB521EF7CB310014EEBA /* LVCChannelPagingView.m in Sources */,
 				4B45CE861EB86A590079AFB7 /* LVCLoginShowView.m in Sources */,
 				D2029CA01E6EADE10027CD92 /* NSObject+MJProperty.m in Sources */,
@@ -2359,7 +2383,6 @@
 				4B45CE981EB86A760079AFB7 /* UILabel+createLabel.m in Sources */,
 				D2029C9C1E6EADE10027CD92 /* MJPropertyType.m in Sources */,
 				D22831091E77D8D500627701 /* GiftModel.m in Sources */,
-				D2EBC85A1F02011400F198FB /* LVCVodPlayerTableViewCell.m in Sources */,
 				D23BBDBE1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m in Sources */,
 				D2029CCD1E6EADE10027CD92 /* SearchModel.m in Sources */,
 				4BD8560F1EBACEF80082061D /* CNLiveWebView.m in Sources */,
@@ -2370,8 +2393,6 @@
 				D2029CAF1E6EADE10027CD92 /* MJRefreshStateHeader.m in Sources */,
 				4BD856091EBACD530082061D /* UIRefreshControl+AFNetworking.m in Sources */,
 				81F1C8401E8BC5CC0085C2B8 /* NSArray+Safety.m in Sources */,
-				D2A089EE1E8A336A0071412C /* LiveListService.m in Sources */,
-				D2A089E81E89FA720071412C /* LVCUGCLivePlayerCell.m in Sources */,
 				D2029D011E6EAE2E0027CD92 /* UIColor+HexString.m in Sources */,
 				4B45CE7D1EB86A590079AFB7 /* ModifyInfomationController.m in Sources */,
 				D23BBDBB1EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.m in Sources */,
@@ -2383,6 +2404,7 @@
 				D2029CA51E6EADE10027CD92 /* MJRefreshFooter.m in Sources */,
 				D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */,
 				4BD856021EBACD530082061D /* AFURLSessionManager.m in Sources */,
+				D2EBC87B1F02108F00F198FB /* LVCUGCLiveListModel.m in Sources */,
 				4BD855FD1EBACD530082061D /* AFNetworkReachabilityManager.m in Sources */,
 				810B65061E779B1F00133E15 /* View+MASAdditions.m in Sources */,
 				D2029D161E6EB00D0027CD92 /* AppDelegate.m in Sources */,
@@ -2390,6 +2412,7 @@
 				4BD8561D1EBAD6490082061D /* ZXConst.m in Sources */,
 				D2029CB71E6EADE10027CD92 /* NSData+ImageContentType.m in Sources */,
 				D23DC1551ECC41C100103B0E /* LVCVerifyViewController.m in Sources */,
+				D2EBC8641F02105C00F198FB /* LVCHomePageViewController.m in Sources */,
 				D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */,
 				D2029CD01E6EADE10027CD92 /* SearchPresenter.m in Sources */,
 				D2029CBE1E6EADE10027CD92 /* SDWebImagePrefetcher.m in Sources */,
@@ -2415,11 +2438,9 @@
 				D2029CC51E6EADE10027CD92 /* UIView+WebCacheOperation.m in Sources */,
 				D2029CAB1E6EADE10027CD92 /* MJRefreshBackNormalFooter.m in Sources */,
 				4B45CEA61EB86B9F0079AFB7 /* NSNumber+ScaleHeight.m in Sources */,
-				D2EBC85D1F02031400F198FB /* LVCUGCLiveListController.m in Sources */,
 				810B65031E779B1F00133E15 /* MASViewConstraint.m in Sources */,
 				D2029BCE1E6EADD70027CD92 /* ZXNavigationController.m in Sources */,
 				D23BBDC71EF8FBD1002FE0B8 /* LVCSectionHeaderCollectionReusableView.m in Sources */,
-				D2F0486A1EE54E860011E39C /* LVCLiveActivityInfoService.m in Sources */,
 				D2029CA21E6EADE10027CD92 /* MJRefreshAutoFooter.m in Sources */,
 				D2029CC71E6EADE10027CD92 /* SVIndefiniteAnimatedView.m in Sources */,
 				D2029CA31E6EADE10027CD92 /* MJRefreshBackFooter.m in Sources */,
@@ -2435,15 +2456,15 @@
 				4B45CE801EB86A590079AFB7 /* idAndPwdView.m in Sources */,
 				8178D4521F02045500AA78A4 /* LVCPlayerLoadingView.m in Sources */,
 				D23BBDC41EF8FB99002FE0B8 /* LVCMainHorizontalCollectionViewCell.m in Sources */,
-				D233EE721EEA88EF00674ED5 /* LVCHomePageViewController.m in Sources */,
 				8178D4251F02043500AA78A4 /* LVCLivePlayerController.m in Sources */,
 				D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */,
 				4BD8560A1EBACD530082061D /* UIWebView+AFNetworking.m in Sources */,
 				D219E86B1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m in Sources */,
+				D2EBC8881F0225D900F198FB /* LVCVodPlayerListController.m in Sources */,
 				4B45CE831EB86A590079AFB7 /* LVCMineModel.m in Sources */,
 				4B45CE791EB86A590079AFB7 /* MineAboutUsController.m in Sources */,
 				81A483081E88B6140097A80A /* UIView+ViewController.m in Sources */,
-				D2A089EB1E8A09CB0071412C /* LVCUGCLivePlayerModel.m in Sources */,
+				D2EBC8721F02108000F198FB /* LVCLiveActivityInfoService.m in Sources */,
 				D2029CC81E6EADE10027CD92 /* SVProgressAnimatedView.m in Sources */,
 				4B45CE891EB86A590079AFB7 /* LVCPersonalImageCell.m in Sources */,
 				D2029C961E6EADE10027CD92 /* MBProgressHUD.m in Sources */,
@@ -2465,6 +2486,7 @@
 				4BD856071EBACD530082061D /* UIImageView+AFNetworking.m in Sources */,
 				D2029CC61E6EADE10027CD92 /* SSKeychain.m in Sources */,
 				4B45CE871EB86A590079AFB7 /* LVCMineCommonCell.m in Sources */,
+				D2EBC87C1F02108F00F198FB /* LVCUGCLivePlayerModel.m in Sources */,
 				8178D4621F02060B00AA78A4 /* LVCChatViewTableViewCell.m in Sources */,
 				811BB68E1E8116C8005C6291 /* NSString+StringSize.m in Sources */,
 				4BD856051EBACD530082061D /* UIAlertView+AFNetworking.m in Sources */,
@@ -2474,7 +2496,6 @@
 				8178D4641F02060B00AA78A4 /* LVCMessage.m in Sources */,
 				4B45CE8B1EB86A590079AFB7 /* LVCTextField.m in Sources */,
 				D2575C461E76857100E3A8FC /* LVCAnimationManager.m in Sources */,
-				D2A089F11E8A41120071412C /* LVCUGCLiveListModel.m in Sources */,
 				D2CBC13B1ECC157A00E00279 /* LVCVerifyLiveAuthService.m in Sources */,
 				D2029D041E6EAE2E0027CD92 /* UILabel+ContentSize.m in Sources */,
 				4B45CE7C1EB86A590079AFB7 /* MineSettingViewController.m in Sources */,
@@ -2500,22 +2521,22 @@
 				4BD855FA1EBACD530082061D /* AFHTTPRequestOperation.m in Sources */,
 				D2029D051E6EAE2E0027CD92 /* UILabel+labelFitSize.m in Sources */,
 				D2029CB21E6EADE10027CD92 /* UIScrollView+MJExtension.m in Sources */,
+				D2393D011F020D5700D3EE17 /* FeedbackViewController.m in Sources */,
 				D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */,
 				D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */,
 				4B45CEAB1EB86BFA0079AFB7 /* NSString+ZXExtension.m in Sources */,
 				D2029BCA1E6EADD70027CD92 /* BaseModel.m in Sources */,
 				D25BF87B1E7B8A82007FB138 /* SliderView.m in Sources */,
 				810B65041E779B1F00133E15 /* NSArray+MASAdditions.m in Sources */,
-				D25BF8801E7BD266007FB138 /* LVCUGCLivePlayerController.m in Sources */,
 				D2029D031E6EAE2E0027CD92 /* UIImage+ZXExtension.m in Sources */,
 				4BD855FC1EBACD530082061D /* AFHTTPSessionManager.m in Sources */,
 				4B45CE841EB86A590079AFB7 /* ModifyCommonView.m in Sources */,
-				D219E86E1F01002400650F38 /* LVCVodPlayerListView.m in Sources */,
 				4BD856081EBACD530082061D /* UIProgressView+AFNetworking.m in Sources */,
 				D24571581E8393EB00AA85D6 /* UIImageView+ZXExtension.m in Sources */,
 				D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */,
 				D2029CCA1E6EADE10027CD92 /* SVProgressHUD.m in Sources */,
 				D2029CA81E6EADE10027CD92 /* MJRefreshAutoNormalFooter.m in Sources */,
+				D2EBC8841F02109C00F198FB /* LVCUGCLivePlayerCell.m in Sources */,
 				4B45CE991EB86A760079AFB7 /* UITextField+createTextField.m in Sources */,
 				4B45CEA81EB86B9F0079AFB7 /* UserTools.m in Sources */,
 				D217A24A1E7B76C7003B44CB /* PresentView.m in Sources */,
@@ -2523,14 +2544,18 @@
 				8178D44B1F02045500AA78A4 /* CNBarrageView.m in Sources */,
 				8178D4311F02044300AA78A4 /* LVCChatRoomModel.m in Sources */,
 				4B45CEAE1EB873630079AFB7 /* UserInformationModel.m in Sources */,
+				D2EBC8741F02108000F198FB /* LVCUGCLiveListController.m in Sources */,
 				D2029CBA1E6EADE10027CD92 /* SDWebImageDecoder.m in Sources */,
 				4B45CE9A1EB86A760079AFB7 /* ZXLabel.m in Sources */,
 				D2029D081E6EAE2E0027CD92 /* ZXDeviceInfo.m in Sources */,
 				D24571631E83C40B00AA85D6 /* PrivateView.m in Sources */,
 				D2029CC21E6EADE10027CD92 /* UIImage+WebP.m in Sources */,
+				D2EBC8831F02109C00F198FB /* LVCUGCBackgroundView.m in Sources */,
 				4BD856001EBACD530082061D /* AFURLRequestSerialization.m in Sources */,
 				D2029BCD1E6EADD70027CD92 /* BaseViewController.m in Sources */,
 				4B45CE811EB86A590079AFB7 /* RegistBasicInformationView.m in Sources */,
+				D2EBC8851F02109C00F198FB /* LVCUGCPlayerLoadingView.m in Sources */,
+				D2EBC8711F02108000F198FB /* LiveListService.m in Sources */,
 				810B64FF1E779B1F00133E15 /* MASConstraint.m in Sources */,
 				8178D4611F02060B00AA78A4 /* LVCChatView.m in Sources */,
 				D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */,
@@ -2546,7 +2571,9 @@
 				D24CFC201EFA092300AA6ADB /* JBBannerView.m in Sources */,
 				D2029CBD1E6EADE10027CD92 /* SDWebImageManager.m in Sources */,
 				D2029CB41E6EADE10027CD92 /* UIView+MJExtension.m in Sources */,
+				D2EBC8751F02108000F198FB /* LVCUGCLiveListView.m in Sources */,
 				81FB5B3C1E7A6FFC00F98E1D /* SevenSwitch.m in Sources */,
+				D2EBC8761F02108000F198FB /* LVCUGCLivePlayerController.m in Sources */,
 				D2029CA91E6EADE10027CD92 /* MJRefreshAutoStateFooter.m in Sources */,
 				8178D4511F02045500AA78A4 /* LVCPlayer.m in Sources */,
 				D2029D061E6EAE2E0027CD92 /* UIView+Extension.m in Sources */,
@@ -2562,7 +2589,6 @@
 				4B45CE771EB86A590079AFB7 /* IDViewController.m in Sources */,
 				4BD855FF1EBACD530082061D /* AFURLConnectionOperation.m in Sources */,
 				8178D46E1F0225E500AA78A4 /* LVCTelevisionCell.m in Sources */,
-				D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */,
 				D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */,
 				D25530061E7911A800DF38A5 /* GiftAnimationAction.m in Sources */,
 				4B45CE881EB86A590079AFB7 /* LVCMineShowCell.m in Sources */,
@@ -8,15 +8,13 @@
 #import "ZXTabBarController.h"
 #import "ZXNavigationController.h"
-#import "HomeViewController.h"
 #import "LVCLiveViewController.h"
 #import "LVCMineViewController.h"
 #import "LVCTabBar.h"
 #import "LoginViewController.h"
-#import "LVCHomePageViewController.h"
-#import "LVCMineViewController.h"//
 #import "LVCUGCLiveListController.h"
 #import "LVCTelevisioController.h"
+#import "LVCVodPlayerListController.h"
 @interface ZXTabBarController ()<LVCTabBarDelegate>
@@ -53,8 +51,8 @@
 - (void)createUI
 {
-    [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"];
     [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCTelevisioController alloc]init]] title:@"" image:@"live_default" selectedImage:@"live_focused"];
+    [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCVodPlayerListController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"];
     [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCUGCLiveListController alloc]init]] title:@"" image:@"news_default" selectedImage:@"news_focused"];
     [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"];
 }
@@ -9,9 +9,6 @@
 #import "AppDelegate.h"
 #import "ZXTabBarController.h"
-#define KAppId @"60_irn9edco29"
-#define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
-
 @interface AppDelegate ()
 @end
 //
-//  HomeViewController.h
-//  ZXBaseProject
+//  FeedBackViewController.h
+//  CNLive
 //
-//  Created by 张旭 on 2017/1/10.
-//  Copyright © 2017年 cnlive. All rights reserved.
+//  Created by cnlive on 16/1/9.
+//  Copyright © 2016年 雷浩杰. All rights reserved.
 //
 #import "BaseViewController.h"
-@interface HomeViewController : BaseViewController
+@interface FeedBackViewController : BaseViewController
 @end
+//
+//  FeedBackViewController.m
+//  CNLive
+//
+//  Created by cnlive on 16/1/9.
+//  Copyright © 2016年 雷浩杰. All rights reserved.
+//
+
+#import "FeedbackViewController.h"
+
+#define MaxNumberOfTitleChars  100   //标题最多输入的字数
+
+@interface FeedBackViewController ()<UITextFieldDelegate,UITextViewDelegate,UIScrollViewDelegate>
+{
+    UITextView *_descriptionView;
+    UILabel *_desPlaceholder;
+    UITextField *_reportField;
+    UITextField *_phoneField;
+    UIScrollView *_bgScrollView;
+    UILabel *_wordsCountLab;
+}
+
+@property (nonatomic, strong) MBProgressHUD *progressHUD;
+
+@end
+
+@implementation FeedBackViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    self.title = @"反馈意见";
+//    self.view.backgroundColor = CommonBgColor;
+    [self initViews];
+
+    //注册键盘出现的通知
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(keyboardWasShown:)
+                                                 name:UIKeyboardWillShowNotification object:nil];
+    
+    //注册键盘消失的通知
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(keyboardWillBeHidden:)
+                                                 name:UIKeyboardWillHideNotification object:nil];
+    
+    UITapGestureRecognizer *singleRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSingleTapFrom)];
+    [_bgScrollView addGestureRecognizer:singleRecognizer];
+}
+
+- (void)initViews
+{
+    UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, 6, KScreenWidth, KScreenHeight-6)];
+    bgView.backgroundColor = [UIColor whiteColor];
+    [self.view addSubview:bgView];
+    
+    _bgScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 6, KScreenWidth, KScreenHeight-6)];
+    if (KScreenHeight<568) {
+        _bgScrollView.contentSize = CGSizeMake(KScreenWidth, 500);
+    }else{
+        _bgScrollView.contentSize = CGSizeMake(KScreenWidth, KScreenHeight-64);
+    }
+    _bgScrollView.delegate = self;
+    [self.view addSubview:_bgScrollView];
+    
+    [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 129.5, KScreenWidth-20, 0.5)];
+    [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 174.5, KScreenWidth-20, 0.5)];
+    [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 219.5, KScreenWidth-20, 0.5)];
+    
+    _descriptionView = [[UITextView alloc] initWithFrame:CGRectMake(5, 0, KScreenWidth-10, 129)];
+    _descriptionView.font = [UIFont systemFontOfSize:15];
+    _descriptionView.returnKeyType = UIReturnKeyDone;
+    _descriptionView.delegate = self;
+    [_bgScrollView addSubview:_descriptionView];
+    
+    _desPlaceholder = [[UILabel alloc] initWithFrame:CGRectMake(5, 9, KScreenWidth-20, 15)];
+    _desPlaceholder.text = @"输入您的反馈";
+    _desPlaceholder.font = [UIFont systemFontOfSize:15];
+    _desPlaceholder.textColor = [UIColor colorWithHexString:@"#c7c4c4"];
+    [_descriptionView addSubview:_desPlaceholder];
+    
+    _reportField = [[UITextField alloc] initWithFrame:CGRectMake(10, 130, KScreenWidth-20, 45)];
+    _reportField.placeholder = @"举报视频或上传者（可选）";
+    _reportField.font = [UIFont systemFontOfSize:15];
+    _reportField.returnKeyType = UIReturnKeyDone;
+    _reportField.delegate = self;
+    [_bgScrollView addSubview:_reportField];
+    
+    _phoneField = [[UITextField alloc] initWithFrame:CGRectMake(10, 175, KScreenWidth-20, 45)];
+    _phoneField.placeholder = @"您的QQ/电话/邮箱";
+    _phoneField.font = [UIFont systemFontOfSize:15];
+    _phoneField.returnKeyType = UIReturnKeyDone;
+    _phoneField.delegate = self;
+    [_bgScrollView addSubview:_phoneField];
+    
+    //字数限制label
+    _wordsCountLab = [[UILabel alloc] initWithFrame:CGRectMake(_descriptionView.size.width-60, _descriptionView.size.height-15, 60, 15)];
+    _wordsCountLab.text = @"0/100";
+    _wordsCountLab.textAlignment = NSTextAlignmentRight;
+    _wordsCountLab.textColor = [UIColor grayColorCNLive];
+    _wordsCountLab.font = [UIFont systemFontOfSize:15];
+    [_descriptionView addSubview:_wordsCountLab];
+    //提交
+//    UIButton *submitBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+//    [submitBtn setTitle:@"提  交" forState:UIControlStateNormal];
+//    submitBtn.backgroundColor = [UIColor yellowColorCNLive];
+//    [submitBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal];
+//    //[submitBtn setBackgroundImage:[[UIImage imageNamed:@"denglu"] stretchableImageWithLeftCapWidth:57 topCapHeight:0] forState:UIControlStateNormal];
+//    submitBtn.clipsToBounds = YES;
+//    submitBtn.layer.cornerRadius = 20.0f;
+//    submitBtn.layer.borderWidth = 1.0f;//设置边框宽度
+//    submitBtn.layer.borderColor = [UIColor blackColorCNLive].CGColor;//设置边框颜色
+     UIButton *submitBtn = [UIButton buttonWithTitle:@"提  交" titleColor:[UIColor blackColorCNLive] cornerRadius:20.0f borderWidth:1.0f borderColor:[UIColor blackColorCNLive] backgroundColor:[UIColor yellowColorCNLive]];
+    submitBtn.frame = CGRectMake(10, 295, KScreenWidth - 20, 40);
+    [submitBtn addTarget:self action:@selector(submitBtnAction) forControlEvents:UIControlEventTouchUpInside];
+    [_bgScrollView addSubview:submitBtn];
+}
+
+- (void)submitBtnAction
+{
+    [self request];
+}
+
+#pragma mark - request
+
+- (void)request
+{
+    [self handleSingleTapFrom];
+    
+    if ([Tools isEmptyString:_descriptionView.text]) {
+        [Tools showHUDInView:self.view withString:@"请填写要反馈的意见哈" autoHide:YES];
+        return;
+    }
+    if ([Tools isEmptyString:_phoneField.text]){
+        [Tools showHUDInView:self.view withString:@"填写联系方式有助于我们找到你哟" autoHide:YES];
+        return;
+    }
+    
+    if ([self isContainEmoji:_descriptionView.text]) {
+        [Tools showHUDInView:self.view withString:@"暂不支持表情输入" autoHide:YES];
+        return;
+    }
+        
+    self.progressHUD = [Tools showActivityHudInView:self.view withString:@""];
+    
+    NSDictionary *params = @{@"id":UserAppId,
+                             @"msg":[NSString stringWithFormat:@"描述：%@__上传者：%@__联系方式：%@",_descriptionView.text,_reportField.text,_phoneField.text]};
+    
+    [[AFHTTPRequestOperationManager manager] POST:feedback parameters:params success:^(AFHTTPRequestOperation *operation, id responseObject) {
+        
+        [self.progressHUD hide:YES];
+        [self performSelector:@selector(dismissView) withObject:nil afterDelay:2];
+        
+        responseObject = [responseObject validatedDictionary];
+        
+        if ([responseObject[@"errorCode"] isEqualToString:@"0"]) {
+            [Tools showHUDInView:self.view withString:@"收到反馈了，会尽快处理的" autoHide:YES];
+        }else{
+            [Tools showHUDInView:self.view withString:responseObject[@"errorMessage"] autoHide:YES];
+        }
+        
+    } failure:^(AFHTTPRequestOperation *operation, NSError *error) {
+        self.progressHUD = [Tools showActivityHudInView:self.view withString:@""];
+        [Tools showHUDInView:self.view withString:@"提交失败，请稍后再试!" autoHide:YES];
+        [self performSelector:@selector(dismissView) withObject:nil afterDelay:2];
+    }];
+
+//        if ([Tools isEmployeeQQNumber:_phoneField.text] || [Tools isValidateEmail:_phoneField.text] || [Tools isMobileNumber:_phoneField.text]) {
+//           
+//        }else{
+//            [Tools showHUDInView:self.view withString:@"请填写正确联系方式" autoHide:YES];
+//        }
+    
+}
+
+- (void)dismissView
+{
+    [self.navigationController popViewControllerAnimated:YES];
+}
+
+- (BOOL)isContainEmoji:(NSString *)string
+{
+    for (int i = 0; i < string.length; i++) {
+        
+        NSString *character = [string substringWithRange:NSMakeRange(i, 1)];
+        if (character.hash == 166842 || character.hash == 166839) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+    [textField resignFirstResponder];
+    
+    return YES;
+}
+
+#pragma mark - UITextViewDelegate
+
+- (void)textViewDidChange:(UITextView *)textView
+{
+    if (textView.text.length != 0) {
+        _desPlaceholder.hidden = YES;
+        if (textView.text.length > MaxNumberOfTitleChars) {
+            textView.text = [textView.text substringToIndex:MaxNumberOfTitleChars];
+        }
+        _wordsCountLab.text = [NSString stringWithFormat:@"%lu/100",(unsigned long)textView.text.length];
+    }else{
+        _desPlaceholder.hidden = NO;
+        _wordsCountLab.text = @"0/100";
+    }
+}
+
+-(BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString*)text
+{
+    if ([text isEqualToString:@"\n"]) {
+        [textView resignFirstResponder];
+        return NO;
+    }
+    return YES;
+}
+
+#pragma mark - 键盘监听
+- (void)keyboardWasShown:(NSNotification*)aNotification
+{
+    
+    BOOL desc = _descriptionView.isFirstResponder;
+    BOOL report  = _reportField.isFirstResponder;
+    BOOL number = _phoneField.isFirstResponder;
+    
+    if (desc) {
+        _bgScrollView.contentOffset = CGPointMake(0, 0);
+    } else if (report) {
+        _bgScrollView.contentOffset = CGPointMake(0, _reportField.origin.y-10);
+    } else if (number) {
+        _bgScrollView.contentOffset = CGPointMake(0, _phoneField.origin.y-10);
+    }
+    
+    _bgScrollView.contentSize = CGSizeMake(KScreenWidth, 750);
+    
+}
+
+- (void)keyboardWillBeHidden:(NSNotification*)aNotification
+{
+    _bgScrollView.contentOffset = CGPointMake(0, 0);
+    if (KScreenHeight<568) {
+        _bgScrollView.contentSize = CGSizeMake(KScreenWidth, 500);
+    }else{
+        _bgScrollView.contentSize = CGSizeMake(KScreenWidth, KScreenHeight-64);
+    }
+}
+
+#pragma mark - 收回键盘
+- (void)handleSingleTapFrom
+{
+    if ([_descriptionView isFirstResponder]) {
+        [_descriptionView resignFirstResponder];
+    }
+    if ([_reportField isFirstResponder]) {
+        [_reportField resignFirstResponder];
+    }
+    if ([_phoneField isFirstResponder]) {
+        [_phoneField resignFirstResponder];
+    }
+}
+
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
+{
+
+}
+
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end
@@ -147,7 +147,7 @@
 {
     if (!_localTitleArr)
     {
-        _localTitleArr = [[NSArray alloc] initWithObjects:@"我的消息", @"我的视频列表",@"我要直播", @"我的账户", @"设置", nil];
+        _localTitleArr = [[NSArray alloc] initWithObjects:@"设置", nil];
     }
     return _localTitleArr;
 }
@@ -155,7 +155,7 @@
 {
     if (!_localImageArr) {
-        _localImageArr = [[NSArray alloc] initWithObjects:@"message", @"I live",@"certification",@"account",@"Settings", nil];
+        _localImageArr = [[NSArray alloc] initWithObjects:@"Settings", nil];
     }
     return _localImageArr;
 }
@@ -198,38 +198,41 @@
 }
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if(indexPath.row == 0)
-    {
-        //我的消息
-        [self pushVC:[MineMessageController new]];
-        return;
-    }else if(indexPath.row == 1)
-    {   //我的视频列表
-        [self pushVC:[MineLiveController new]];
-        return;
-        
-    }else if (indexPath.row == 2)
-    {   //我要直播
-        if ([UserTools isLogin]) {
-            [self anchorCheck];
-        }
-        else
-        {
-            LoginViewController *loginVC = [[LoginViewController alloc] init];
-            [self.navigationController pushViewController:loginVC animated:YES];
-        }
-        return;
-    }else if (indexPath.row == 3)
-    {
-        //我的账户
-        [self pushVC:[MineAccountController new]];
-        return;
-        
-    }else if (indexPath.row == 4)
-    {   //设置
-        [self pushVC:[MineSettingViewController new]];
-        return;
-    }
+    [self pushVC:[MineSettingViewController new]];
+    return;
+    
+//    if(indexPath.row == 0)
+//    {
+//        //我的消息
+//        [self pushVC:[MineMessageController new]];
+//        return;
+//    }else if(indexPath.row == 1)
+//    {   //我的视频列表
+//        [self pushVC:[MineLiveController new]];
+//        return;
+//        
+//    }else if (indexPath.row == 2)
+//    {   //我要直播
+//        if ([UserTools isLogin]) {
+//            [self anchorCheck];
+//        }
+//        else
+//        {
+//            LoginViewController *loginVC = [[LoginViewController alloc] init];
+//            [self.navigationController pushViewController:loginVC animated:YES];
+//        }
+//        return;
+//    }else if (indexPath.row == 3)
+//    {
+//        //我的账户
+//        [self pushVC:[MineAccountController new]];
+//        return;
+//        
+//    }else if (indexPath.row == 4)
+//    {   //设置
+//        [self pushVC:[MineSettingViewController new]];
+//        return;
+//    }
 }
 - (void)pushVC:(UIViewController *)viewController
@@ -9,10 +9,8 @@
 #import "MineSettingViewController.h"
 #import "LVCMineCommonCell.h"
 #import "LVCMineModel.h"
-#import "LVCClearCachesCell.h"
 #import "LVCWebViewController.h"
-#import "MineAboutUsController.h"
-
+#import "FeedbackViewController.h"
 @interface MineSettingViewController ()<UITableViewDelegate,UITableViewDataSource>
 @property (nonatomic, strong) UITableView * tbv;
@@ -20,7 +18,7 @@
 @property (nonatomic, strong) NSMutableArray * localTitleArr;
 @property (nonatomic ,strong) NSArray *localImageArr;
-@property (nonatomic , strong) NSString *clearCacheName;//定义清除缓存
+//@property (nonatomic , strong) NSString *clearCacheName;//定义清除缓存
 @end
@@ -58,8 +56,7 @@
 - (NSMutableArray *)localTitleArr
 {
     if (!_localTitleArr) {
-        _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"清除缓存"],@[@"帮助",@"关于我们",@"反馈意见"], nil];
-        
+        _localTitleArr = [[NSMutableArray alloc] initWithObjects:@"反馈意见", nil];
     }
     return _localTitleArr;
 }
@@ -67,7 +64,7 @@
 {
     if (!_localImageArr) {
-        _localImageArr = [[NSArray alloc] initWithObjects:@[@"handShake"],@[@"MoreHelp",@"MoreAbout",@"MorePush"], nil];
+        _localImageArr = [[NSArray alloc] initWithObjects:@"MorePush", nil];
     }
     return _localImageArr;
@@ -81,8 +78,6 @@
         tableView.dataSource = self;
         tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         tableView.backgroundColor = CommonBgColor;
-        
-        [tableView registerClass:[LVCClearCachesCell class] forCellReuseIdentifier:NSStringFromClass([LVCClearCachesCell class])];
         [tableView registerClass:[LVCMineCommonCell class] forCellReuseIdentifier:NSStringFromClass([LVCMineCommonCell class])];
         _tbv = tableView;
     }
@@ -90,20 +85,10 @@
 }
 -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (indexPath.section == 0 && indexPath.row == 0) {
-        LVCClearCachesCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([LVCClearCachesCell class])];
-        [cell loadLocalTitle:_localTitleArr[indexPath.section][indexPath.row] imageName:self.localImageArr[indexPath.section][indexPath.row]];
-        return cell;
-    }else
-    {
-        LVCMineCommonCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([LVCMineCommonCell class]) forIndexPath:indexPath];
-        
-        [cell loadLocalTitle:_localTitleArr[indexPath.section][indexPath.row] imageName:self.localImageArr[indexPath.section][indexPath.row]];
-        return cell;
-        
-    }
-    return nil;
+    LVCMineCommonCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([LVCMineCommonCell class]) forIndexPath:indexPath];
+    [cell loadLocalTitle:_localTitleArr[indexPath.section][indexPath.row] imageName:self.localImageArr[indexPath.section][indexPath.row]];
+    return cell;
 }
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
@@ -121,25 +106,31 @@
 }
 -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 {
-    if (indexPath.section == 0 && indexPath.row == 0 && [_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"清除缓存"])
-    {
-        //清除缓存
-        NSLog(@"清除缓存");
-        return;
-    }
-    else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"帮助"])
-    {
-        LVCWebViewController *web = [[LVCWebViewController alloc] init];
-        web.url = @"http://data.cnlive.com/term/hdtv/hd_zhongguobi.html";
-        web.title = @"帮助";
-        [self.navigationController pushViewController:web animated:YES];
-    }
-    else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"关于我们"])
+    if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"反馈意见"])
     {
-        MineAboutUsController * vc = [MineAboutUsController new];
-        vc.title = self.localTitleArr[indexPath.section][indexPath.row];
+        FeedBackViewController * vc = [FeedBackViewController new];
+        //        vc.hidesBottomBarWhenPushed=YES;
         [self.navigationController pushViewController:vc animated:YES];
     }
+//    if (indexPath.section == 0 && indexPath.row == 0 && [_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"清除缓存"])
+//    {
+//        //清除缓存
+//        NSLog(@"清除缓存");
+//        return;
+//    }
+//    else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"帮助"])
+//    {
+//        LVCWebViewController *web = [[LVCWebViewController alloc] init];
+//        web.url = @"http://data.cnlive.com/term/hdtv/hd_zhongguobi.html";
+//        web.title = @"帮助";
+//        [self.navigationController pushViewController:web animated:YES];
+//    }
+//    else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"关于我们"])
+//    {
+//        MineAboutUsController * vc = [MineAboutUsController new];
+//        vc.title = self.localTitleArr[indexPath.section][indexPath.row];
+//        [self.navigationController pushViewController:vc animated:YES];
+//    }
 }
 -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
 {
@@ -13,8 +13,6 @@
 #import "UIImage+LVCVagueImage.h"
 #import "LiveBaseView.h"
 #import "MineLiveController.h"
-#import "HomeViewController.h"
-
 @interface LVCUGCLivePlayerController () {
@@ -119,10 +117,11 @@
         if ([controller isKindOfClass:[MineLiveController class]]) {
             MineLiveController *revise =(MineLiveController *)controller;
             [self.navigationController popToViewController:revise animated:YES];
-        } else if ([controller isKindOfClass:[HomeViewController class]]) {
-            HomeViewController *revise =(HomeViewController *)controller;
-            [self.navigationController popToViewController:revise animated:YES];
         }
+//        else if ([controller isKindOfClass:[HomeViewController class]]) {
+//            HomeViewController *revise =(HomeViewController *)controller;
+//            [self.navigationController popToViewController:revise animated:YES];
+//        }
     }
 }
 //
-//  LVCVodPlayerTableViewCell.h
+//  LVCVodPlayerListController.h
 //  LiveVideoCloud
 //
 //  Created by cnliveJunBo on 17/6/27.
@@ -8,6 +8,6 @@
 #import <UIKit/UIKit.h>
-@interface LVCVodPlayerTableViewCell : UITableViewCell
+@interface LVCVodPlayerListController : UIViewController
 @end
 //
-//  LVCVodPlayerListView.m
+//  LVCVodPlayerListController.m
 //  LiveVideoCloud
 //
-//  Created by cnliveJunBo on 17/6/26.
+//  Created by cnliveJunBo on 17/6/27.
 //  Copyright © 2017年 cnlive. All rights reserved.
 //
-#import "LVCVodPlayerListView.h"
-#import "LVCVodPlayerTableViewCell.h"
+#import "LVCVodPlayerListController.h"
 static NSString *vodCellId = @"vodCellId";
-@interface LVCVodPlayerListView()<UITableViewDelegate, UITableViewDataSource> {
+@interface LVCVodPlayerListController ()<UITableViewDelegate, UITableViewDataSource> {
     AFHTTPRequestOperation *_operation;
     NSMutableArray *_programArrayM;
@@ -21,17 +20,14 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
 @end
-@implementation LVCVodPlayerListView
+@implementation LVCVodPlayerListController
-- (instancetype)initWithFrame:(CGRect)frame
-{
-    self = [super initWithFrame:frame];
-    if (self) {
-        self.backgroundColor = [UIColor whiteColor];
-        _programArrayM = [[NSMutableArray alloc] init];
-        [self requestVodPlayerList];
-    }
-    return self;
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    self.navigationItem.title = @"点播";
+    self.view.backgroundColor = [UIColor whiteColor];
+    _programArrayM = [[NSMutableArray alloc] init];
 }
 - (void)requestVodPlayerList {
@@ -92,7 +88,7 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
 - (UITableView *)tableView {
     if (!_tableView) {
-        _tableView = [[UITableView alloc] initWithFrame:self.bounds style:UITableViewStylePlain];
+        _tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStylePlain];
         _tableView.dataSource = self;
         _tableView.delegate = self;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
@@ -100,8 +96,8 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
         UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, -KScreenHeight, KScreenWidth, KScreenHeight)];
         view.backgroundColor = [UIColor backgroundColor];
         [_tableView addSubview:view];
-    
-        [_tableView registerClass:[LVCVodPlayerTableViewCell class] forCellReuseIdentifier:vodCellId];
+        
+        [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:vodCellId];
     }
     return _tableView;
 }
@@ -121,4 +117,9 @@ static NSString *vodCellId = @&quot;vodCellId&quot;;
     }
 }
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
 @end
-//
-//  LVCVodPlayerListView.h
-//  LiveVideoCloud
-//
-//  Created by cnliveJunBo on 17/6/26.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface LVCVodPlayerListView : UIView
-
-@end
-//
-//  LVCVodPlayerTableViewCell.m
-//  LiveVideoCloud
-//
-//  Created by cnliveJunBo on 17/6/27.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "LVCVodPlayerTableViewCell.h"
-
-@implementation LVCVodPlayerTableViewCell
-
-- (void)awakeFromNib {
-    [super awakeFromNib];
-    // Initialization code
-}
-
-- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-    [super setSelected:selected animated:animated];
-
-    // Configure the view for the selected state
-}
-
-@end