fix bug

PublicFund.xcodeproj/project.pbxproj

@@ -273,6 +273,7 @@
 		708EE81F215A2AA100069F8A /* PFActivityLaunchModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 708EE81E215A2AA100069F8A /* PFActivityLaunchModel.m */; };
 		7091413C214280F700FAEC39 /* PFInsuranceWaterDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7091413B214280F700FAEC39 /* PFInsuranceWaterDetailModel.m */; };
 		709BE58E20EB184400C59804 /* PFNewService1ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 709BE58D20EB184400C59804 /* PFNewService1ViewController.m */; };
+		709F0FC721706D68007F5E4B /* KXGetHeightTool.m in Sources */ = {isa = PBXBuildFile; fileRef = 709F0FC521706D68007F5E4B /* KXGetHeightTool.m */; };
 		70A218E5211AC8C700DD124D /* PFDetailLoanView.m in Sources */ = {isa = PBXBuildFile; fileRef = 70A218E4211AC8C700DD124D /* PFDetailLoanView.m */; };
 		70A218E8211AD90300DD124D /* PFFundLoanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 70A218E7211AD90300DD124D /* PFFundLoanViewController.m */; };
 		70A218EB211AF52400DD124D /* PFSettingCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 70A218EA211AF52400DD124D /* PFSettingCell.m */; };
@@ -908,6 +909,8 @@
 		7091413B214280F700FAEC39 /* PFInsuranceWaterDetailModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PFInsuranceWaterDetailModel.m; sourceTree = "<group>"; };
 		709BE58C20EB184400C59804 /* PFNewService1ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFNewService1ViewController.h; sourceTree = "<group>"; };
 		709BE58D20EB184400C59804 /* PFNewService1ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PFNewService1ViewController.m; sourceTree = "<group>"; };
+		709F0FC521706D68007F5E4B /* KXGetHeightTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KXGetHeightTool.m; sourceTree = "<group>"; };
+		709F0FC621706D68007F5E4B /* KXGetHeightTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KXGetHeightTool.h; sourceTree = "<group>"; };
 		70A218E3211AC8C700DD124D /* PFDetailLoanView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFDetailLoanView.h; sourceTree = "<group>"; };
 		70A218E4211AC8C700DD124D /* PFDetailLoanView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PFDetailLoanView.m; sourceTree = "<group>"; };
 		70A218E6211AD90300DD124D /* PFFundLoanViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PFFundLoanViewController.h; sourceTree = "<group>"; };
@@ -2329,6 +2332,8 @@
 				7082C8752074C0CB00CE263F /* PFTime.m */,
 				7029C3FC20A96363005E9AAB /* KXTime.h */,
 				7029C3FB20A96363005E9AAB /* KXTime.m */,
+				709F0FC621706D68007F5E4B /* KXGetHeightTool.h */,
+				709F0FC521706D68007F5E4B /* KXGetHeightTool.m */,
 			);
 			path = Tools;
 			sourceTree = "<group>";
@@ -3028,6 +3033,7 @@
 				70CE762120E35CC200FA7926 /* PFAssetModel.m in Sources */,
 				7082C92C2074C0CC00CE263F /* PFCustomServiceViewController.m in Sources */,
 				700A254720D8FF650091B382 /* KXEventTopViewModel.m in Sources */,
+				709F0FC721706D68007F5E4B /* KXGetHeightTool.m in Sources */,
 				70CDCD0F212EC60B00F5A0EA /* UICountingLabel.m in Sources */,
 				706777F021196D0000B4E6A5 /* KXKBTopPageControl.m in Sources */,
 				7015FA3E20F7356B005FEA58 /* KXLaunchAdConfiguration.m in Sources */,
@@ -3468,6 +3474,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/PublicFund/Third/SDK",
+					"$(PROJECT_DIR)/PublicFund",
 				);
 				MiSDKRun = debug;
 				PRODUCT_BUNDLE_IDENTIFIER = com.gongji.scc;
@@ -3496,6 +3503,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/PublicFund/Third/SDK",
+					"$(PROJECT_DIR)/PublicFund",
 				);
 				MiSDKRun = online;
 				PRODUCT_BUNDLE_IDENTIFIER = com.gongji.scc;

PublicFund.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict/>
+</plist>

PublicFund/Main/社保/PFInsuranceDetailViewController.m

