Commit d97d20ac82e083e6bb08e5b935264656575b6928

Authored by 王军波
1 parent e5ad0a40

文件变更

LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
@@ -20,7 +20,6 @@ @@ -20,7 +20,6 @@
20 810B65061E779B1F00133E15 /* View+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B64FA1E779B1F00133E15 /* View+MASAdditions.m */; }; 20 810B65061E779B1F00133E15 /* View+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B64FA1E779B1F00133E15 /* View+MASAdditions.m */; };
21 810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B64FD1E779B1F00133E15 /* ViewController+MASAdditions.m */; }; 21 810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B64FD1E779B1F00133E15 /* ViewController+MASAdditions.m */; };
22 812E50531E7699DC004F5FCD /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; }; 22 812E50531E7699DC004F5FCD /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; };
23 - 812E50541E7699DC004F5FCD /* KSYGPUResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 812E50511E7699DC004F5FCD /* KSYGPUResource.bundle */; };  
24 812E50551E7699E9004F5FCD /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */; }; 23 812E50551E7699E9004F5FCD /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */; };
25 812E50561E7699E9004F5FCD /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 24 812E50561E7699E9004F5FCD /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
26 812E50581E7699E9004F5FCD /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 25 812E50581E7699E9004F5FCD /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -139,6 +138,9 @@ @@ -139,6 +138,9 @@
139 D2575C7E1E76A4F300E3A8FC /* NHPlaneViews.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C771E76A4F300E3A8FC /* NHPlaneViews.m */; }; 138 D2575C7E1E76A4F300E3A8FC /* NHPlaneViews.m in Sources */ = {isa = PBXBuildFile; fileRef = D2575C771E76A4F300E3A8FC /* NHPlaneViews.m */; };
140 D2575C7F1E76A4F300E3A8FC /* NHPlaneViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2575C781E76A4F300E3A8FC /* NHPlaneViews.xib */; }; 139 D2575C7F1E76A4F300E3A8FC /* NHPlaneViews.xib in Resources */ = {isa = PBXBuildFile; fileRef = D2575C781E76A4F300E3A8FC /* NHPlaneViews.xib */; };
141 D2575C801E76A4F300E3A8FC /* resource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D2575C791E76A4F300E3A8FC /* resource.bundle */; }; 140 D2575C801E76A4F300E3A8FC /* resource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D2575C791E76A4F300E3A8FC /* resource.bundle */; };
  141 + D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */; };
  142 + D25BF87B1E7B8A82007FB138 /* SliderView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8791E7B8A82007FB138 /* SliderView.m */; };
  143 + D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */; };
