修复apex mobile privacy policy 字体过大的问题。

Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj

@@ -12,6 +12,8 @@
 		3C1DEC3D239F6C42006F7E2A /* MKMapView+ZoomLevel.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C1DEC3B239F6C42006F7E2A /* MKMapView+ZoomLevel.m */; };
 		3C2D99A2239B92F1007B759E /* ApexMapView.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2D99A0239B92F1007B759E /* ApexMapView.m */; };
 		3C2D99A5239B93C8007B759E /* AMViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C2D99A4239B93C8007B759E /* AMViewController.m */; };
+		3C57169D23D186A30002E9FC /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C57169A23D186A30002E9FC /* WebViewController.m */; };
+		3C57169E23D186A30002E9FC /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3C57169B23D186A30002E9FC /* wkweb.storyboard */; };
 		3CA1A2DE23A212E700639FCC /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CA1A2DD23A212E700639FCC /* Launch Screen.storyboard */; };
 		420DEF2620A1898500720524 /* AMCommHeadCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 420DEF2420A1898500720524 /* AMCommHeadCell.m */; };
 		420DEF2720A1898500720524 /* AMCommHeadCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 420DEF2520A1898500720524 /* AMCommHeadCell.xib */; };
@@ -219,6 +221,9 @@
 		3C2D99A1239B92F1007B759E /* ApexMapView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ApexMapView.h; path = ../../common/ApexMap/ApexMapView.h; sourceTree = "<group>"; };
 		3C2D99A3239B93C8007B759E /* AMViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AMViewController.h; sourceTree = "<group>"; };
 		3C2D99A4239B93C8007B759E /* AMViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AMViewController.m; sourceTree = "<group>"; };
+		3C57169A23D186A30002E9FC /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "../../common/WK PDF+Web/WebViewController.m"; sourceTree = "<group>"; };
+		3C57169B23D186A30002E9FC /* wkweb.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = wkweb.storyboard; path = "../../common/WK PDF+Web/wkweb.storyboard"; sourceTree = "<group>"; };
+		3C57169C23D186A30002E9FC /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "../../common/WK PDF+Web/WebViewController.h"; sourceTree = "<group>"; };
 		3CA1A2DD23A212E700639FCC /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		420DEF2320A1898500720524 /* AMCommHeadCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AMCommHeadCell.h; sourceTree = "<group>"; };
 		420DEF2420A1898500720524 /* AMCommHeadCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AMCommHeadCell.m; sourceTree = "<group>"; };
@@ -1190,6 +1195,9 @@
 		719E7E2D18C01555003408FF /* utils */ = {
 			isa = PBXGroup;
 			children = (
+				3C57169C23D186A30002E9FC /* WebViewController.h */,
+				3C57169A23D186A30002E9FC /* WebViewController.m */,
+				3C57169B23D186A30002E9FC /* wkweb.storyboard */,
 				3C0F4E9523BAF594000A2FE7 /* FileCache.h */,
 				3C0F4E9623BAF594000A2FE7 /* FileCache.m */,
 				719E7E3118C0368A003408FF /* ApexMobileDB.h */,
@@ -1471,6 +1479,7 @@
 				42E8212F21F6ED1800127705 /* ApexResultAdditionView.xib in Resources */,
 				420DEF2720A1898500720524 /* AMCommHeadCell.xib in Resources */,
 				42BB740B2084737800B9B6E4 /* KPILegendCell.xib in Resources */,
+				3C57169E23D186A30002E9FC /* wkweb.storyboard in Resources */,
 				425390262079B9B500ECF982 /* KPI.json in Resources */,
 				715643DA201C079F00B04267 /* tools.json in Resources */,
 				715643D5201AD2AB00B04267 /* StaticModelistViewController.xib in Resources */,
@@ -1632,6 +1641,7 @@
 				719A51A918C5A5D30080C075 /* SimpleGridDataSource.m in Sources */,
 				718BE8B3190F9D970046EA6A /* MyAutocompletionCellFactory.m in Sources */,
 				425390232079B99B00ECF982 /* XYPieChartView.m in Sources */,
+				3C57169D23D186A30002E9FC /* WebViewController.m in Sources */,
 				71570999202157BD00EFE5C5 /* RANetworkTaskDelegate.m in Sources */,
 				71A565DF18C212EA00CDAC07 /* Constant.m in Sources */,
 				4225E43D21E08ACE009D2364 /* ApexResultContainerModel.m in Sources */,

Apex Mobile/Apex Mobile/LoginViewController.m

@@ -8,7 +8,7 @@
 
 #import "LoginViewController.h"
 #import "RetrievePasswordViewController.h"
-#import "NewsDetailViewController.h"
+#import "WebViewController.h"
 #import "config.h"
 @interface LoginViewController ()
 @property (strong, nonatomic) IBOutlet UILabel *verLabel;
@@ -36,9 +36,10 @@
     
     NSString* title = @"Privacy Policy";
     
-    NewsDetailViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"NewsDetailViewController"];
+    WebViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
     viewcontroller.title = title;
     viewcontroller.url = url;
+    viewcontroller.defaultBarbutton=true;
     [self.navigationController pushViewController:viewcontroller animated:YES];
 }
 

common/WK PDF+Web/WebViewController.h

@@ -24,7 +24,7 @@
 @property (nonatomic , copy) void (^onLoadSuccess)(NSString* url );
 
 
-
+@property (nonatomic,assign) BOOL defaultBarbutton;///<是否使用系统barbutton
 
 
 

common/WK PDF+Web/WebViewController.m

@@ -43,14 +43,20 @@
 //    self.wkWebview datade
     
     
-    UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
-                                                                    style:UIBarButtonItemStylePlain
-                                                                   target:self
-                                                                   action:@selector( onBackClick:)];
-    //[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onCloseClick:)];
-    //    closeButton.title = @"Close";
- //   closeButton.tintColor = UIColorFromRGB(0x996633);
-    self.navigationItem.leftBarButtonItem = closeButton;
+    if(!_defaultBarbutton)
+    {
+           UIBarButtonItem *closeButton = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"back"] imageWithRenderingMode:UIImageRenderingModeAutomatic]
+                                                                           style:UIBarButtonItemStylePlain
+                                                                          target:self
+                                                                          action:@selector( onBackClick:)];
+           //[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", nil) style:UIBarButtonItemStylePlain target:self action:@selector(onCloseClick:)];
+           //    closeButton.title = @"Close";
+        //   closeButton.tintColor = UIColorFromRGB(0x996633);
+           self.navigationItem.leftBarButtonItem = closeButton;
+        
+    }
+    
+
     
     
  
@@ -68,11 +74,20 @@
     [self loadcontent];
 }
 - (void)onBackClick:(UIButton *)sender {
-    
+    /*
     if (self.backItemDismiss)
         [self.navigationController dismissViewControllerAnimated:YES completion:nil];
     
-    [self.navigationController popViewControllerAnimated:FALSE];
+    [self.navigationController popViewControllerAnimated:FALSE];*/
+    
+    //如果以下关闭有问题则回滚上面注释代码
+    
+    if (self.presentingViewController) {
+        [self dismissViewControllerAnimated:YES completion:nil];
+    } else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+    
 }
 -(void)ReloadData
 {