@@ -113,6 +113,9 @@
 
 - (void)requestDetail {
     [MBProgressHUD showLoadingAddedToView:self.headerView];
+    if (self.type == PFInsuranceDetailRequestTypeRequest) {
+        [NSThread sleepForTimeInterval:5];
+    }
     NSString *urlString = [NSString stringWithFormat:@"%@/security/getInsuranceCount",Url];
     NSDictionary *params = @{@"tid":self.tidString};
     [PFHTTP get:urlString params:params success:^(id json) {

PublicFund/Mine/controller/PFWebLinkViewController.m

@@ -114,14 +114,10 @@
                             tid = [tidArray lastObject];
                         }
                     }
-                    [MBProgressHUD showLoadingAddedToView:webView];
-                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                        [MBProgressHUD hideHUDForView:webView];
-                        PFInsuranceDetailViewController *detail = [[PFInsuranceDetailViewController alloc] init];
-                        detail.type = PFInsuranceDetailRequestTypeRequest;
-                        detail.tidString = tid;
-                        [self.navigationController pushViewController:detail animated:YES];
-                    });
+                    PFInsuranceDetailViewController *detail = [[PFInsuranceDetailViewController alloc] init];
+                    detail.type = PFInsuranceDetailRequestTypeRequest;
+                    detail.tidString = tid;
+                    [self.navigationController pushViewController:detail animated:YES];
                 }
                 else {
                     [self.navigationController popViewControllerAnimated:YES];

PublicFund/PrefixHeader.pch

@@ -57,10 +57,10 @@
 //https://api.security.726p.com //old
 //https://apisearch.726p.com //new
 
-#define Url @"http://apisearch80.726p.com/api"
+#define Url @"https://apisearch.726p.com/api"
 
-#define CityUrl @"http://apisearch80.726p.com/gongjijin"
+#define CityUrl @"https://apisearch.726p.com/gongjijin"
 
-static NSString * const URL = @"http://apisearch80.726p.com/user";
+static NSString * const URL = @"https://apisearch.726p.com/user";
 
 #endif /* PrefixHeader_pch */

PublicFund/Tools/KXGetHeightTool.h

@@ -0,0 +1,46 @@
+//
+//  KXGetHeightTool.h
+//  CAISHEN
+//
+//  Created by admin on 2018/10/11.
+//  Copyright © 2018 kuxuan. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KXGetHeightTool : NSObject
+
+/**
+ *  安全区域
+ *
+ *  @return 0 或 34(iPhone X)
+ */
++ (CGFloat)getSafeBottom;
+
+/**
+ *  tabbar 高度
+ *
+ *  @return 49 + 安全区域
+ */
++ (CGFloat)gettabbarHeight;
+
+/**
+ *  statusBar 高度
+ *
+ *  @return 20 或 44(iPhone X)
+ */
++ (CGFloat)getStatusBarHeight;
+
+/**
+ *  navigationBar 高度
+ *
+ *  @return 64 或 88(iPhone X)
+ */
++ (CGFloat)getNavigationBarHeight;
+
+
+@end
+
+NS_ASSUME_NONNULL_END

PublicFund/Tools/KXGetHeightTool.m

@@ -0,0 +1,54 @@
+//
+//  KXGetHeightTool.m
+//  CAISHEN
+//
+//  Created by admin on 2018/10/11.
+//  Copyright © 2018 kuxuan. All rights reserved.
+//
+
+#import "KXGetHeightTool.h"
+
+@implementation KXGetHeightTool
+
+/**
+ *  键盘安全区域
+ *
+ *  @return 34
+ */
++ (CGFloat)getSafeBottom{
+    if (@available(iOS 11.0, *)) {
+        return [UIApplication sharedApplication].keyWindow.safeAreaInsets.bottom;
+    } else {
+        return 0;
+    }
+}
+
+/**
+ *  tabbar 高度
+ *
+ *  @return 49 + 安全区域
+ */
++ (CGFloat)gettabbarHeight{
+    return 49 + [self getSafeBottom];
+}
+
+/**
+ *  statusBar 高度
+ *
+ *  @return 20 或 44(iPhone X)
+ */
++ (CGFloat)getStatusBarHeight{
+    return [[UIApplication sharedApplication] statusBarFrame].size.height;
+}
+
+/**
+ *  navigationBar 高度
+ *
+ *  @return 64 或 88(iPhone X)
+ */
++ (CGFloat)getNavigationBarHeight{
+    return 44 + [self getStatusBarHeight];
+}
+
+
+@end