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