Commit c709ed49c6a9caf7395ba7952489abf630386904
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
Showing
33 changed files
with
501 additions
and
230 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
| ... | ... | @@ -194,16 +194,15 @@ |
| 194 | 194 | D217A24B1E7B76C7003B44CB /* PresentViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2491E7B76C7003B44CB /* PresentViewCell.m */; }; |
| 195 | 195 | D217A24E1E7B77C7003B44CB /* ComboCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A24D1E7B77C7003B44CB /* ComboCell.m */; }; |
| 196 | 196 | D219E86B1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */; }; |
| 197 | - D219E86E1F01002400650F38 /* LVCVodPlayerListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */; }; | |
| 198 | 197 | D224B1971E826ED800CC61D0 /* ChatBarrageAnimAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */; }; |
| 199 | 198 | D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830F01E778C0F00627701 /* LiveBaseView.m */; }; |
| 200 | 199 | D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FB1E77C2D900627701 /* BottomToolView.m */; }; |
| 201 | 200 | D22830FF1E77C69E00627701 /* GiftListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D22830FE1E77C69E00627701 /* GiftListView.m */; }; |
| 202 | 201 | D22831091E77D8D500627701 /* GiftModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D22831081E77D8D500627701 /* GiftModel.m */; }; |
| 203 | - D233EE721EEA88EF00674ED5 /* LVCHomePageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D233EE711EEA88EF00674ED5 /* LVCHomePageViewController.m */; }; | |
| 204 | 202 | D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */; }; |
| 205 | 203 | D23696841E7FC6A900E4BF71 /* chatListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D23696831E7FC6A900E4BF71 /* chatListCell.m */; }; |
| 206 | 204 | D23696921E7FC83800E4BF71 /* chatMsgModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23696911E7FC83800E4BF71 /* chatMsgModel.m */; }; |
| 205 | + D2393D011F020D5700D3EE17 /* FeedbackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2393D001F020D5700D3EE17 /* FeedbackViewController.m */; }; | |
| 207 | 206 | D23BBDB81EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDB71EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m */; }; |
| 208 | 207 | D23BBDBB1EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDBA1EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.m */; }; |
| 209 | 208 | D23BBDBE1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D23BBDBD1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m */; }; |
| ... | ... | @@ -235,28 +234,19 @@ |
| 235 | 234 | D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */; }; |
| 236 | 235 | D25BF87B1E7B8A82007FB138 /* SliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8791E7B8A82007FB138 /* SliderView.m */; }; |
| 237 | 236 | D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */; }; |
| 238 | - D25BF8801E7BD266007FB138 /* LVCUGCLivePlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */; }; | |
| 239 | - D25BF8831E7F775F007FB138 /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */; }; | |
| 240 | 237 | D25BF8901E7F7F8F007FB138 /* UGCLoading.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */; }; |
| 241 | - D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */; }; | |
| 242 | 238 | D25BF8A01E80C4BD007FB138 /* UIImage+LVCVagueImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */; }; |
| 243 | 239 | D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8A21E80C4FC007FB138 /* Accelerate.framework */; }; |
| 244 | 240 | D25BF8A51E80EC76007FB138 /* 头像.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF8A41E80EC76007FB138 /* 头像.jpg */; }; |
| 245 | 241 | D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; }; |
| 246 | 242 | D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; }; |
| 247 | 243 | D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; }; |
| 248 | - D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB31E6EC154003A77C8 /* HomeViewController.m */; }; | |
| 249 | - D28F5FFF1E8BC7EF00914142 /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */; }; | |
| 250 | 244 | D2994BA81E8F490400E8D2CC /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; }; |
| 251 | 245 | D2994BA91E8F490400E8D2CC /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; |
| 252 | 246 | D2994BAA1E8F490700E8D2CC /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; }; |
| 253 | 247 | D2994BAB1E8F490700E8D2CC /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; |
| 254 | 248 | D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; }; |
| 255 | 249 | D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; }; |
| 256 | - D2A089E81E89FA720071412C /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */; }; | |
| 257 | - D2A089EB1E8A09CB0071412C /* LVCUGCLivePlayerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */; }; | |
| 258 | - D2A089EE1E8A336A0071412C /* LiveListService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089ED1E8A336A0071412C /* LiveListService.m */; }; | |
| 259 | - D2A089F11E8A41120071412C /* LVCUGCLiveListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */; }; | |
| 260 | 250 | D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; }; |
| 261 | 251 | D2B2ED801E88FC5200F7538A /* LVCUGCLiveEndView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B2ED7F1E88FC5200F7538A /* LVCUGCLiveEndView.m */; }; |
| 262 | 252 | D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */; }; |
| ... | ... | @@ -265,9 +255,18 @@ |
| 265 | 255 | D2CBC13B1ECC157A00E00279 /* LVCVerifyLiveAuthService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2CBC13A1ECC157A00E00279 /* LVCVerifyLiveAuthService.m */; }; |
| 266 | 256 | D2D7D18D1E8A581000217771 /* timg.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D2D7D18C1E8A581000217771 /* timg.jpeg */; }; |
| 267 | 257 | D2EBC8571F01FF9200F198FB /* LVCCommentModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */; }; |
| 268 | - D2EBC85A1F02011400F198FB /* LVCVodPlayerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */; }; | |
| 269 | - D2EBC85D1F02031400F198FB /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */; }; | |
| 270 | - D2F0486A1EE54E860011E39C /* LVCLiveActivityInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */; }; | |
| 258 | + D2EBC8641F02105C00F198FB /* LVCHomePageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8631F02105C00F198FB /* LVCHomePageViewController.m */; }; | |
| 259 | + D2EBC8711F02108000F198FB /* LiveListService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8661F02108000F198FB /* LiveListService.m */; }; | |
| 260 | + D2EBC8721F02108000F198FB /* LVCLiveActivityInfoService.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */; }; | |
| 261 | + D2EBC8741F02108000F198FB /* LVCUGCLiveListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */; }; | |
| 262 | + D2EBC8751F02108000F198FB /* LVCUGCLiveListView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */; }; | |
| 263 | + D2EBC8761F02108000F198FB /* LVCUGCLivePlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */; }; | |
| 264 | + D2EBC87B1F02108F00F198FB /* LVCUGCLiveListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8781F02108F00F198FB /* LVCUGCLiveListModel.m */; }; | |
| 265 | + D2EBC87C1F02108F00F198FB /* LVCUGCLivePlayerModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC87A1F02108F00F198FB /* LVCUGCLivePlayerModel.m */; }; | |
| 266 | + D2EBC8831F02109C00F198FB /* LVCUGCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC87E1F02109C00F198FB /* LVCUGCBackgroundView.m */; }; | |
| 267 | + D2EBC8841F02109C00F198FB /* LVCUGCLivePlayerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8801F02109C00F198FB /* LVCUGCLivePlayerCell.m */; }; | |
| 268 | + D2EBC8851F02109C00F198FB /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */; }; | |
| 269 | + D2EBC8881F0225D900F198FB /* LVCVodPlayerListController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */; }; | |
| 271 | 270 | /* End PBXBuildFile section */ |
| 272 | 271 | |
| 273 | 272 | /* Begin PBXContainerItemProxy section */ |
| ... | ... | @@ -695,8 +694,6 @@ |
| 695 | 694 | D217A24D1E7B77C7003B44CB /* ComboCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ComboCell.m; path = Present/ComboCell.m; sourceTree = "<group>"; }; |
| 696 | 695 | D219E8691EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCBigHorizontalCollectionViewCell.h; sourceTree = "<group>"; }; |
| 697 | 696 | D219E86A1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCBigHorizontalCollectionViewCell.m; sourceTree = "<group>"; }; |
| 698 | - D219E86C1F01002400650F38 /* LVCVodPlayerListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerListView.h; sourceTree = "<group>"; }; | |
| 699 | - D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerListView.m; sourceTree = "<group>"; }; | |
| 700 | 697 | D224B1951E826ED800CC61D0 /* ChatBarrageAnimAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageAnimAction.h; sourceTree = "<group>"; }; |
| 701 | 698 | D224B1961E826ED800CC61D0 /* ChatBarrageAnimAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageAnimAction.m; sourceTree = "<group>"; }; |
| 702 | 699 | D22830EF1E778C0F00627701 /* LiveBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveBaseView.h; sourceTree = "<group>"; }; |
| ... | ... | @@ -707,14 +704,14 @@ |
| 707 | 704 | D22830FE1E77C69E00627701 /* GiftListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftListView.m; sourceTree = "<group>"; }; |
| 708 | 705 | D22831071E77D8D500627701 /* GiftModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftModel.h; sourceTree = "<group>"; }; |
| 709 | 706 | D22831081E77D8D500627701 /* GiftModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftModel.m; sourceTree = "<group>"; }; |
| 710 | - D233EE701EEA88EF00674ED5 /* LVCHomePageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCHomePageViewController.h; path = ../LVCHomePageViewController.h; sourceTree = "<group>"; }; | |
| 711 | - D233EE711EEA88EF00674ED5 /* LVCHomePageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCHomePageViewController.m; path = ../LVCHomePageViewController.m; sourceTree = "<group>"; }; | |
| 712 | 707 | D236967C1E7F9E4100E4BF71 /* GiftPayButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftPayButton.h; sourceTree = "<group>"; }; |
| 713 | 708 | D236967D1E7F9E4100E4BF71 /* GiftPayButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftPayButton.m; sourceTree = "<group>"; }; |
| 714 | 709 | D23696821E7FC6A900E4BF71 /* chatListCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chatListCell.h; sourceTree = "<group>"; }; |
| 715 | 710 | D23696831E7FC6A900E4BF71 /* chatListCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = chatListCell.m; sourceTree = "<group>"; }; |
| 716 | 711 | D23696901E7FC83800E4BF71 /* chatMsgModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = chatMsgModel.h; sourceTree = "<group>"; }; |
| 717 | 712 | D23696911E7FC83800E4BF71 /* chatMsgModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = chatMsgModel.m; sourceTree = "<group>"; }; |
| 713 | + D2393CFF1F020D5700D3EE17 /* FeedbackViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedbackViewController.h; sourceTree = "<group>"; }; | |
| 714 | + D2393D001F020D5700D3EE17 /* FeedbackViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedbackViewController.m; sourceTree = "<group>"; }; | |
| 718 | 715 | D23BBDB61EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMainHeaderCollectionReusableView.h; sourceTree = "<group>"; }; |
| 719 | 716 | D23BBDB71EF8D15D002FE0B8 /* LVCMainHeaderCollectionReusableView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMainHeaderCollectionReusableView.m; sourceTree = "<group>"; }; |
| 720 | 717 | D23BBDB91EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCBannerAndMarqueeModel.h; sourceTree = "<group>"; }; |
| ... | ... | @@ -775,13 +772,7 @@ |
| 775 | 772 | D25BF8781E7B8A82007FB138 /* SliderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderView.h; sourceTree = "<group>"; }; |
| 776 | 773 | D25BF8791E7B8A82007FB138 /* SliderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SliderView.m; sourceTree = "<group>"; }; |
| 777 | 774 | D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; sourceTree = "<group>"; }; |
| 778 | - D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerController.h; sourceTree = "<group>"; }; | |
| 779 | - D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerController.m; sourceTree = "<group>"; }; | |
| 780 | - D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCPlayerLoadingView.h; sourceTree = "<group>"; }; | |
| 781 | - D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCPlayerLoadingView.m; sourceTree = "<group>"; }; | |
| 782 | 775 | D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = UGCLoading.jpeg; sourceTree = "<group>"; }; |
| 783 | - D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCBackgroundView.h; sourceTree = "<group>"; }; | |
| 784 | - D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCBackgroundView.m; sourceTree = "<group>"; }; | |
| 785 | 776 | D25BF89E1E80C4BD007FB138 /* UIImage+LVCVagueImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+LVCVagueImage.h"; sourceTree = "<group>"; }; |
| 786 | 777 | D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+LVCVagueImage.m"; sourceTree = "<group>"; }; |
| 787 | 778 | D25BF8A21E80C4FC007FB138 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; |
| ... | ... | @@ -792,24 +783,12 @@ |
| 792 | 783 | D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveViewController.m; sourceTree = "<group>"; }; |
| 793 | 784 | D2888DAF1E6EC05F003A77C8 /* TempViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TempViewController.h; sourceTree = "<group>"; }; |
| 794 | 785 | D2888DB01E6EC05F003A77C8 /* TempViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TempViewController.m; sourceTree = "<group>"; }; |
| 795 | - D2888DB21E6EC154003A77C8 /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; }; | |
| 796 | - D2888DB31E6EC154003A77C8 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; }; | |
| 797 | - D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCUGCLiveListView.h; path = ../Controller/LVCUGCLiveListView.h; sourceTree = "<group>"; }; | |
| 798 | - D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCUGCLiveListView.m; path = ../Controller/LVCUGCLiveListView.m; sourceTree = "<group>"; }; | |
| 799 | 786 | D2994BA41E8F48DE00E8D2CC /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; }; |
| 800 | 787 | D2994BA51E8F48DE00E8D2CC /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; }; |
| 801 | 788 | D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePrepareView.h; sourceTree = "<group>"; }; |
| 802 | 789 | D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePrepareView.m; sourceTree = "<group>"; }; |
| 803 | 790 | D29E81EB1E88DC5B008C9906 /* PriChatCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriChatCell.h; sourceTree = "<group>"; }; |
| 804 | 791 | D29E81EC1E88DC5B008C9906 /* PriChatCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PriChatCell.m; sourceTree = "<group>"; }; |
| 805 | - D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerCell.h; sourceTree = "<group>"; }; | |
| 806 | - D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerCell.m; sourceTree = "<group>"; }; | |
| 807 | - D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerModel.h; sourceTree = "<group>"; }; | |
| 808 | - D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerModel.m; sourceTree = "<group>"; }; | |
| 809 | - D2A089EC1E8A336A0071412C /* LiveListService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveListService.h; sourceTree = "<group>"; }; | |
| 810 | - D2A089ED1E8A336A0071412C /* LiveListService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveListService.m; sourceTree = "<group>"; }; | |
| 811 | - D2A089EF1E8A41120071412C /* LVCUGCLiveListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListModel.h; sourceTree = "<group>"; }; | |
| 812 | - D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListModel.m; sourceTree = "<group>"; }; | |
| 813 | 792 | D2A803061E80BD6F009D6F1C /* TopToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopToolView.h; sourceTree = "<group>"; }; |
| 814 | 793 | D2A803071E80BD6F009D6F1C /* TopToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopToolView.m; sourceTree = "<group>"; }; |
| 815 | 794 | D2B2ED7E1E88FC5200F7538A /* LVCUGCLiveEndView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveEndView.h; sourceTree = "<group>"; }; |
| ... | ... | @@ -825,12 +804,30 @@ |
| 825 | 804 | D2D7D18C1E8A581000217771 /* timg.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = timg.jpeg; sourceTree = "<group>"; }; |
| 826 | 805 | D2EBC8551F01FF9200F198FB /* LVCCommentModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCCommentModel.h; sourceTree = "<group>"; }; |
| 827 | 806 | D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCCommentModel.m; sourceTree = "<group>"; }; |
| 828 | - D2EBC8581F02011400F198FB /* LVCVodPlayerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerTableViewCell.h; sourceTree = "<group>"; }; | |
| 829 | - D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerTableViewCell.m; sourceTree = "<group>"; }; | |
| 830 | - D2EBC85B1F02031400F198FB /* LVCUGCLiveListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListController.h; sourceTree = "<group>"; }; | |
| 831 | - D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListController.m; sourceTree = "<group>"; }; | |
| 832 | - D2F048681EE54E860011E39C /* LVCLiveActivityInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveActivityInfoService.h; sourceTree = "<group>"; }; | |
| 833 | - D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveActivityInfoService.m; sourceTree = "<group>"; }; | |
| 807 | + D2EBC8621F02105C00F198FB /* LVCHomePageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCHomePageViewController.h; sourceTree = "<group>"; }; | |
| 808 | + D2EBC8631F02105C00F198FB /* LVCHomePageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCHomePageViewController.m; sourceTree = "<group>"; }; | |
| 809 | + D2EBC8651F02108000F198FB /* LiveListService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveListService.h; sourceTree = "<group>"; }; | |
| 810 | + D2EBC8661F02108000F198FB /* LiveListService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LiveListService.m; sourceTree = "<group>"; }; | |
| 811 | + D2EBC8671F02108000F198FB /* LVCLiveActivityInfoService.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveActivityInfoService.h; sourceTree = "<group>"; }; | |
| 812 | + D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCLiveActivityInfoService.m; sourceTree = "<group>"; }; | |
| 813 | + D2EBC86B1F02108000F198FB /* LVCUGCLiveListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListController.h; sourceTree = "<group>"; }; | |
| 814 | + D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListController.m; sourceTree = "<group>"; }; | |
| 815 | + D2EBC86D1F02108000F198FB /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListView.h; sourceTree = "<group>"; }; | |
| 816 | + D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListView.m; sourceTree = "<group>"; }; | |
| 817 | + D2EBC86F1F02108000F198FB /* LVCUGCLivePlayerController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerController.h; sourceTree = "<group>"; }; | |
| 818 | + D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerController.m; sourceTree = "<group>"; }; | |
| 819 | + D2EBC8771F02108F00F198FB /* LVCUGCLiveListModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListModel.h; sourceTree = "<group>"; }; | |
| 820 | + D2EBC8781F02108F00F198FB /* LVCUGCLiveListModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListModel.m; sourceTree = "<group>"; }; | |
| 821 | + D2EBC8791F02108F00F198FB /* LVCUGCLivePlayerModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerModel.h; sourceTree = "<group>"; }; | |
| 822 | + D2EBC87A1F02108F00F198FB /* LVCUGCLivePlayerModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerModel.m; sourceTree = "<group>"; }; | |
| 823 | + D2EBC87D1F02109C00F198FB /* LVCUGCBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCBackgroundView.h; sourceTree = "<group>"; }; | |
| 824 | + D2EBC87E1F02109C00F198FB /* LVCUGCBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCBackgroundView.m; sourceTree = "<group>"; }; | |
| 825 | + D2EBC87F1F02109C00F198FB /* LVCUGCLivePlayerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePlayerCell.h; sourceTree = "<group>"; }; | |
| 826 | + D2EBC8801F02109C00F198FB /* LVCUGCLivePlayerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePlayerCell.m; sourceTree = "<group>"; }; | |
| 827 | + D2EBC8811F02109C00F198FB /* LVCUGCPlayerLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCPlayerLoadingView.h; sourceTree = "<group>"; }; | |
| 828 | + D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCPlayerLoadingView.m; sourceTree = "<group>"; }; | |
| 829 | + D2EBC8861F0225D900F198FB /* LVCVodPlayerListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCVodPlayerListController.h; sourceTree = "<group>"; }; | |
| 830 | + D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCVodPlayerListController.m; sourceTree = "<group>"; }; | |
| 834 | 831 | /* End PBXFileReference section */ |
| 835 | 832 | |
| 836 | 833 | /* Begin PBXFrameworksBuildPhase section */ |
| ... | ... | @@ -879,6 +876,8 @@ |
| 879 | 876 | 4B45CE431EB86A590079AFB7 /* Controllers */ = { |
| 880 | 877 | isa = PBXGroup; |
| 881 | 878 | children = ( |
| 879 | + D2393CFF1F020D5700D3EE17 /* FeedbackViewController.h */, | |
| 880 | + D2393D001F020D5700D3EE17 /* FeedbackViewController.m */, | |
| 882 | 881 | 4B45CE441EB86A590079AFB7 /* BeingAnchorController.h */, |
| 883 | 882 | 4B45CE451EB86A590079AFB7 /* BeingAnchorController.m */, |
| 884 | 883 | 4B45CE461EB86A590079AFB7 /* IDViewController.h */, |
| ... | ... | @@ -1191,10 +1190,6 @@ |
| 1191 | 1190 | 81A482FC1E88B0130097A80A /* Model */ = { |
| 1192 | 1191 | isa = PBXGroup; |
| 1193 | 1192 | children = ( |
| 1194 | - D2A089EF1E8A41120071412C /* LVCUGCLiveListModel.h */, | |
| 1195 | - D2A089F01E8A41120071412C /* LVCUGCLiveListModel.m */, | |
| 1196 | - D2A089E91E8A09CB0071412C /* LVCUGCLivePlayerModel.h */, | |
| 1197 | - D2A089EA1E8A09CB0071412C /* LVCUGCLivePlayerModel.m */, | |
| 1198 | 1193 | D2EBC8551F01FF9200F198FB /* LVCCommentModel.h */, |
| 1199 | 1194 | D2EBC8561F01FF9200F198FB /* LVCCommentModel.m */, |
| 1200 | 1195 | ); |
| ... | ... | @@ -1579,6 +1574,7 @@ |
| 1579 | 1574 | children = ( |
| 1580 | 1575 | 4B45CE421EB86A590079AFB7 /* mySections */, |
| 1581 | 1576 | D2888DA71E6EC014003A77C8 /* homeSections */, |
| 1577 | + D2EBC85E1F020D3D00F198FB /* UGCSections */, | |
| 1582 | 1578 | 8178D41A1F02030500AA78A4 /* PGCSections */, |
| 1583 | 1579 | D2888D951E6EBAA7003A77C8 /* LiveSections */, |
| 1584 | 1580 | D2575C431E76846900E3A8FC /* InteractionSections */, |
| ... | ... | @@ -1907,8 +1903,8 @@ |
| 1907 | 1903 | D233EE741EEE26C700674ED5 /* Controller */ = { |
| 1908 | 1904 | isa = PBXGroup; |
| 1909 | 1905 | children = ( |
| 1910 | - D233EE701EEA88EF00674ED5 /* LVCHomePageViewController.h */, | |
| 1911 | - D233EE711EEA88EF00674ED5 /* LVCHomePageViewController.m */, | |
| 1906 | + D2EBC8621F02105C00F198FB /* LVCHomePageViewController.h */, | |
| 1907 | + D2EBC8631F02105C00F198FB /* LVCHomePageViewController.m */, | |
| 1912 | 1908 | ); |
| 1913 | 1909 | name = Controller; |
| 1914 | 1910 | sourceTree = "<group>"; |
| ... | ... | @@ -2136,16 +2132,8 @@ |
| 2136 | 2132 | D2888DA81E6EC014003A77C8 /* Controller */ = { |
| 2137 | 2133 | isa = PBXGroup; |
| 2138 | 2134 | children = ( |
| 2139 | - D2888DB21E6EC154003A77C8 /* HomeViewController.h */, | |
| 2140 | - D2888DB31E6EC154003A77C8 /* HomeViewController.m */, | |
| 2141 | - D2EBC85B1F02031400F198FB /* LVCUGCLiveListController.h */, | |
| 2142 | - D2EBC85C1F02031400F198FB /* LVCUGCLiveListController.m */, | |
| 2143 | - D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */, | |
| 2144 | - D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */, | |
| 2145 | - D2A089EC1E8A336A0071412C /* LiveListService.h */, | |
| 2146 | - D2A089ED1E8A336A0071412C /* LiveListService.m */, | |
| 2147 | - D2F048681EE54E860011E39C /* LVCLiveActivityInfoService.h */, | |
| 2148 | - D2F048691EE54E860011E39C /* LVCLiveActivityInfoService.m */, | |
| 2135 | + D2EBC8861F0225D900F198FB /* LVCVodPlayerListController.h */, | |
| 2136 | + D2EBC8871F0225D900F198FB /* LVCVodPlayerListController.m */, | |
| 2149 | 2137 | ); |
| 2150 | 2138 | path = Controller; |
| 2151 | 2139 | sourceTree = "<group>"; |
| ... | ... | @@ -2153,18 +2141,6 @@ |
| 2153 | 2141 | D2888DAA1E6EC014003A77C8 /* View */ = { |
| 2154 | 2142 | isa = PBXGroup; |
| 2155 | 2143 | children = ( |
| 2156 | - D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */, | |
| 2157 | - D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */, | |
| 2158 | - D219E86C1F01002400650F38 /* LVCVodPlayerListView.h */, | |
| 2159 | - D219E86D1F01002400650F38 /* LVCVodPlayerListView.m */, | |
| 2160 | - D2EBC8581F02011400F198FB /* LVCVodPlayerTableViewCell.h */, | |
| 2161 | - D2EBC8591F02011400F198FB /* LVCVodPlayerTableViewCell.m */, | |
| 2162 | - D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */, | |
| 2163 | - D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */, | |
| 2164 | - D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */, | |
| 2165 | - D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */, | |
| 2166 | - D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */, | |
| 2167 | - D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */, | |
| 2168 | 2144 | ); |
| 2169 | 2145 | path = View; |
| 2170 | 2146 | sourceTree = "<group>"; |
| ... | ... | @@ -2184,6 +2160,57 @@ |
| 2184 | 2160 | path = ChatBarrageManager; |
| 2185 | 2161 | sourceTree = "<group>"; |
| 2186 | 2162 | }; |
| 2163 | + D2EBC85E1F020D3D00F198FB /* UGCSections */ = { | |
| 2164 | + isa = PBXGroup; | |
| 2165 | + children = ( | |
| 2166 | + D2EBC85F1F020F3C00F198FB /* Controller */, | |
| 2167 | + D2EBC8601F020F3C00F198FB /* Model */, | |
| 2168 | + D2EBC8611F020F3C00F198FB /* View */, | |
| 2169 | + ); | |
| 2170 | + path = UGCSections; | |
| 2171 | + sourceTree = "<group>"; | |
| 2172 | + }; | |
| 2173 | + D2EBC85F1F020F3C00F198FB /* Controller */ = { | |
| 2174 | + isa = PBXGroup; | |
| 2175 | + children = ( | |
| 2176 | + D2EBC8651F02108000F198FB /* LiveListService.h */, | |
| 2177 | + D2EBC8661F02108000F198FB /* LiveListService.m */, | |
| 2178 | + D2EBC8671F02108000F198FB /* LVCLiveActivityInfoService.h */, | |
| 2179 | + D2EBC8681F02108000F198FB /* LVCLiveActivityInfoService.m */, | |
| 2180 | + D2EBC86B1F02108000F198FB /* LVCUGCLiveListController.h */, | |
| 2181 | + D2EBC86C1F02108000F198FB /* LVCUGCLiveListController.m */, | |
| 2182 | + D2EBC86D1F02108000F198FB /* LVCUGCLiveListView.h */, | |
| 2183 | + D2EBC86E1F02108000F198FB /* LVCUGCLiveListView.m */, | |
| 2184 | + D2EBC86F1F02108000F198FB /* LVCUGCLivePlayerController.h */, | |
| 2185 | + D2EBC8701F02108000F198FB /* LVCUGCLivePlayerController.m */, | |
| 2186 | + ); | |
| 2187 | + path = Controller; | |
| 2188 | + sourceTree = "<group>"; | |
| 2189 | + }; | |
| 2190 | + D2EBC8601F020F3C00F198FB /* Model */ = { | |
| 2191 | + isa = PBXGroup; | |
| 2192 | + children = ( | |
| 2193 | + D2EBC8771F02108F00F198FB /* LVCUGCLiveListModel.h */, | |
| 2194 | + D2EBC8781F02108F00F198FB /* LVCUGCLiveListModel.m */, | |
| 2195 | + D2EBC8791F02108F00F198FB /* LVCUGCLivePlayerModel.h */, | |
| 2196 | + D2EBC87A1F02108F00F198FB /* LVCUGCLivePlayerModel.m */, | |
| 2197 | + ); | |
| 2198 | + path = Model; | |
| 2199 | + sourceTree = "<group>"; | |
| 2200 | + }; | |
| 2201 | + D2EBC8611F020F3C00F198FB /* View */ = { | |
| 2202 | + isa = PBXGroup; | |
| 2203 | + children = ( | |
| 2204 | + D2EBC87D1F02109C00F198FB /* LVCUGCBackgroundView.h */, | |
| 2205 | + D2EBC87E1F02109C00F198FB /* LVCUGCBackgroundView.m */, | |
| 2206 | + D2EBC87F1F02109C00F198FB /* LVCUGCLivePlayerCell.h */, | |
| 2207 | + D2EBC8801F02109C00F198FB /* LVCUGCLivePlayerCell.m */, | |
| 2208 | + D2EBC8811F02109C00F198FB /* LVCUGCPlayerLoadingView.h */, | |
| 2209 | + D2EBC8821F02109C00F198FB /* LVCUGCPlayerLoadingView.m */, | |
| 2210 | + ); | |
| 2211 | + path = View; | |
| 2212 | + sourceTree = "<group>"; | |
| 2213 | + }; | |
| 2187 | 2214 | /* End PBXGroup section */ |
| 2188 | 2215 | |
| 2189 | 2216 | /* Begin PBXNativeTarget section */ |
| ... | ... | @@ -2337,20 +2364,17 @@ |
| 2337 | 2364 | 4B45CE8A1EB86A590079AFB7 /* LVCPersonCommonCell.m in Sources */, |
| 2338 | 2365 | D2029CC01E6EADE10027CD92 /* UIImage+GIF.m in Sources */, |
| 2339 | 2366 | 4B45CE851EB86A590079AFB7 /* LVCClearCachesCell.m in Sources */, |
| 2340 | - D25BF8831E7F775F007FB138 /* LVCUGCPlayerLoadingView.m in Sources */, | |
| 2341 | 2367 | 4B45CE9B1EB86A760079AFB7 /* ZXUIKit.m in Sources */, |
| 2342 | 2368 | D214CB4F1EF7BD890014EEBA /* V8HorizontalPickerView.m in Sources */, |
| 2343 | 2369 | D2029BCF1E6EADD70027CD92 /* ZXTabBarController.m in Sources */, |
| 2344 | 2370 | D2029CB81E6EADE10027CD92 /* SDImageCache.m in Sources */, |
| 2345 | 2371 | D2029CBB1E6EADE10027CD92 /* SDWebImageDownloader.m in Sources */, |
| 2346 | 2372 | D2029CA71E6EADE10027CD92 /* MJRefreshAutoGifFooter.m in Sources */, |
| 2347 | - D28F5FFF1E8BC7EF00914142 /* LVCUGCLiveListView.m in Sources */, | |
| 2348 | 2373 | D2029CC11E6EADE10027CD92 /* UIImage+MultiFormat.m in Sources */, |
| 2349 | 2374 | D245715F1E83B09900AA85D6 /* userInfoModel.m in Sources */, |
| 2350 | 2375 | 8178D4241F02043500AA78A4 /* LVCFullScreenPlayerController.m in Sources */, |
| 2351 | 2376 | D2029C861E6EADE10027CD92 /* Tools.m in Sources */, |
| 2352 | 2377 | 4B42A6C41EC00CC800DA09D7 /* UIAlertView+Blocks.m in Sources */, |
| 2353 | - D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */, | |
| 2354 | 2378 | D214CB521EF7CB310014EEBA /* LVCChannelPagingView.m in Sources */, |
| 2355 | 2379 | 4B45CE861EB86A590079AFB7 /* LVCLoginShowView.m in Sources */, |
| 2356 | 2380 | D2029CA01E6EADE10027CD92 /* NSObject+MJProperty.m in Sources */, |
| ... | ... | @@ -2359,7 +2383,6 @@ |
| 2359 | 2383 | 4B45CE981EB86A760079AFB7 /* UILabel+createLabel.m in Sources */, |
| 2360 | 2384 | D2029C9C1E6EADE10027CD92 /* MJPropertyType.m in Sources */, |
| 2361 | 2385 | D22831091E77D8D500627701 /* GiftModel.m in Sources */, |
| 2362 | - D2EBC85A1F02011400F198FB /* LVCVodPlayerTableViewCell.m in Sources */, | |
| 2363 | 2386 | D23BBDBE1EF8ED4A002FE0B8 /* LVCChannelDetailModel.m in Sources */, |
| 2364 | 2387 | D2029CCD1E6EADE10027CD92 /* SearchModel.m in Sources */, |
| 2365 | 2388 | 4BD8560F1EBACEF80082061D /* CNLiveWebView.m in Sources */, |
| ... | ... | @@ -2370,8 +2393,6 @@ |
| 2370 | 2393 | D2029CAF1E6EADE10027CD92 /* MJRefreshStateHeader.m in Sources */, |
| 2371 | 2394 | 4BD856091EBACD530082061D /* UIRefreshControl+AFNetworking.m in Sources */, |
| 2372 | 2395 | 81F1C8401E8BC5CC0085C2B8 /* NSArray+Safety.m in Sources */, |
| 2373 | - D2A089EE1E8A336A0071412C /* LiveListService.m in Sources */, | |
| 2374 | - D2A089E81E89FA720071412C /* LVCUGCLivePlayerCell.m in Sources */, | |
| 2375 | 2396 | D2029D011E6EAE2E0027CD92 /* UIColor+HexString.m in Sources */, |
| 2376 | 2397 | 4B45CE7D1EB86A590079AFB7 /* ModifyInfomationController.m in Sources */, |
| 2377 | 2398 | D23BBDBB1EF8E8B2002FE0B8 /* LVCBannerAndMarqueeModel.m in Sources */, |
| ... | ... | @@ -2383,6 +2404,7 @@ |
| 2383 | 2404 | D2029CA51E6EADE10027CD92 /* MJRefreshFooter.m in Sources */, |
| 2384 | 2405 | D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */, |
| 2385 | 2406 | 4BD856021EBACD530082061D /* AFURLSessionManager.m in Sources */, |
| 2407 | + D2EBC87B1F02108F00F198FB /* LVCUGCLiveListModel.m in Sources */, | |
| 2386 | 2408 | 4BD855FD1EBACD530082061D /* AFNetworkReachabilityManager.m in Sources */, |
| 2387 | 2409 | 810B65061E779B1F00133E15 /* View+MASAdditions.m in Sources */, |
| 2388 | 2410 | D2029D161E6EB00D0027CD92 /* AppDelegate.m in Sources */, |
| ... | ... | @@ -2390,6 +2412,7 @@ |
| 2390 | 2412 | 4BD8561D1EBAD6490082061D /* ZXConst.m in Sources */, |
| 2391 | 2413 | D2029CB71E6EADE10027CD92 /* NSData+ImageContentType.m in Sources */, |
| 2392 | 2414 | D23DC1551ECC41C100103B0E /* LVCVerifyViewController.m in Sources */, |
| 2415 | + D2EBC8641F02105C00F198FB /* LVCHomePageViewController.m in Sources */, | |
| 2393 | 2416 | D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */, |
| 2394 | 2417 | D2029CD01E6EADE10027CD92 /* SearchPresenter.m in Sources */, |
| 2395 | 2418 | D2029CBE1E6EADE10027CD92 /* SDWebImagePrefetcher.m in Sources */, |
| ... | ... | @@ -2415,11 +2438,9 @@ |
| 2415 | 2438 | D2029CC51E6EADE10027CD92 /* UIView+WebCacheOperation.m in Sources */, |
| 2416 | 2439 | D2029CAB1E6EADE10027CD92 /* MJRefreshBackNormalFooter.m in Sources */, |
| 2417 | 2440 | 4B45CEA61EB86B9F0079AFB7 /* NSNumber+ScaleHeight.m in Sources */, |
| 2418 | - D2EBC85D1F02031400F198FB /* LVCUGCLiveListController.m in Sources */, | |
| 2419 | 2441 | 810B65031E779B1F00133E15 /* MASViewConstraint.m in Sources */, |
| 2420 | 2442 | D2029BCE1E6EADD70027CD92 /* ZXNavigationController.m in Sources */, |
| 2421 | 2443 | D23BBDC71EF8FBD1002FE0B8 /* LVCSectionHeaderCollectionReusableView.m in Sources */, |
| 2422 | - D2F0486A1EE54E860011E39C /* LVCLiveActivityInfoService.m in Sources */, | |
| 2423 | 2444 | D2029CA21E6EADE10027CD92 /* MJRefreshAutoFooter.m in Sources */, |
| 2424 | 2445 | D2029CC71E6EADE10027CD92 /* SVIndefiniteAnimatedView.m in Sources */, |
| 2425 | 2446 | D2029CA31E6EADE10027CD92 /* MJRefreshBackFooter.m in Sources */, |
| ... | ... | @@ -2435,15 +2456,15 @@ |
| 2435 | 2456 | 4B45CE801EB86A590079AFB7 /* idAndPwdView.m in Sources */, |
| 2436 | 2457 | 8178D4521F02045500AA78A4 /* LVCPlayerLoadingView.m in Sources */, |
| 2437 | 2458 | D23BBDC41EF8FB99002FE0B8 /* LVCMainHorizontalCollectionViewCell.m in Sources */, |
| 2438 | - D233EE721EEA88EF00674ED5 /* LVCHomePageViewController.m in Sources */, | |
| 2439 | 2459 | 8178D4251F02043500AA78A4 /* LVCLivePlayerController.m in Sources */, |
| 2440 | 2460 | D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */, |
| 2441 | 2461 | 4BD8560A1EBACD530082061D /* UIWebView+AFNetworking.m in Sources */, |
| 2442 | 2462 | D219E86B1EFD04A700650F38 /* LVCBigHorizontalCollectionViewCell.m in Sources */, |
| 2463 | + D2EBC8881F0225D900F198FB /* LVCVodPlayerListController.m in Sources */, | |
| 2443 | 2464 | 4B45CE831EB86A590079AFB7 /* LVCMineModel.m in Sources */, |
| 2444 | 2465 | 4B45CE791EB86A590079AFB7 /* MineAboutUsController.m in Sources */, |
| 2445 | 2466 | 81A483081E88B6140097A80A /* UIView+ViewController.m in Sources */, |
| 2446 | - D2A089EB1E8A09CB0071412C /* LVCUGCLivePlayerModel.m in Sources */, | |
| 2467 | + D2EBC8721F02108000F198FB /* LVCLiveActivityInfoService.m in Sources */, | |
| 2447 | 2468 | D2029CC81E6EADE10027CD92 /* SVProgressAnimatedView.m in Sources */, |
| 2448 | 2469 | 4B45CE891EB86A590079AFB7 /* LVCPersonalImageCell.m in Sources */, |
| 2449 | 2470 | D2029C961E6EADE10027CD92 /* MBProgressHUD.m in Sources */, |
| ... | ... | @@ -2465,6 +2486,7 @@ |
| 2465 | 2486 | 4BD856071EBACD530082061D /* UIImageView+AFNetworking.m in Sources */, |
| 2466 | 2487 | D2029CC61E6EADE10027CD92 /* SSKeychain.m in Sources */, |
| 2467 | 2488 | 4B45CE871EB86A590079AFB7 /* LVCMineCommonCell.m in Sources */, |
| 2489 | + D2EBC87C1F02108F00F198FB /* LVCUGCLivePlayerModel.m in Sources */, | |
| 2468 | 2490 | 8178D4621F02060B00AA78A4 /* LVCChatViewTableViewCell.m in Sources */, |
| 2469 | 2491 | 811BB68E1E8116C8005C6291 /* NSString+StringSize.m in Sources */, |
| 2470 | 2492 | 4BD856051EBACD530082061D /* UIAlertView+AFNetworking.m in Sources */, |
| ... | ... | @@ -2474,7 +2496,6 @@ |
| 2474 | 2496 | 8178D4641F02060B00AA78A4 /* LVCMessage.m in Sources */, |
| 2475 | 2497 | 4B45CE8B1EB86A590079AFB7 /* LVCTextField.m in Sources */, |
| 2476 | 2498 | D2575C461E76857100E3A8FC /* LVCAnimationManager.m in Sources */, |
| 2477 | - D2A089F11E8A41120071412C /* LVCUGCLiveListModel.m in Sources */, | |
| 2478 | 2499 | D2CBC13B1ECC157A00E00279 /* LVCVerifyLiveAuthService.m in Sources */, |
| 2479 | 2500 | D2029D041E6EAE2E0027CD92 /* UILabel+ContentSize.m in Sources */, |
| 2480 | 2501 | 4B45CE7C1EB86A590079AFB7 /* MineSettingViewController.m in Sources */, |
| ... | ... | @@ -2500,22 +2521,22 @@ |
| 2500 | 2521 | 4BD855FA1EBACD530082061D /* AFHTTPRequestOperation.m in Sources */, |
| 2501 | 2522 | D2029D051E6EAE2E0027CD92 /* UILabel+labelFitSize.m in Sources */, |
| 2502 | 2523 | D2029CB21E6EADE10027CD92 /* UIScrollView+MJExtension.m in Sources */, |
| 2524 | + D2393D011F020D5700D3EE17 /* FeedbackViewController.m in Sources */, | |
| 2503 | 2525 | D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */, |
| 2504 | 2526 | D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */, |
| 2505 | 2527 | 4B45CEAB1EB86BFA0079AFB7 /* NSString+ZXExtension.m in Sources */, |
| 2506 | 2528 | D2029BCA1E6EADD70027CD92 /* BaseModel.m in Sources */, |
| 2507 | 2529 | D25BF87B1E7B8A82007FB138 /* SliderView.m in Sources */, |
| 2508 | 2530 | 810B65041E779B1F00133E15 /* NSArray+MASAdditions.m in Sources */, |
| 2509 | - D25BF8801E7BD266007FB138 /* LVCUGCLivePlayerController.m in Sources */, | |
| 2510 | 2531 | D2029D031E6EAE2E0027CD92 /* UIImage+ZXExtension.m in Sources */, |
| 2511 | 2532 | 4BD855FC1EBACD530082061D /* AFHTTPSessionManager.m in Sources */, |
| 2512 | 2533 | 4B45CE841EB86A590079AFB7 /* ModifyCommonView.m in Sources */, |
| 2513 | - D219E86E1F01002400650F38 /* LVCVodPlayerListView.m in Sources */, | |
| 2514 | 2534 | 4BD856081EBACD530082061D /* UIProgressView+AFNetworking.m in Sources */, |
| 2515 | 2535 | D24571581E8393EB00AA85D6 /* UIImageView+ZXExtension.m in Sources */, |
| 2516 | 2536 | D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */, |
| 2517 | 2537 | D2029CCA1E6EADE10027CD92 /* SVProgressHUD.m in Sources */, |
| 2518 | 2538 | D2029CA81E6EADE10027CD92 /* MJRefreshAutoNormalFooter.m in Sources */, |
| 2539 | + D2EBC8841F02109C00F198FB /* LVCUGCLivePlayerCell.m in Sources */, | |
| 2519 | 2540 | 4B45CE991EB86A760079AFB7 /* UITextField+createTextField.m in Sources */, |
| 2520 | 2541 | 4B45CEA81EB86B9F0079AFB7 /* UserTools.m in Sources */, |
| 2521 | 2542 | D217A24A1E7B76C7003B44CB /* PresentView.m in Sources */, |
| ... | ... | @@ -2523,14 +2544,18 @@ |
| 2523 | 2544 | 8178D44B1F02045500AA78A4 /* CNBarrageView.m in Sources */, |
| 2524 | 2545 | 8178D4311F02044300AA78A4 /* LVCChatRoomModel.m in Sources */, |
| 2525 | 2546 | 4B45CEAE1EB873630079AFB7 /* UserInformationModel.m in Sources */, |
| 2547 | + D2EBC8741F02108000F198FB /* LVCUGCLiveListController.m in Sources */, | |
| 2526 | 2548 | D2029CBA1E6EADE10027CD92 /* SDWebImageDecoder.m in Sources */, |
| 2527 | 2549 | 4B45CE9A1EB86A760079AFB7 /* ZXLabel.m in Sources */, |
| 2528 | 2550 | D2029D081E6EAE2E0027CD92 /* ZXDeviceInfo.m in Sources */, |
| 2529 | 2551 | D24571631E83C40B00AA85D6 /* PrivateView.m in Sources */, |
| 2530 | 2552 | D2029CC21E6EADE10027CD92 /* UIImage+WebP.m in Sources */, |
| 2553 | + D2EBC8831F02109C00F198FB /* LVCUGCBackgroundView.m in Sources */, | |
| 2531 | 2554 | 4BD856001EBACD530082061D /* AFURLRequestSerialization.m in Sources */, |
| 2532 | 2555 | D2029BCD1E6EADD70027CD92 /* BaseViewController.m in Sources */, |
| 2533 | 2556 | 4B45CE811EB86A590079AFB7 /* RegistBasicInformationView.m in Sources */, |
| 2557 | + D2EBC8851F02109C00F198FB /* LVCUGCPlayerLoadingView.m in Sources */, | |
| 2558 | + D2EBC8711F02108000F198FB /* LiveListService.m in Sources */, | |
| 2534 | 2559 | 810B64FF1E779B1F00133E15 /* MASConstraint.m in Sources */, |
| 2535 | 2560 | 8178D4611F02060B00AA78A4 /* LVCChatView.m in Sources */, |
| 2536 | 2561 | D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */, |
| ... | ... | @@ -2546,7 +2571,9 @@ |
| 2546 | 2571 | D24CFC201EFA092300AA6ADB /* JBBannerView.m in Sources */, |
| 2547 | 2572 | D2029CBD1E6EADE10027CD92 /* SDWebImageManager.m in Sources */, |
| 2548 | 2573 | D2029CB41E6EADE10027CD92 /* UIView+MJExtension.m in Sources */, |
| 2574 | + D2EBC8751F02108000F198FB /* LVCUGCLiveListView.m in Sources */, | |
| 2549 | 2575 | 81FB5B3C1E7A6FFC00F98E1D /* SevenSwitch.m in Sources */, |
| 2576 | + D2EBC8761F02108000F198FB /* LVCUGCLivePlayerController.m in Sources */, | |
| 2550 | 2577 | D2029CA91E6EADE10027CD92 /* MJRefreshAutoStateFooter.m in Sources */, |
| 2551 | 2578 | 8178D4511F02045500AA78A4 /* LVCPlayer.m in Sources */, |
| 2552 | 2579 | D2029D061E6EAE2E0027CD92 /* UIView+Extension.m in Sources */, |
| ... | ... | @@ -2562,7 +2589,6 @@ |
| 2562 | 2589 | 4B45CE771EB86A590079AFB7 /* IDViewController.m in Sources */, |
| 2563 | 2590 | 4BD855FF1EBACD530082061D /* AFURLConnectionOperation.m in Sources */, |
| 2564 | 2591 | 8178D46E1F0225E500AA78A4 /* LVCTelevisionCell.m in Sources */, |
| 2565 | - D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */, | |
| 2566 | 2592 | D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */, |
| 2567 | 2593 | D25530061E7911A800DF38A5 /* GiftAnimationAction.m in Sources */, |
| 2568 | 2594 | 4B45CE881EB86A590079AFB7 /* LVCMineShowCell.m in Sources */, | ... | ... |
LiveVideoCloud/AppCustoms/Main/ZXTabBarController.m
| ... | ... | @@ -8,15 +8,13 @@ |
| 8 | 8 | |
| 9 | 9 | #import "ZXTabBarController.h" |
| 10 | 10 | #import "ZXNavigationController.h" |
| 11 | -#import "HomeViewController.h" | |
| 12 | 11 | #import "LVCLiveViewController.h" |
| 13 | 12 | #import "LVCMineViewController.h" |
| 14 | 13 | #import "LVCTabBar.h" |
| 15 | 14 | #import "LoginViewController.h" |
| 16 | -#import "LVCHomePageViewController.h" | |
| 17 | -#import "LVCMineViewController.h"// | |
| 18 | 15 | #import "LVCUGCLiveListController.h" |
| 19 | 16 | #import "LVCTelevisioController.h" |
| 17 | +#import "LVCVodPlayerListController.h" | |
| 20 | 18 | |
| 21 | 19 | @interface ZXTabBarController ()<LVCTabBarDelegate> |
| 22 | 20 | |
| ... | ... | @@ -53,8 +51,8 @@ |
| 53 | 51 | |
| 54 | 52 | - (void)createUI |
| 55 | 53 | { |
| 56 | - [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[HomeViewController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"]; | |
| 57 | 54 | [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCTelevisioController alloc]init]] title:@"" image:@"live_default" selectedImage:@"live_focused"]; |
| 55 | + [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCVodPlayerListController alloc]init]] title:@"" image:@"home page" selectedImage:@"home page-click on"]; | |
| 58 | 56 | [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCUGCLiveListController alloc]init]] title:@"" image:@"news_default" selectedImage:@"news_focused"]; |
| 59 | 57 | [self setupOneChildViewController:[[ZXNavigationController alloc]initWithRootViewController:[[LVCMineViewController alloc]init]] title:@"" image:@"my" selectedImage:@"my-click on"]; |
| 60 | 58 | } | ... | ... |
LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/Classes/Sections/LVCHomePageViewController.h renamed to LiveVideoCloud/Classes/Sections/HomePageSections/LVCHomePageViewController.h
LiveVideoCloud/Classes/Sections/LVCHomePageViewController.m renamed to LiveVideoCloud/Classes/Sections/HomePageSections/LVCHomePageViewController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.h renamed to LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.h
| 1 | 1 | // |
| 2 | -// HomeViewController.h | |
| 3 | -// ZXBaseProject | |
| 2 | +// FeedBackViewController.h | |
| 3 | +// CNLive | |
| 4 | 4 | // |
| 5 | -// Created by 张旭 on 2017/1/10. | |
| 6 | -// Copyright © 2017年 cnlive. All rights reserved. | |
| 5 | +// Created by cnlive on 16/1/9. | |
| 6 | +// Copyright © 2016年 雷浩杰. All rights reserved. | |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | 9 | #import "BaseViewController.h" |
| 10 | 10 | |
| 11 | -@interface HomeViewController : BaseViewController | |
| 11 | +@interface FeedBackViewController : BaseViewController | |
| 12 | 12 | |
| 13 | 13 | @end | ... | ... |
LiveVideoCloud/Classes/Sections/Mine/Controllers/FeedbackViewController.m
0 → 100644
| 1 | +// | |
| 2 | +// FeedBackViewController.m | |
| 3 | +// CNLive | |
| 4 | +// | |
| 5 | +// Created by cnlive on 16/1/9. | |
| 6 | +// Copyright © 2016年 雷浩杰. All rights reserved. | |
| 7 | +// | |
| 8 | + | |
| 9 | +#import "FeedbackViewController.h" | |
| 10 | + | |
| 11 | +#define MaxNumberOfTitleChars 100 //标题最多输入的字数 | |
| 12 | + | |
| 13 | +@interface FeedBackViewController ()<UITextFieldDelegate,UITextViewDelegate,UIScrollViewDelegate> | |
| 14 | +{ | |
| 15 | + UITextView *_descriptionView; | |
| 16 | + UILabel *_desPlaceholder; | |
| 17 | + UITextField *_reportField; | |
| 18 | + UITextField *_phoneField; | |
| 19 | + UIScrollView *_bgScrollView; | |
| 20 | + UILabel *_wordsCountLab; | |
| 21 | +} | |
| 22 | + | |
| 23 | +@property (nonatomic, strong) MBProgressHUD *progressHUD; | |
| 24 | + | |
| 25 | +@end | |
| 26 | + | |
| 27 | +@implementation FeedBackViewController | |
| 28 | + | |
| 29 | +- (void)viewDidLoad { | |
| 30 | + [super viewDidLoad]; | |
| 31 | + self.title = @"反馈意见"; | |
| 32 | +// self.view.backgroundColor = CommonBgColor; | |
| 33 | + [self initViews]; | |
| 34 | + | |
| 35 | + //注册键盘出现的通知 | |
| 36 | + [[NSNotificationCenter defaultCenter] addObserver:self | |
| 37 | + selector:@selector(keyboardWasShown:) | |
| 38 | + name:UIKeyboardWillShowNotification object:nil]; | |
| 39 | + | |
| 40 | + //注册键盘消失的通知 | |
| 41 | + [[NSNotificationCenter defaultCenter] addObserver:self | |
| 42 | + selector:@selector(keyboardWillBeHidden:) | |
| 43 | + name:UIKeyboardWillHideNotification object:nil]; | |
| 44 | + | |
| 45 | + UITapGestureRecognizer *singleRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(handleSingleTapFrom)]; | |
| 46 | + [_bgScrollView addGestureRecognizer:singleRecognizer]; | |
| 47 | +} | |
| 48 | + | |
| 49 | +- (void)initViews | |
| 50 | +{ | |
| 51 | + UIView *bgView = [[UIView alloc] initWithFrame:CGRectMake(0, 6, KScreenWidth, KScreenHeight-6)]; | |
| 52 | + bgView.backgroundColor = [UIColor whiteColor]; | |
| 53 | + [self.view addSubview:bgView]; | |
| 54 | + | |
| 55 | + _bgScrollView = [[UIScrollView alloc] initWithFrame:CGRectMake(0, 6, KScreenWidth, KScreenHeight-6)]; | |
| 56 | + if (KScreenHeight<568) { | |
| 57 | + _bgScrollView.contentSize = CGSizeMake(KScreenWidth, 500); | |
| 58 | + }else{ | |
| 59 | + _bgScrollView.contentSize = CGSizeMake(KScreenWidth, KScreenHeight-64); | |
| 60 | + } | |
| 61 | + _bgScrollView.delegate = self; | |
| 62 | + [self.view addSubview:_bgScrollView]; | |
| 63 | + | |
| 64 | + [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 129.5, KScreenWidth-20, 0.5)]; | |
| 65 | + [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 174.5, KScreenWidth-20, 0.5)]; | |
| 66 | + [Tools addLineToView:_bgScrollView separatorColorType:SeparatorColorGray lineFrame:CGRectMake(10, 219.5, KScreenWidth-20, 0.5)]; | |
| 67 | + | |
| 68 | + _descriptionView = [[UITextView alloc] initWithFrame:CGRectMake(5, 0, KScreenWidth-10, 129)]; | |
| 69 | + _descriptionView.font = [UIFont systemFontOfSize:15]; | |
| 70 | + _descriptionView.returnKeyType = UIReturnKeyDone; | |
| 71 | + _descriptionView.delegate = self; | |
| 72 | + [_bgScrollView addSubview:_descriptionView]; | |
| 73 | + | |
| 74 | + _desPlaceholder = [[UILabel alloc] initWithFrame:CGRectMake(5, 9, KScreenWidth-20, 15)]; | |
| 75 | + _desPlaceholder.text = @"输入您的反馈"; | |
| 76 | + _desPlaceholder.font = [UIFont systemFontOfSize:15]; | |
| 77 | + _desPlaceholder.textColor = [UIColor colorWithHexString:@"#c7c4c4"]; | |
| 78 | + [_descriptionView addSubview:_desPlaceholder]; | |
| 79 | + | |
| 80 | + _reportField = [[UITextField alloc] initWithFrame:CGRectMake(10, 130, KScreenWidth-20, 45)]; | |
| 81 | + _reportField.placeholder = @"举报视频或上传者(可选)"; | |
| 82 | + _reportField.font = [UIFont systemFontOfSize:15]; | |
| 83 | + _reportField.returnKeyType = UIReturnKeyDone; | |
| 84 | + _reportField.delegate = self; | |
| 85 | + [_bgScrollView addSubview:_reportField]; | |
| 86 | + | |
| 87 | + _phoneField = [[UITextField alloc] initWithFrame:CGRectMake(10, 175, KScreenWidth-20, 45)]; | |
| 88 | + _phoneField.placeholder = @"您的QQ/电话/邮箱"; | |
| 89 | + _phoneField.font = [UIFont systemFontOfSize:15]; | |
| 90 | + _phoneField.returnKeyType = UIReturnKeyDone; | |
| 91 | + _phoneField.delegate = self; | |
| 92 | + [_bgScrollView addSubview:_phoneField]; | |
| 93 | + | |
| 94 | + //字数限制label | |
| 95 | + _wordsCountLab = [[UILabel alloc] initWithFrame:CGRectMake(_descriptionView.size.width-60, _descriptionView.size.height-15, 60, 15)]; | |
| 96 | + _wordsCountLab.text = @"0/100"; | |
| 97 | + _wordsCountLab.textAlignment = NSTextAlignmentRight; | |
| 98 | + _wordsCountLab.textColor = [UIColor grayColorCNLive]; | |
| 99 | + _wordsCountLab.font = [UIFont systemFontOfSize:15]; | |
| 100 | + [_descriptionView addSubview:_wordsCountLab]; | |
| 101 | + //提交 | |
| 102 | +// UIButton *submitBtn = [UIButton buttonWithType:UIButtonTypeCustom]; | |
| 103 | +// [submitBtn setTitle:@"提 交" forState:UIControlStateNormal]; | |
| 104 | +// submitBtn.backgroundColor = [UIColor yellowColorCNLive]; | |
| 105 | +// [submitBtn setTitleColor:[UIColor blackColorCNLive] forState:UIControlStateNormal]; | |
| 106 | +// //[submitBtn setBackgroundImage:[[UIImage imageNamed:@"denglu"] stretchableImageWithLeftCapWidth:57 topCapHeight:0] forState:UIControlStateNormal]; | |
| 107 | +// submitBtn.clipsToBounds = YES; | |
| 108 | +// submitBtn.layer.cornerRadius = 20.0f; | |
| 109 | +// submitBtn.layer.borderWidth = 1.0f;//设置边框宽度 | |
| 110 | +// submitBtn.layer.borderColor = [UIColor blackColorCNLive].CGColor;//设置边框颜色 | |
| 111 | + UIButton *submitBtn = [UIButton buttonWithTitle:@"提 交" titleColor:[UIColor blackColorCNLive] cornerRadius:20.0f borderWidth:1.0f borderColor:[UIColor blackColorCNLive] backgroundColor:[UIColor yellowColorCNLive]]; | |
| 112 | + submitBtn.frame = CGRectMake(10, 295, KScreenWidth - 20, 40); | |
| 113 | + [submitBtn addTarget:self action:@selector(submitBtnAction) forControlEvents:UIControlEventTouchUpInside]; | |
| 114 | + [_bgScrollView addSubview:submitBtn]; | |
| 115 | +} | |
| 116 | + | |
| 117 | +- (void)submitBtnAction | |
| 118 | +{ | |
| 119 | + [self request]; | |
| 120 | +} | |
| 121 | + | |
| 122 | +#pragma mark - request | |
| 123 | + | |
| 124 | +- (void)request | |
| 125 | +{ | |
| 126 | + [self handleSingleTapFrom]; | |
| 127 | + | |
| 128 | + if ([Tools isEmptyString:_descriptionView.text]) { | |
| 129 | + [Tools showHUDInView:self.view withString:@"请填写要反馈的意见哈" autoHide:YES]; | |
| 130 | + return; | |
| 131 | + } | |
| 132 | + if ([Tools isEmptyString:_phoneField.text]){ | |
| 133 | + [Tools showHUDInView:self.view withString:@"填写联系方式有助于我们找到你哟" autoHide:YES]; | |
| 134 | + return; | |
| 135 | + } | |
| 136 | + | |
| 137 | + if ([self isContainEmoji:_descriptionView.text]) { | |
| 138 | + [Tools showHUDInView:self.view withString:@"暂不支持表情输入" autoHide:YES]; | |
| 139 | + return; | |
| 140 | + } | |
| 141 | + | |
| 142 | + self.progressHUD = [Tools showActivityHudInView:self.view withString:@""]; | |
| 143 | + | |
| 144 | + NSDictionary *params = @{@"id":UserAppId, | |
| 145 | + @"msg":[NSString stringWithFormat:@"描述:%@__上传者:%@__联系方式:%@",_descriptionView.text,_reportField.text,_phoneField.text]}; | |
| 146 | + | |
| 147 | + [[AFHTTPRequestOperationManager manager] POST:feedback parameters:params success:^(AFHTTPRequestOperation *operation, id responseObject) { | |
| 148 | + | |
| 149 | + [self.progressHUD hide:YES]; | |
| 150 | + [self performSelector:@selector(dismissView) withObject:nil afterDelay:2]; | |
| 151 | + | |
| 152 | + responseObject = [responseObject validatedDictionary]; | |
| 153 | + | |
| 154 | + if ([responseObject[@"errorCode"] isEqualToString:@"0"]) { | |
| 155 | + [Tools showHUDInView:self.view withString:@"收到反馈了,会尽快处理的" autoHide:YES]; | |
| 156 | + }else{ | |
| 157 | + [Tools showHUDInView:self.view withString:responseObject[@"errorMessage"] autoHide:YES]; | |
| 158 | + } | |
| 159 | + | |
| 160 | + } failure:^(AFHTTPRequestOperation *operation, NSError *error) { | |
| 161 | + self.progressHUD = [Tools showActivityHudInView:self.view withString:@""]; | |
| 162 | + [Tools showHUDInView:self.view withString:@"提交失败,请稍后再试!" autoHide:YES]; | |
| 163 | + [self performSelector:@selector(dismissView) withObject:nil afterDelay:2]; | |
| 164 | + }]; | |
| 165 | + | |
| 166 | +// if ([Tools isEmployeeQQNumber:_phoneField.text] || [Tools isValidateEmail:_phoneField.text] || [Tools isMobileNumber:_phoneField.text]) { | |
| 167 | +// | |
| 168 | +// }else{ | |
| 169 | +// [Tools showHUDInView:self.view withString:@"请填写正确联系方式" autoHide:YES]; | |
| 170 | +// } | |
| 171 | + | |
| 172 | +} | |
| 173 | + | |
| 174 | +- (void)dismissView | |
| 175 | +{ | |
| 176 | + [self.navigationController popViewControllerAnimated:YES]; | |
| 177 | +} | |
| 178 | + | |
| 179 | +- (BOOL)isContainEmoji:(NSString *)string | |
| 180 | +{ | |
| 181 | + for (int i = 0; i < string.length; i++) { | |
| 182 | + | |
| 183 | + NSString *character = [string substringWithRange:NSMakeRange(i, 1)]; | |
| 184 | + if (character.hash == 166842 || character.hash == 166839) { | |
| 185 | + return YES; | |
| 186 | + } | |
| 187 | + } | |
| 188 | + return NO; | |
| 189 | +} | |
| 190 | + | |
| 191 | +#pragma mark - UITextFieldDelegate | |
| 192 | +- (BOOL)textFieldShouldReturn:(UITextField *)textField | |
| 193 | +{ | |
| 194 | + [textField resignFirstResponder]; | |
| 195 | + | |
| 196 | + return YES; | |
| 197 | +} | |
| 198 | + | |
| 199 | +#pragma mark - UITextViewDelegate | |
| 200 | + | |
| 201 | +- (void)textViewDidChange:(UITextView *)textView | |
| 202 | +{ | |
| 203 | + if (textView.text.length != 0) { | |
| 204 | + _desPlaceholder.hidden = YES; | |
| 205 | + if (textView.text.length > MaxNumberOfTitleChars) { | |
| 206 | + textView.text = [textView.text substringToIndex:MaxNumberOfTitleChars]; | |
| 207 | + } | |
| 208 | + _wordsCountLab.text = [NSString stringWithFormat:@"%lu/100",(unsigned long)textView.text.length]; | |
| 209 | + }else{ | |
| 210 | + _desPlaceholder.hidden = NO; | |
| 211 | + _wordsCountLab.text = @"0/100"; | |
| 212 | + } | |
| 213 | +} | |
| 214 | + | |
| 215 | +-(BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString*)text | |
| 216 | +{ | |
| 217 | + if ([text isEqualToString:@"\n"]) { | |
| 218 | + [textView resignFirstResponder]; | |
| 219 | + return NO; | |
| 220 | + } | |
| 221 | + return YES; | |
| 222 | +} | |
| 223 | + | |
| 224 | +#pragma mark - 键盘监听 | |
| 225 | +- (void)keyboardWasShown:(NSNotification*)aNotification | |
| 226 | +{ | |
| 227 | + | |
| 228 | + BOOL desc = _descriptionView.isFirstResponder; | |
| 229 | + BOOL report = _reportField.isFirstResponder; | |
| 230 | + BOOL number = _phoneField.isFirstResponder; | |
| 231 | + | |
| 232 | + if (desc) { | |
| 233 | + _bgScrollView.contentOffset = CGPointMake(0, 0); | |
| 234 | + } else if (report) { | |
| 235 | + _bgScrollView.contentOffset = CGPointMake(0, _reportField.origin.y-10); | |
| 236 | + } else if (number) { | |
| 237 | + _bgScrollView.contentOffset = CGPointMake(0, _phoneField.origin.y-10); | |
| 238 | + } | |
| 239 | + | |
| 240 | + _bgScrollView.contentSize = CGSizeMake(KScreenWidth, 750); | |
| 241 | + | |
| 242 | +} | |
| 243 | + | |
| 244 | +- (void)keyboardWillBeHidden:(NSNotification*)aNotification | |
| 245 | +{ | |
| 246 | + _bgScrollView.contentOffset = CGPointMake(0, 0); | |
| 247 | + if (KScreenHeight<568) { | |
| 248 | + _bgScrollView.contentSize = CGSizeMake(KScreenWidth, 500); | |
| 249 | + }else{ | |
| 250 | + _bgScrollView.contentSize = CGSizeMake(KScreenWidth, KScreenHeight-64); | |
| 251 | + } | |
| 252 | +} | |
| 253 | + | |
| 254 | +#pragma mark - 收回键盘 | |
| 255 | +- (void)handleSingleTapFrom | |
| 256 | +{ | |
| 257 | + if ([_descriptionView isFirstResponder]) { | |
| 258 | + [_descriptionView resignFirstResponder]; | |
| 259 | + } | |
| 260 | + if ([_reportField isFirstResponder]) { | |
| 261 | + [_reportField resignFirstResponder]; | |
| 262 | + } | |
| 263 | + if ([_phoneField isFirstResponder]) { | |
| 264 | + [_phoneField resignFirstResponder]; | |
| 265 | + } | |
| 266 | +} | |
| 267 | + | |
| 268 | +- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView | |
| 269 | +{ | |
| 270 | + | |
| 271 | +} | |
| 272 | + | |
| 273 | +- (void)dealloc | |
| 274 | +{ | |
| 275 | + [[NSNotificationCenter defaultCenter] removeObserver:self]; | |
| 276 | +} | |
| 277 | + | |
| 278 | +- (void)didReceiveMemoryWarning { | |
| 279 | + [super didReceiveMemoryWarning]; | |
| 280 | + // Dispose of any resources that can be recreated. | |
| 281 | +} | |
| 282 | + | |
| 283 | +/* | |
| 284 | +#pragma mark - Navigation | |
| 285 | + | |
| 286 | +// In a storyboard-based application, you will often want to do a little preparation before navigation | |
| 287 | +- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender { | |
| 288 | + // Get the new view controller using [segue destinationViewController]. | |
| 289 | + // Pass the selected object to the new view controller. | |
| 290 | +} | |
| 291 | +*/ | |
| 292 | + | |
| 293 | +@end | ... | ... |
LiveVideoCloud/Classes/Sections/Mine/Controllers/LVCMineViewController.m
| ... | ... | @@ -147,7 +147,7 @@ |
| 147 | 147 | { |
| 148 | 148 | if (!_localTitleArr) |
| 149 | 149 | { |
| 150 | - _localTitleArr = [[NSArray alloc] initWithObjects:@"我的消息", @"我的视频列表",@"我要直播", @"我的账户", @"设置", nil]; | |
| 150 | + _localTitleArr = [[NSArray alloc] initWithObjects:@"设置", nil]; | |
| 151 | 151 | } |
| 152 | 152 | return _localTitleArr; |
| 153 | 153 | } |
| ... | ... | @@ -155,7 +155,7 @@ |
| 155 | 155 | { |
| 156 | 156 | if (!_localImageArr) { |
| 157 | 157 | |
| 158 | - _localImageArr = [[NSArray alloc] initWithObjects:@"message", @"I live",@"certification",@"account",@"Settings", nil]; | |
| 158 | + _localImageArr = [[NSArray alloc] initWithObjects:@"Settings", nil]; | |
| 159 | 159 | } |
| 160 | 160 | return _localImageArr; |
| 161 | 161 | } |
| ... | ... | @@ -198,38 +198,41 @@ |
| 198 | 198 | } |
| 199 | 199 | -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath |
| 200 | 200 | { |
| 201 | - if(indexPath.row == 0) | |
| 202 | - { | |
| 203 | - //我的消息 | |
| 204 | - [self pushVC:[MineMessageController new]]; | |
| 205 | - return; | |
| 206 | - }else if(indexPath.row == 1) | |
| 207 | - { //我的视频列表 | |
| 208 | - [self pushVC:[MineLiveController new]]; | |
| 209 | - return; | |
| 210 | - | |
| 211 | - }else if (indexPath.row == 2) | |
| 212 | - { //我要直播 | |
| 213 | - if ([UserTools isLogin]) { | |
| 214 | - [self anchorCheck]; | |
| 215 | - } | |
| 216 | - else | |
| 217 | - { | |
| 218 | - LoginViewController *loginVC = [[LoginViewController alloc] init]; | |
| 219 | - [self.navigationController pushViewController:loginVC animated:YES]; | |
| 220 | - } | |
| 221 | - return; | |
| 222 | - }else if (indexPath.row == 3) | |
| 223 | - { | |
| 224 | - //我的账户 | |
| 225 | - [self pushVC:[MineAccountController new]]; | |
| 226 | - return; | |
| 227 | - | |
| 228 | - }else if (indexPath.row == 4) | |
| 229 | - { //设置 | |
| 230 | - [self pushVC:[MineSettingViewController new]]; | |
| 231 | - return; | |
| 232 | - } | |
| 201 | + [self pushVC:[MineSettingViewController new]]; | |
| 202 | + return; | |
| 203 | + | |
| 204 | +// if(indexPath.row == 0) | |
| 205 | +// { | |
| 206 | +// //我的消息 | |
| 207 | +// [self pushVC:[MineMessageController new]]; | |
| 208 | +// return; | |
| 209 | +// }else if(indexPath.row == 1) | |
| 210 | +// { //我的视频列表 | |
| 211 | +// [self pushVC:[MineLiveController new]]; | |
| 212 | +// return; | |
| 213 | +// | |
| 214 | +// }else if (indexPath.row == 2) | |
| 215 | +// { //我要直播 | |
| 216 | +// if ([UserTools isLogin]) { | |
| 217 | +// [self anchorCheck]; | |
| 218 | +// } | |
| 219 | +// else | |
| 220 | +// { | |
| 221 | +// LoginViewController *loginVC = [[LoginViewController alloc] init]; | |
| 222 | +// [self.navigationController pushViewController:loginVC animated:YES]; | |
| 223 | +// } | |
| 224 | +// return; | |
| 225 | +// }else if (indexPath.row == 3) | |
| 226 | +// { | |
| 227 | +// //我的账户 | |
| 228 | +// [self pushVC:[MineAccountController new]]; | |
| 229 | +// return; | |
| 230 | +// | |
| 231 | +// }else if (indexPath.row == 4) | |
| 232 | +// { //设置 | |
| 233 | +// [self pushVC:[MineSettingViewController new]]; | |
| 234 | +// return; | |
| 235 | +// } | |
| 233 | 236 | } |
| 234 | 237 | |
| 235 | 238 | - (void)pushVC:(UIViewController *)viewController | ... | ... |
LiveVideoCloud/Classes/Sections/Mine/Controllers/MineSettingViewController.m
| ... | ... | @@ -9,10 +9,8 @@ |
| 9 | 9 | #import "MineSettingViewController.h" |
| 10 | 10 | #import "LVCMineCommonCell.h" |
| 11 | 11 | #import "LVCMineModel.h" |
| 12 | -#import "LVCClearCachesCell.h" | |
| 13 | 12 | #import "LVCWebViewController.h" |
| 14 | -#import "MineAboutUsController.h" | |
| 15 | - | |
| 13 | +#import "FeedbackViewController.h" | |
| 16 | 14 | |
| 17 | 15 | @interface MineSettingViewController ()<UITableViewDelegate,UITableViewDataSource> |
| 18 | 16 | @property (nonatomic, strong) UITableView * tbv; |
| ... | ... | @@ -20,7 +18,7 @@ |
| 20 | 18 | @property (nonatomic, strong) NSMutableArray * localTitleArr; |
| 21 | 19 | @property (nonatomic ,strong) NSArray *localImageArr; |
| 22 | 20 | |
| 23 | -@property (nonatomic , strong) NSString *clearCacheName;//定义清除缓存 | |
| 21 | +//@property (nonatomic , strong) NSString *clearCacheName;//定义清除缓存 | |
| 24 | 22 | |
| 25 | 23 | @end |
| 26 | 24 | |
| ... | ... | @@ -58,8 +56,7 @@ |
| 58 | 56 | - (NSMutableArray *)localTitleArr |
| 59 | 57 | { |
| 60 | 58 | if (!_localTitleArr) { |
| 61 | - _localTitleArr = [[NSMutableArray alloc] initWithObjects:@[@"清除缓存"],@[@"帮助",@"关于我们",@"反馈意见"], nil]; | |
| 62 | - | |
| 59 | + _localTitleArr = [[NSMutableArray alloc] initWithObjects:@"反馈意见", nil]; | |
| 63 | 60 | } |
| 64 | 61 | return _localTitleArr; |
| 65 | 62 | } |
| ... | ... | @@ -67,7 +64,7 @@ |
| 67 | 64 | { |
| 68 | 65 | if (!_localImageArr) { |
| 69 | 66 | |
| 70 | - _localImageArr = [[NSArray alloc] initWithObjects:@[@"handShake"],@[@"MoreHelp",@"MoreAbout",@"MorePush"], nil]; | |
| 67 | + _localImageArr = [[NSArray alloc] initWithObjects:@"MorePush", nil]; | |
| 71 | 68 | |
| 72 | 69 | } |
| 73 | 70 | return _localImageArr; |
| ... | ... | @@ -81,8 +78,6 @@ |
| 81 | 78 | tableView.dataSource = self; |
| 82 | 79 | tableView.separatorStyle = UITableViewCellSeparatorStyleNone; |
| 83 | 80 | tableView.backgroundColor = CommonBgColor; |
| 84 | - | |
| 85 | - [tableView registerClass:[LVCClearCachesCell class] forCellReuseIdentifier:NSStringFromClass([LVCClearCachesCell class])]; | |
| 86 | 81 | [tableView registerClass:[LVCMineCommonCell class] forCellReuseIdentifier:NSStringFromClass([LVCMineCommonCell class])]; |
| 87 | 82 | _tbv = tableView; |
| 88 | 83 | } |
| ... | ... | @@ -90,20 +85,10 @@ |
| 90 | 85 | } |
| 91 | 86 | -(UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath |
| 92 | 87 | { |
| 93 | - if (indexPath.section == 0 && indexPath.row == 0) { | |
| 94 | - LVCClearCachesCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([LVCClearCachesCell class])]; | |
| 95 | - [cell loadLocalTitle:_localTitleArr[indexPath.section][indexPath.row] imageName:self.localImageArr[indexPath.section][indexPath.row]]; | |
| 96 | - return cell; | |
| 97 | - }else | |
| 98 | - { | |
| 99 | - LVCMineCommonCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([LVCMineCommonCell class]) forIndexPath:indexPath]; | |
| 100 | - | |
| 101 | - [cell loadLocalTitle:_localTitleArr[indexPath.section][indexPath.row] imageName:self.localImageArr[indexPath.section][indexPath.row]]; | |
| 102 | - return cell; | |
| 103 | - | |
| 104 | - } | |
| 105 | - return nil; | |
| 88 | + LVCMineCommonCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([LVCMineCommonCell class]) forIndexPath:indexPath]; | |
| 106 | 89 | |
| 90 | + [cell loadLocalTitle:_localTitleArr[indexPath.section][indexPath.row] imageName:self.localImageArr[indexPath.section][indexPath.row]]; | |
| 91 | + return cell; | |
| 107 | 92 | } |
| 108 | 93 | |
| 109 | 94 | - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView |
| ... | ... | @@ -121,25 +106,31 @@ |
| 121 | 106 | } |
| 122 | 107 | -(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath |
| 123 | 108 | { |
| 124 | - if (indexPath.section == 0 && indexPath.row == 0 && [_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"清除缓存"]) | |
| 125 | - { | |
| 126 | - //清除缓存 | |
| 127 | - NSLog(@"清除缓存"); | |
| 128 | - return; | |
| 129 | - } | |
| 130 | - else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"帮助"]) | |
| 131 | - { | |
| 132 | - LVCWebViewController *web = [[LVCWebViewController alloc] init]; | |
| 133 | - web.url = @"http://data.cnlive.com/term/hdtv/hd_zhongguobi.html"; | |
| 134 | - web.title = @"帮助"; | |
| 135 | - [self.navigationController pushViewController:web animated:YES]; | |
| 136 | - } | |
| 137 | - else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"关于我们"]) | |
| 109 | + if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"反馈意见"]) | |
| 138 | 110 | { |
| 139 | - MineAboutUsController * vc = [MineAboutUsController new]; | |
| 140 | - vc.title = self.localTitleArr[indexPath.section][indexPath.row]; | |
| 111 | + FeedBackViewController * vc = [FeedBackViewController new]; | |
| 112 | + // vc.hidesBottomBarWhenPushed=YES; | |
| 141 | 113 | [self.navigationController pushViewController:vc animated:YES]; |
| 142 | 114 | } |
| 115 | +// if (indexPath.section == 0 && indexPath.row == 0 && [_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"清除缓存"]) | |
| 116 | +// { | |
| 117 | +// //清除缓存 | |
| 118 | +// NSLog(@"清除缓存"); | |
| 119 | +// return; | |
| 120 | +// } | |
| 121 | +// else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"帮助"]) | |
| 122 | +// { | |
| 123 | +// LVCWebViewController *web = [[LVCWebViewController alloc] init]; | |
| 124 | +// web.url = @"http://data.cnlive.com/term/hdtv/hd_zhongguobi.html"; | |
| 125 | +// web.title = @"帮助"; | |
| 126 | +// [self.navigationController pushViewController:web animated:YES]; | |
| 127 | +// } | |
| 128 | +// else if ([_localTitleArr[indexPath.section][indexPath.row] isEqualToString:@"关于我们"]) | |
| 129 | +// { | |
| 130 | +// MineAboutUsController * vc = [MineAboutUsController new]; | |
| 131 | +// vc.title = self.localTitleArr[indexPath.section][indexPath.row]; | |
| 132 | +// [self.navigationController pushViewController:vc animated:YES]; | |
| 133 | +// } | |
| 143 | 134 | } |
| 144 | 135 | -(CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section |
| 145 | 136 | { | ... | ... |
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLiveActivityInfoService.h renamed to LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCLiveActivityInfoService.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLiveActivityInfoService.m renamed to LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCLiveActivityInfoService.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.h renamed to LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListController.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListController.m renamed to LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListController.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.h renamed to LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListView.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.m renamed to LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLiveListView.m
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.h renamed to LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLivePlayerController.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.m renamed to LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLivePlayerController.m
| ... | ... | @@ -13,8 +13,6 @@ |
| 13 | 13 | #import "UIImage+LVCVagueImage.h" |
| 14 | 14 | #import "LiveBaseView.h" |
| 15 | 15 | #import "MineLiveController.h" |
| 16 | -#import "HomeViewController.h" | |
| 17 | - | |
| 18 | 16 | |
| 19 | 17 | @interface LVCUGCLivePlayerController () { |
| 20 | 18 | |
| ... | ... | @@ -119,10 +117,11 @@ |
| 119 | 117 | if ([controller isKindOfClass:[MineLiveController class]]) { |
| 120 | 118 | MineLiveController *revise =(MineLiveController *)controller; |
| 121 | 119 | [self.navigationController popToViewController:revise animated:YES]; |
| 122 | - } else if ([controller isKindOfClass:[HomeViewController class]]) { | |
| 123 | - HomeViewController *revise =(HomeViewController *)controller; | |
| 124 | - [self.navigationController popToViewController:revise animated:YES]; | |
| 125 | 120 | } |
| 121 | +// else if ([controller isKindOfClass:[HomeViewController class]]) { | |
| 122 | +// HomeViewController *revise =(HomeViewController *)controller; | |
| 123 | +// [self.navigationController popToViewController:revise animated:YES]; | |
| 124 | +// } | |
| 126 | 125 | } |
| 127 | 126 | } |
| 128 | 127 | ... | ... |
LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveListService.h renamed to LiveVideoCloud/Classes/Sections/UGCSections/Controller/LiveListService.h
LiveVideoCloud/Classes/Sections/homeSections/Controller/LiveListService.m renamed to LiveVideoCloud/Classes/Sections/UGCSections/Controller/LiveListService.m
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLiveListModel.h renamed to LiveVideoCloud/Classes/Sections/UGCSections/Model/LVCUGCLiveListModel.h
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLiveListModel.m renamed to LiveVideoCloud/Classes/Sections/UGCSections/Model/LVCUGCLiveListModel.m
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLivePlayerModel.h renamed to LiveVideoCloud/Classes/Sections/UGCSections/Model/LVCUGCLivePlayerModel.h
LiveVideoCloud/Classes/Sections/homeSections/Model/LVCUGCLivePlayerModel.m renamed to LiveVideoCloud/Classes/Sections/UGCSections/Model/LVCUGCLivePlayerModel.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCBackgroundView.h renamed to LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCBackgroundView.h
LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCBackgroundView.m renamed to LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCBackgroundView.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCLivePlayerCell.h renamed to LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCLivePlayerCell.h
LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCLivePlayerCell.m renamed to LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCLivePlayerCell.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCPlayerLoadingView.h renamed to LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCPlayerLoadingView.h
LiveVideoCloud/Classes/Sections/homeSections/View/LVCUGCPlayerLoadingView.m renamed to LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCPlayerLoadingView.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerTableViewCell.h renamed to LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerListController.h
| 1 | 1 | // |
| 2 | -// LVCVodPlayerTableViewCell.h | |
| 2 | +// LVCVodPlayerListController.h | |
| 3 | 3 | // LiveVideoCloud |
| 4 | 4 | // |
| 5 | 5 | // Created by cnliveJunBo on 17/6/27. |
| ... | ... | @@ -8,6 +8,6 @@ |
| 8 | 8 | |
| 9 | 9 | #import <UIKit/UIKit.h> |
| 10 | 10 | |
| 11 | -@interface LVCVodPlayerTableViewCell : UITableViewCell | |
| 11 | +@interface LVCVodPlayerListController : UIViewController | |
| 12 | 12 | |
| 13 | 13 | @end | ... | ... |
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerListView.m renamed to LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCVodPlayerListController.m
| 1 | 1 | // |
| 2 | -// LVCVodPlayerListView.m | |
| 2 | +// LVCVodPlayerListController.m | |
| 3 | 3 | // LiveVideoCloud |
| 4 | 4 | // |
| 5 | -// Created by cnliveJunBo on 17/6/26. | |
| 5 | +// Created by cnliveJunBo on 17/6/27. | |
| 6 | 6 | // Copyright © 2017年 cnlive. All rights reserved. |
| 7 | 7 | // |
| 8 | 8 | |
| 9 | -#import "LVCVodPlayerListView.h" | |
| 10 | -#import "LVCVodPlayerTableViewCell.h" | |
| 9 | +#import "LVCVodPlayerListController.h" | |
| 11 | 10 | |
| 12 | 11 | static NSString *vodCellId = @"vodCellId"; |
| 13 | 12 | |
| 14 | -@interface LVCVodPlayerListView()<UITableViewDelegate, UITableViewDataSource> { | |
| 13 | +@interface LVCVodPlayerListController ()<UITableViewDelegate, UITableViewDataSource> { | |
| 15 | 14 | |
| 16 | 15 | AFHTTPRequestOperation *_operation; |
| 17 | 16 | NSMutableArray *_programArrayM; |
| ... | ... | @@ -21,17 +20,14 @@ static NSString *vodCellId = @"vodCellId"; |
| 21 | 20 | |
| 22 | 21 | @end |
| 23 | 22 | |
| 24 | -@implementation LVCVodPlayerListView | |
| 23 | +@implementation LVCVodPlayerListController | |
| 25 | 24 | |
| 26 | -- (instancetype)initWithFrame:(CGRect)frame | |
| 27 | -{ | |
| 28 | - self = [super initWithFrame:frame]; | |
| 29 | - if (self) { | |
| 30 | - self.backgroundColor = [UIColor whiteColor]; | |
| 31 | - _programArrayM = [[NSMutableArray alloc] init]; | |
| 32 | - [self requestVodPlayerList]; | |
| 33 | - } | |
| 34 | - return self; | |
| 25 | +- (void)viewDidLoad { | |
| 26 | + [super viewDidLoad]; | |
| 27 | + | |
| 28 | + self.navigationItem.title = @"点播"; | |
| 29 | + self.view.backgroundColor = [UIColor whiteColor]; | |
| 30 | + _programArrayM = [[NSMutableArray alloc] init]; | |
| 35 | 31 | } |
| 36 | 32 | |
| 37 | 33 | - (void)requestVodPlayerList { |
| ... | ... | @@ -92,7 +88,7 @@ static NSString *vodCellId = @"vodCellId"; |
| 92 | 88 | - (UITableView *)tableView { |
| 93 | 89 | |
| 94 | 90 | if (!_tableView) { |
| 95 | - _tableView = [[UITableView alloc] initWithFrame:self.bounds style:UITableViewStylePlain]; | |
| 91 | + _tableView = [[UITableView alloc] initWithFrame:self.view.bounds style:UITableViewStylePlain]; | |
| 96 | 92 | _tableView.dataSource = self; |
| 97 | 93 | _tableView.delegate = self; |
| 98 | 94 | _tableView.separatorStyle = UITableViewCellSeparatorStyleNone; |
| ... | ... | @@ -100,8 +96,8 @@ static NSString *vodCellId = @"vodCellId"; |
| 100 | 96 | UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, -KScreenHeight, KScreenWidth, KScreenHeight)]; |
| 101 | 97 | view.backgroundColor = [UIColor backgroundColor]; |
| 102 | 98 | [_tableView addSubview:view]; |
| 103 | - | |
| 104 | - [_tableView registerClass:[LVCVodPlayerTableViewCell class] forCellReuseIdentifier:vodCellId]; | |
| 99 | + | |
| 100 | + [_tableView registerClass:[UITableViewCell class] forCellReuseIdentifier:vodCellId]; | |
| 105 | 101 | } |
| 106 | 102 | return _tableView; |
| 107 | 103 | } |
| ... | ... | @@ -121,4 +117,9 @@ static NSString *vodCellId = @"vodCellId"; |
| 121 | 117 | } |
| 122 | 118 | } |
| 123 | 119 | |
| 120 | +- (void)didReceiveMemoryWarning { | |
| 121 | + [super didReceiveMemoryWarning]; | |
| 122 | + // Dispose of any resources that can be recreated. | |
| 123 | +} | |
| 124 | + | |
| 124 | 125 | @end | ... | ... |
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerListView.h deleted
100644 → 0
LiveVideoCloud/Classes/Sections/homeSections/View/LVCVodPlayerTableViewCell.m deleted
100644 → 0
| 1 | -// | |
| 2 | -// LVCVodPlayerTableViewCell.m | |
| 3 | -// LiveVideoCloud | |
| 4 | -// | |
| 5 | -// Created by cnliveJunBo on 17/6/27. | |
| 6 | -// Copyright © 2017年 cnlive. All rights reserved. | |
| 7 | -// | |
| 8 | - | |
| 9 | -#import "LVCVodPlayerTableViewCell.h" | |
| 10 | - | |
| 11 | -@implementation LVCVodPlayerTableViewCell | |
| 12 | - | |
| 13 | -- (void)awakeFromNib { | |
| 14 | - [super awakeFromNib]; | |
| 15 | - // Initialization code | |
| 16 | -} | |
| 17 | - | |
| 18 | -- (void)setSelected:(BOOL)selected animated:(BOOL)animated { | |
| 19 | - [super setSelected:selected animated:animated]; | |
| 20 | - | |
| 21 | - // Configure the view for the selected state | |
| 22 | -} | |
| 23 | - | |
| 24 | -@end |