iOS Team / ScioLive · Commits

Commit 23e283dd2d3c802dcc1da633b4541861b135e66b

Authored by zhangxiaowen
1 parent edad50ee

no message

Inline Side-by-side
Showing 6 changed files with 6 additions and 8 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @23e283d
@@ -631,7 +631,6 @@ @@ -631,7 +631,6 @@
631 08B5C6582153C8CE00F5476E /* CNLiveArticleFontViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08B5C6562153C8CE00F5476E /* CNLiveArticleFontViewController.m */; }; 631 08B5C6582153C8CE00F5476E /* CNLiveArticleFontViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08B5C6562153C8CE00F5476E /* CNLiveArticleFontViewController.m */; };
632 08B5C6592153C8CE00F5476E /* CNLiveArticleFontViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08B5C6562153C8CE00F5476E /* CNLiveArticleFontViewController.m */; }; 632 08B5C6592153C8CE00F5476E /* CNLiveArticleFontViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08B5C6562153C8CE00F5476E /* CNLiveArticleFontViewController.m */; };
633 08C08F73214F997E00E23D16 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C08F72214F997E00E23D16 /* AppDelegate.m */; }; 633 08C08F73214F997E00E23D16 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C08F72214F997E00E23D16 /* AppDelegate.m */; };
634 - 08C08F76214F997E00E23D16 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C08F75214F997E00E23D16 /* ViewController.m */; };  
635 08C08F7B214F997F00E23D16 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 08C08F7A214F997F00E23D16 /* Assets.xcassets */; }; 634 08C08F7B214F997F00E23D16 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 08C08F7A214F997F00E23D16 /* Assets.xcassets */; };
636 08C08F81214F997F00E23D16 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C08F80214F997F00E23D16 /* main.m */; }; 635 08C08F81214F997F00E23D16 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C08F80214F997F00E23D16 /* main.m */; };
637 08C08F8B214F998000E23D16 /* CNLiveScioLiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C08F8A214F998000E23D16 /* CNLiveScioLiveTests.m */; }; 636 08C08F8B214F998000E23D16 /* CNLiveScioLiveTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 08C08F8A214F998000E23D16 /* CNLiveScioLiveTests.m */; };
@@ -1161,8 +1160,6 @@ @@ -1161,8 +1160,6 @@
1161 08C08F6E214F997E00E23D16 /* CNLiveScioLive.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CNLiveScioLive.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1160 08C08F6E214F997E00E23D16 /* CNLiveScioLive.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CNLiveScioLive.app; sourceTree = BUILT_PRODUCTS_DIR; };
1162 08C08F71214F997E00E23D16 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; 1161 08C08F71214F997E00E23D16 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
1163 08C08F72214F997E00E23D16 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; 1162 08C08F72214F997E00E23D16 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
1164 - 08C08F74214F997E00E23D16 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };  
1165 - 08C08F75214F997E00E23D16 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };  
1166 08C08F7A214F997F00E23D16 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; 1163 08C08F7A214F997F00E23D16 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
1167 08C08F7F214F997F00E23D16 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; 1164 08C08F7F214F997F00E23D16 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1168 08C08F80214F997F00E23D16 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 1165 08C08F80214F997F00E23D16 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
@@ -1961,8 +1958,6 @@ @@ -1961,8 +1958,6 @@
1961 08B5C6442153B8E800F5476E /* CNLiveScioLive.entitlements */, 1958 08B5C6442153B8E800F5476E /* CNLiveScioLive.entitlements */,
1962 08C08F71214F997E00E23D16 /* AppDelegate.h */, 1959 08C08F71214F997E00E23D16 /* AppDelegate.h */,
1963 08C08F72214F997E00E23D16 /* AppDelegate.m */, 1960 08C08F72214F997E00E23D16 /* AppDelegate.m */,
1964 - 08C08F74214F997E00E23D16 /* ViewController.h */,  
1965 - 08C08F75214F997E00E23D16 /* ViewController.m */,  
1966 08C08FC7214FA01B00E23D16 /* Pages */, 1961 08C08FC7214FA01B00E23D16 /* Pages */,
1967 08C08F7A214F997F00E23D16 /* Assets.xcassets */, 1962 08C08F7A214F997F00E23D16 /* Assets.xcassets */,
1968 08C08F7F214F997F00E23D16 /* Info.plist */, 1963 08C08F7F214F997F00E23D16 /* Info.plist */,
@@ -3155,7 +3150,6 @@ @@ -3155,7 +3150,6 @@
3155 08585CF9215B3AA900FC2CA2 /* ArticleTableViewCell.m in Sources */, 3150 08585CF9215B3AA900FC2CA2 /* ArticleTableViewCell.m in Sources */,
3156 C3A6D061215278CE00FB7759 /* CNLiveForgotPasswordViewController.m in Sources */, 3151 C3A6D061215278CE00FB7759 /* CNLiveForgotPasswordViewController.m in Sources */,
3157 084ACE272154C6980089E035 /* CNLiveNewsNoPicTableViewCell.m in Sources */, 3152 084ACE272154C6980089E035 /* CNLiveNewsNoPicTableViewCell.m in Sources */,
3158 - 08C08F76214F997E00E23D16 /* ViewController.m in Sources */,  
3159 08585CF0215B3AA900FC2CA2 /* SearchHistoryTableViewCell.m in Sources */, 3153 08585CF0215B3AA900FC2CA2 /* SearchHistoryTableViewCell.m in Sources */,
3160 08B5C56E2153364C00F5476E /* CNLiveSettingTableViewCell.m in Sources */, 3154 08B5C56E2153364C00F5476E /* CNLiveSettingTableViewCell.m in Sources */,
3161 08384878215CC9E400186618 /* GraphicLiveViewController.m in Sources */, 3155 08384878215CC9E400186618 /* GraphicLiveViewController.m in Sources */,
CNLiveScioLive/Pages/Base/CNLiveBaseNavigationController.m
  View file @23e283d
