1.app横屏启动问题

2.通知公告英文数据 3.播放器的状态颜色 4.网页没有数据,相关信息隐藏

1.app横屏启动问题
2.通知公告英文数据 3.播放器的状态颜色 4.网页没有数据,相关信息隐藏
iOS-Xiaowen
1 parent 86688df0
Showing 10 changed files with 35 additions and 16 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/AppDelegate.m
CNLiveScioLive/Info.plist
CNLiveScioLive/Pages/Home/新闻详情/Controller/VideoDetailViewController.m
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
CNLiveScioLive/Pages/Login/Controller/CNLiveLoginViewController.m
CNLiveScioLive/Pages/My/通知公告/Controller/CNMyAnnouncementsViewController.m
CNLiveScioLive/Pages/Register/Controller/CNLiveRegisterViewController.m
@@ -3598,8 +3598,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 381;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3638,7 +3638,7 @@
 				MARKETING_VERSION = 3.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = SCIOLiveDis_AppStore;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = "arm64 arm64e armv7s";
 			};
@@ -3651,8 +3651,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 381;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
@@ -3691,7 +3691,7 @@
 				MARKETING_VERSION = 3.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = SCIOLiveDis_AppStore;
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = 1;
 				VALID_ARCHS = "arm64 arm64e armv7s";
 			};
@@ -508,4 +508,8 @@
     }
 }
  
+- (UIInterfaceOrientationMask)application:(UIApplication *)application supportedInterfaceOrientationsForWindow:(UIWindow *)window {
+  return UIInterfaceOrientationMaskAllButUpsideDown;
+}
+
 @end
@@ -109,8 +109,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
@@ -150,13 +150,13 @@ static NSString *newsLeftPicTableViewCell = @&quot;CNLiveNewsLeftPicTableViewCell&quot;;
  
     if (self.model.publishDate && self.model.author) {
         htmldate = [[NSString alloc] initWithFormat:@"<html><p>%@</p><body>",[NSString stringWithFormat:@"%@",self.model.publishDate]];
-        htmlForm = [[NSString alloc] initWithFormat:@"<html><p>来源：%@</p><body>", self.model.author];
+        htmlForm = [[NSString alloc] initWithFormat:@"<html><p>%@：%@</p><body>", CustomStr(@"SourceSource"), self.model.author];        
         self.authorName = self.model.author;
     } else {
         htmldate = [[NSString alloc] initWithFormat:@"<html><p>%@</p><body>",[NSString stringWithFormat:@"%@",self.model.publishDate]];
         NSDictionary *author = [NSDictionary dictionaryWithContentsOfFile:FavouriteAuthors_PATH];
         self.authorName = author[self.model.pageUrl];
-        htmlForm = [[NSString alloc] initWithFormat:@"<html><p>来源：%@</p><body>", self.authorName];
+        htmlForm = [[NSString alloc] initWithFormat:@"<html><p>%@：%@</p><body>", CustomStr(@"SourceSource"), self.authorName];
     }
  
     NSString* htmlBody = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\"><font style=\"font-size:%@px;\">%@</font></div>",_fontArray[_fontIndex],self.model.desc];
@@ -65,7 +65,7 @@
                             "</script>\n"
                             "<div id=\"webview_content\"><p><font style=\"font-size:20px;\"><strong>%@</strong></font><p>%@</p><font color=\"#184085\">%@</font></p><div><font style=\"font-size:%@px;\">%@</font></div></div>"
                             "</body>"
-                             "</html>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"createDate"],[NSString stringWithFormat:@"来源:%@",author?author:@"国新网"],fontArray[fontIndex],content];
+                             "</html>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"createDate"],[NSString stringWithFormat:@"%@:%@",CustomStr(@"Source"), author?author:@"国新网"],fontArray[fontIndex],content];
 //    NSString * htmlcontent = [NSString stringWithFormat:@"<div id=\"webview_content_wrapper\">%@<font style=\"font-size:%@px;\">%@</font></div>",htmlHeader,fontArray[fontIndex],content];
     NSLog(@"htmlcontent = %@",htmlcontent);
     return htmlcontent;