142 D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; }; 144 D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; };
143 D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; }; 145 D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; };
144 D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; }; 146 D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
@@ -210,7 +212,6 @@ @@ -210,7 +212,6 @@
210 810B64FD1E779B1F00133E15 /* ViewController+MASAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ViewController+MASAdditions.m"; sourceTree = "<group>"; }; 212 810B64FD1E779B1F00133E15 /* ViewController+MASAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "ViewController+MASAdditions.m"; sourceTree = "<group>"; };
211 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; }; 213 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
212 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; }; 214 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
213 - 812E50511E7699DC004F5FCD /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; sourceTree = "<group>"; };  
214 D2029B811E6EAAA50027CD92 /* LiveVideoCloud.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LiveVideoCloud.app; sourceTree = BUILT_PRODUCTS_DIR; }; 215 D2029B811E6EAAA50027CD92 /* LiveVideoCloud.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LiveVideoCloud.app; sourceTree = BUILT_PRODUCTS_DIR; };
215 D2029B851E6EAAA50027CD92 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 216 D2029B851E6EAAA50027CD92 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
216 D2029B8E1E6EAAA50027CD92 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; 217 D2029B8E1E6EAAA50027CD92 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -454,6 +455,11 @@ @@ -454,6 +455,11 @@
454 D2575C771E76A4F300E3A8FC /* NHPlaneViews.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NHPlaneViews.m; sourceTree = "<group>"; }; 455 D2575C771E76A4F300E3A8FC /* NHPlaneViews.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NHPlaneViews.m; sourceTree = "<group>"; };
455 D2575C781E76A4F300E3A8FC /* NHPlaneViews.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NHPlaneViews.xib; sourceTree = "<group>"; }; 456 D2575C781E76A4F300E3A8FC /* NHPlaneViews.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NHPlaneViews.xib; sourceTree = "<group>"; };
456 D2575C791E76A4F300E3A8FC /* resource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = resource.bundle; sourceTree = "<group>"; }; 457 D2575C791E76A4F300E3A8FC /* resource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = resource.bundle; sourceTree = "<group>"; };
  458 + D25BF8761E7B8A82007FB138 /* FilterFunctionView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FilterFunctionView.h; sourceTree = "<group>"; };
  459 + D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FilterFunctionView.m; sourceTree = "<group>"; };
  460 + D25BF8781E7B8A82007FB138 /* SliderView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SliderView.h; sourceTree = "<group>"; };
  461 + D25BF8791E7B8A82007FB138 /* SliderView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SliderView.m; sourceTree = "<group>"; };
  462 + D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; sourceTree = "<group>"; };
457 D2888D921E6EB8B4003A77C8 /* LVCTabBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCTabBar.h; sourceTree = "<group>"; }; 463 D2888D921E6EB8B4003A77C8 /* LVCTabBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCTabBar.h; sourceTree = "<group>"; };
458 D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCTabBar.m; sourceTree = "<group>"; }; 464 D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCTabBar.m; sourceTree = "<group>"; };
459 D2888D9A1E6EBF1B003A77C8 /* LVCLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveViewController.h; sourceTree = "<group>"; }; 465 D2888D9A1E6EBF1B003A77C8 /* LVCLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveViewController.h; sourceTree = "<group>"; };
@@ -537,9 +543,9 @@ @@ -537,9 +543,9 @@
537 812E504E1E7699B9004F5FCD /* CNLiveSDK */ = { 543 812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
538 isa = PBXGroup; 544 isa = PBXGroup;
539 children = ( 545 children = (
  546 + D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
540 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */, 547 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */,
541 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */, 548 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */,
542 - 812E50511E7699DC004F5FCD /* KSYGPUResource.bundle */,  
543 ); 549 );
544 path = CNLiveSDK; 550 path = CNLiveSDK;
545 sourceTree = "<group>"; 551 sourceTree = "<group>";
@@ -1268,6 +1274,24 @@ @@ -1268,6 +1274,24 @@
1268 path = GiftResource; 1274 path = GiftResource;
1269 sourceTree = "<group>"; 1275 sourceTree = "<group>";
1270 }; 1276 };
  1277 + D25BF8741E7B8A59007FB138 /* Model */ = {
  1278 + isa = PBXGroup;
  1279 + children = (
  1280 + );
  1281 + path = Model;
  1282 + sourceTree = "<group>";
  1283 + };
  1284 + D25BF8751E7B8A59007FB138 /* View */ = {
  1285 + isa = PBXGroup;
  1286 + children = (
  1287 + D25BF8761E7B8A82007FB138 /* FilterFunctionView.h */,
  1288 + D25BF8771E7B8A82007FB138 /* FilterFunctionView.m */,
  1289 + D25BF8781E7B8A82007FB138 /* SliderView.h */,
  1290 + D25BF8791E7B8A82007FB138 /* SliderView.m */,
  1291 + );
  1292 + path = View;
  1293 + sourceTree = "<group>";
  1294 + };
