iOS Team / ScioLive · Commits

Commit 2f5fac8737fbf679b80edd1e409b40e3e627a439

Authored by iOS-Xiaowen
1 parent d6932980

no message

Inline Side-by-side
Showing 3 changed files with 21 additions and 12 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
  View file @2f5fac8
@@ -3598,9 +3598,9 @@ @@ -3598,9 +3598,9 @@
3598 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 3598 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
3599 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 3599 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
3600 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3600 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3601 - CODE_SIGN_IDENTITY = "Apple Development";  
3602 - CODE_SIGN_STYLE = Automatic;  
3603 - CURRENT_PROJECT_VERSION = 381; 3601 + CODE_SIGN_IDENTITY = "iPhone Distribution";
  3602 + CODE_SIGN_STYLE = Manual;
  3603 + CURRENT_PROJECT_VERSION = 383;
3604 DEVELOPMENT_TEAM = 94X49GG3ZW; 3604 DEVELOPMENT_TEAM = 94X49GG3ZW;
3605 ENABLE_BITCODE = NO; 3605 ENABLE_BITCODE = NO;
3606 FRAMEWORK_SEARCH_PATHS = ( 3606 FRAMEWORK_SEARCH_PATHS = (
@@ -3635,10 +3635,10 @@ @@ -3635,10 +3635,10 @@
3635 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK", 3635 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3636 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK", 3636 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3637 ); 3637 );
3638 - MARKETING_VERSION = 3.6.1; 3638 + MARKETING_VERSION = 3.6.2;
3639 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3639 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3640 PRODUCT_NAME = "$(TARGET_NAME)"; 3640 PRODUCT_NAME = "$(TARGET_NAME)";
3641 - PROVISIONING_PROFILE_SPECIFIER = ""; 3641 + PROVISIONING_PROFILE_SPECIFIER = SCIOLiveDis_AppStore;
3642 TARGETED_DEVICE_FAMILY = 1; 3642 TARGETED_DEVICE_FAMILY = 1;
3643 VALID_ARCHS = "arm64 arm64e armv7s"; 3643 VALID_ARCHS = "arm64 arm64e armv7s";
3644 }; 3644 };
@@ -3651,9 +3651,9 @@ @@ -3651,9 +3651,9 @@
3651 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; 3651 ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
3652 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; 3652 ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
3653 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements; 3653 CODE_SIGN_ENTITLEMENTS = CNLiveScioLive/CNLiveScioLive.entitlements;
3654 - CODE_SIGN_IDENTITY = "Apple Development";  
3655 - CODE_SIGN_STYLE = Automatic;  
3656 - CURRENT_PROJECT_VERSION = 381; 3654 + CODE_SIGN_IDENTITY = "iPhone Distribution";
  3655 + CODE_SIGN_STYLE = Manual;
  3656 + CURRENT_PROJECT_VERSION = 383;
3657 DEVELOPMENT_TEAM = 94X49GG3ZW; 3657 DEVELOPMENT_TEAM = 94X49GG3ZW;
3658 ENABLE_BITCODE = NO; 3658 ENABLE_BITCODE = NO;
3659 FRAMEWORK_SEARCH_PATHS = ( 3659 FRAMEWORK_SEARCH_PATHS = (
@@ -3688,10 +3688,10 @@ @@ -3688,10 +3688,10 @@
3688 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK", 3688 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/SinaWeiboSDK",
3689 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK", 3689 "$(PROJECT_DIR)/CNLiveScioLive/Pages/SDK/ShareSDK/ShareSDK/Support/PlatformSDK/WeChatSDK",
3690 ); 3690 );
3691 - MARKETING_VERSION = 3.6.1; 3691 + MARKETING_VERSION = 3.6.2;
3692 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1; 3692 PRODUCT_BUNDLE_IDENTIFIER = cn.gov.scio.live1;
3693 PRODUCT_NAME = "$(TARGET_NAME)"; 3693 PRODUCT_NAME = "$(TARGET_NAME)";
3694 - PROVISIONING_PROFILE_SPECIFIER = ""; 3694 + PROVISIONING_PROFILE_SPECIFIER = SCIOLiveDis_AppStore;
3695 TARGETED_DEVICE_FAMILY = 1; 3695 TARGETED_DEVICE_FAMILY = 1;
3696 VALID_ARCHS = "arm64 arm64e armv7s"; 3696 VALID_ARCHS = "arm64 arm64e armv7s";
3697 }; 3697 };
CNLiveScioLive/AppDelegate.m
  View file @2f5fac8
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 [[UITabBar appearance] setTranslucent:NO]; 29 [[UITabBar appearance] setTranslucent:NO];
30 30
31 #pragma mark - 打包注意 31 #pragma mark - 打包注意
32 -// [AvoidCrash makeAllEffective]; 32 + [AvoidCrash makeAllEffective];
33 self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; 33 self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
34 self.window.backgroundColor = [UIColor whiteColor]; 34 self.window.backgroundColor = [UIColor whiteColor];
35 35
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
  View file @2f5fac8
@@ -51,6 +51,15 @@ @@ -51,6 +51,15 @@
51 "<head> \n" 51 "<head> \n"
52 "<meta charset=\"utf-8\"></meta>" 52 "<meta charset=\"utf-8\"></meta>"
53 "<style type=\"text/css\"> \n" 53 "<style type=\"text/css\"> \n"
  54 + ".justify \n"
  55 + "{ \n"
  56 + "text-align: justify; \n"
  57 + "} \n"
  58 + ".justify > span \n"
  59 + "{ \n"
  60 + "display: inline-block; \n"
  61 + "padding-left: 100%; \n"
  62 + "}\n"
54 "</style> \n" 63 "</style> \n"
55 "</head> \n" 64 "</head> \n"
56 "<body>" 65 "<body>"
@@ -63,7 +72,7 @@ @@ -63,7 +72,7 @@
63 "}\n" 72 "}\n"
64 "}" 73 "}"
65 "</script>\n" 74 "</script>\n"
66 - "<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>" 75 + "<div id=\"webview_content\" class=\"justify\"><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>"
67 "</body>" 76 "</body>"
68 "</html>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"createDate"],[NSString stringWithFormat:@"%@:%@",CustomStr(@"Source"), author?author:@"国新网"],fontArray[fontIndex],content]; 77 "</html>",[_dictionary objectForKey:@"title"],[_dictionary objectForKey:@"createDate"],[NSString stringWithFormat:@"%@:%@",CustomStr(@"Source"), author?author:@"国新网"],fontArray[fontIndex],content];
69 // NSString * htmlcontent = [NSString stringWithFormat:@"<div id=\"webview_content_wrapper\">%@<font style=\"font-size:%@px;\">%@</font></div>",htmlHeader,fontArray[fontIndex],content]; 78 // NSString * htmlcontent = [NSString stringWithFormat:@"<div id=\"webview_content_wrapper\">%@<font style=\"font-size:%@px;\">%@</font></div>",htmlHeader,fontArray[fontIndex],content];