@@ -519,10 +519,11 @@
     return 86.0f;
 }
 - (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section {
-    return 30.0;
+    return _newsArray.count>0?30.0:0.00001;
 }
 - (nullable UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section {
     UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 30)];
+    view.hidden = _newsArray.count == 0;
     view.backgroundColor = [UIColor whiteColor];
     UIImageView *lineImage1 = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 1)];
     lineImage1.backgroundColor = Color_Line;
@@ -537,7 +538,7 @@
     return view;
 }
 - (CGFloat)tableView:(UITableView*)tableView heightForFooterInSection:(NSInteger)section {
-    return 6.0;
+    return _newsArray.count>0?6.0:0.00001;
 }
 - (nullable UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section {
     UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, MainScreenWidth, 6)];
@@ -150,7 +150,7 @@
     relatedWebView.tag = 1000;
     [backgroundView addSubview:relatedWebView];
  
-    NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><font style=\"font-size:20px;\"><strong>%@</strong></font><br><p>%@</p><p>来源：%@</p><body>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"liveStartDateTime"], @"国新网"];
+    NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><font style=\"font-size:20px;\"><strong>%@</strong></font><br><p>%@</p><p>%@：%@</p><body>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"liveStartDateTime"], CustomStr(@"Source"), @"国新网"];
     NSString* htmlFooter = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\">%@</div></body></html>",[_dictionary objectForKey:@"Description"]];
  
     NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter];
@@ -569,4 +569,8 @@
     return UIInterfaceOrientationMaskAllButUpsideDown;
 }
  
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleDefault;
+}
+
 @end
@@ -243,7 +243,7 @@
     relatedWebView.tag = 1000;
     [backgroundView addSubview:relatedWebView];
  
-    NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><font style=\"font-size:20px;\"><strong>%@</strong></font><br><p>%@</p><p>来源：%@</p><body>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"createDate"], [_dictionary objectForKey:@"author"]];
+    NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><font style=\"font-size:20px;\"><strong>%@</strong></font><br><p>%@</p><p>%@：%@</p><body>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"createDate"], CustomStr(@"Source"), [_dictionary objectForKey:@"author"]];
     NSString* htmlFooter = [[NSString alloc] initWithFormat:@"<div class=\"logo\" style=\"text-indent:2em\">%@</div></body></html>",[_dictionary objectForKey:@"desc"]];
  
     NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlHeader,htmlFooter];
@@ -481,4 +481,8 @@
  
 }
  
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleLightContent;
+}
+
 @end
@@ -27,7 +27,7 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
 - (void)loadData{
     NSString *url = @"http://app.phonemovie.cnlive.com/gxb/api/cataloglatest";
     NSLog(@"%@",url);
-    NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"wz/fbhgg/\",\"page\":\"%ld\",\"pageSize\":\"%@\",\"lang\":\"%@\"}",(long)self.pageNo,@"15", IS_CHINESE?@"cn":@"en"];
+    NSString *josnParameters = [NSString stringWithFormat:@"{\"plat\":\"i\",\"version\":\"5.0\",\"appid\":\"gxb\",\"categoryId\":\"%@\",\"page\":\"%ld\",\"pageSize\":\"%@\",\"lang\":\"%@\"}",IS_CHINESE?@"wz/fbhgg/":@"wz/notice/",(long)self.pageNo,@"15", IS_CHINESE?@"cn":@"en"];
     NSLog(@"%@",josnParameters);
     NSDictionary *parameters = @{@"params":josnParameters};
  
@@ -250,4 +250,8 @@ static NSString *myAnnouncementsTableViewCell = @&quot;CNMyAnnouncementsTableViewCell
     return _data;
 }
  
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleLightContent;
+}
+
 @end
@@ -93,4 +93,8 @@
     return _segmentControl;
 }
  
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleLightContent;
+}
+
 @end