@@ -71,10 +71,12 @@ @@ -71,10 +71,12 @@
71 71
72 - (UIInterfaceOrientationMask)supportedInterfaceOrientations { 72 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
73 return self.topViewController.supportedInterfaceOrientations; 73 return self.topViewController.supportedInterfaceOrientations;
  74 +
74 } 75 }
75 76
76 - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation { 77 - (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
77 return self.topViewController.preferredInterfaceOrientationForPresentation; 78 return self.topViewController.preferredInterfaceOrientationForPresentation;
  79 +
78 } 80 }
79 81
80 @end 82 @end
CNLiveScioLive/Pages/Base/CNLiveBaseViewController.m
  View file @23e283d
@@ -179,7 +179,7 @@ @@ -179,7 +179,7 @@
179 179
180 - (BOOL)shouldAutorotate { 180 - (BOOL)shouldAutorotate {
181 return NO; 181 return NO;
182 - 182 +
183 } 183 }
184 184
185 - (UIInterfaceOrientationMask)supportedInterfaceOrientations { 185 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
CNLiveScioLive/Pages/Base/CNLiveENTabBarController.m
  View file @23e283d
@@ -120,6 +120,7 @@ @@ -120,6 +120,7 @@
120 120
121 - (BOOL)shouldAutorotate{ 121 - (BOOL)shouldAutorotate{
122 return self.selectedViewController.shouldAutorotate; 122 return self.selectedViewController.shouldAutorotate;
  123 +
123 } 124 }
124 125
125 - (UIInterfaceOrientationMask)supportedInterfaceOrientations{ 126 - (UIInterfaceOrientationMask)supportedInterfaceOrientations{
CNLiveScioLive/Pages/Base/CNLiveTabBarController.m
  View file @23e283d
@@ -130,6 +130,7 @@ @@ -130,6 +130,7 @@
130 */ 130 */
131 - (BOOL)shouldAutorotate{ 131 - (BOOL)shouldAutorotate{
132 return self.selectedViewController.shouldAutorotate; 132 return self.selectedViewController.shouldAutorotate;
  133 +
133 } 134 }
134 135
135 - (UIInterfaceOrientationMask)supportedInterfaceOrientations{ 136 - (UIInterfaceOrientationMask)supportedInterfaceOrientations{
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
  View file @23e283d
@@ -295,7 +295,7 @@ @@ -295,7 +295,7 @@
295 // 点播 295 // 点播
296 self.liveController = [[CNLivePlayerController alloc] initVodPlayWithVId:_dictionary[@"uuid"] authSuccess:^{ 296 self.liveController = [[CNLivePlayerController alloc] initVodPlayWithVId:_dictionary[@"uuid"] authSuccess:^{
297 NSError *error = nil; 297 NSError *error = nil;
298 - [[AVAudioSession sharedInstance] setCategory: AVAudioSessionCategoryAmbient error: &error]; 298 + [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error: &error];
299 [[AVAudioSession sharedInstance] setActive:YES error:nil]; 299 [[AVAudioSession sharedInstance] setActive:YES error:nil];
300 300
301 [bgView removeFromSuperview]; 301 [bgView removeFromSuperview];