1271 D2888D911E6EB897003A77C8 /* View */ = { 1295 D2888D911E6EB897003A77C8 /* View */ = {
1272 isa = PBXGroup; 1296 isa = PBXGroup;
1273 children = ( 1297 children = (
@@ -1281,8 +1305,8 @@ @@ -1281,8 +1305,8 @@
1281 isa = PBXGroup; 1305 isa = PBXGroup;
1282 children = ( 1306 children = (
1283 D2888D991E6EBF1B003A77C8 /* Controller */, 1307 D2888D991E6EBF1B003A77C8 /* Controller */,
1284 - D2888D9C1E6EBF1B003A77C8 /* Model */,  
1285 - D2888D9D1E6EBF1B003A77C8 /* View */, 1308 + D25BF8741E7B8A59007FB138 /* Model */,
  1309 + D25BF8751E7B8A59007FB138 /* View */,
1286 ); 1310 );
1287 path = LiveSections; 1311 path = LiveSections;
1288 sourceTree = "<group>"; 1312 sourceTree = "<group>";
@@ -1296,20 +1320,6 @@ @@ -1296,20 +1320,6 @@
1296 path = Controller; 1320 path = Controller;
1297 sourceTree = "<group>"; 1321 sourceTree = "<group>";
1298 }; 1322 };
1299 - D2888D9C1E6EBF1B003A77C8 /* Model */ = {  
1300 - isa = PBXGroup;  
1301 - children = (  
1302 - );  
1303 - path = Model;  
1304 - sourceTree = "<group>";  
1305 - };  
1306 - D2888D9D1E6EBF1B003A77C8 /* View */ = {  
1307 - isa = PBXGroup;  
1308 - children = (  
1309 - );  
1310 - path = View;  
1311 - sourceTree = "<group>";  
1312 - };  
1313 D2888DA71E6EC014003A77C8 /* homeSections */ = { 1323 D2888DA71E6EC014003A77C8 /* homeSections */ = {
1314 isa = PBXGroup; 1324 isa = PBXGroup;
1315 children = ( 1325 children = (
@@ -1498,7 +1508,7 @@ @@ -1498,7 +1508,7 @@
1498 D2029B911E6EAAA50027CD92 /* animation.xcassets in Resources */, 1508 D2029B911E6EAAA50027CD92 /* animation.xcassets in Resources */,
1499 D2029CB01E6EADE10027CD92 /* MJRefresh.bundle in Resources */, 1509 D2029CB01E6EADE10027CD92 /* MJRefresh.bundle in Resources */,
1500 D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */, 1510 D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */,
1501 - 812E50541E7699DC004F5FCD /* KSYGPUResource.bundle in Resources */, 1511 + D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */,
1502 D2029B8F1E6EAAA50027CD92 /* Main.storyboard in Resources */, 1512 D2029B8F1E6EAAA50027CD92 /* Main.storyboard in Resources */,
1503 ); 1513 );
1504 runOnlyForDeploymentPostprocessing = 0; 1514 runOnlyForDeploymentPostprocessing = 0;
@@ -1613,6 +1623,7 @@ @@ -1613,6 +1623,7 @@
1613 D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */, 1623 D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */,
1614 D2029C8E1E6EADE10027CD92 /* AFImageDownloader.m in Sources */, 1624 D2029C8E1E6EADE10027CD92 /* AFImageDownloader.m in Sources */,
1615 D2029BCA1E6EADD70027CD92 /* BaseModel.m in Sources */, 1625 D2029BCA1E6EADD70027CD92 /* BaseModel.m in Sources */,
  1626 + D25BF87B1E7B8A82007FB138 /* SliderView.m in Sources */,
1616 810B65041E779B1F00133E15 /* NSArray+MASAdditions.m in Sources */, 1627 810B65041E779B1F00133E15 /* NSArray+MASAdditions.m in Sources */,
1617 D2029D031E6EAE2E0027CD92 /* UIImage+ZXExtension.m in Sources */, 1628 D2029D031E6EAE2E0027CD92 /* UIImage+ZXExtension.m in Sources */,
1618 D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */, 1629 D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */,
@@ -1626,6 +1637,7 @@ @@ -1626,6 +1637,7 @@
1626 D2029BCD1E6EADD70027CD92 /* BaseViewController.m in Sources */, 1637 D2029BCD1E6EADD70027CD92 /* BaseViewController.m in Sources */,
1627 810B64E01E779AE900133E15 /* LVCPlayer.m in Sources */, 1638 810B64E01E779AE900133E15 /* LVCPlayer.m in Sources */,
1628 810B64FF1E779B1F00133E15 /* MASConstraint.m in Sources */, 1639 810B64FF1E779B1F00133E15 /* MASConstraint.m in Sources */,
  1640 + D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */,
1629 D2029D001E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m in Sources */, 1641 D2029D001E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m in Sources */,
1630 D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */, 1642 D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */,
1631 D2029C951E6EADE10027CD92 /* UIWebView+AFNetworking.m in Sources */, 1643 D2029C951E6EADE10027CD92 /* UIWebView+AFNetworking.m in Sources */,