备份

ios/JianYuIOS/JianYuIOS.xcodeproj/project.pbxproj

@@ -27,6 +27,10 @@
 		188037212193EB25006F9D7B /* JYExpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1880371C2193EB25006F9D7B /* JYExpViewController.m */; };
 		188A144723273CAD00D39E7E /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 188A144623273CAD00D39E7E /* UserNotifications.framework */; };
 		188A144923273CB400D39E7E /* UserNotificationsUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 188A144823273CB300D39E7E /* UserNotificationsUI.framework */; };
+		188BB1142489D11300494F58 /* JYNewSearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 188BB1132489D11300494F58 /* JYNewSearchViewController.m */; };
+		188BB1172489D12000494F58 /* JYNewSubViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 188BB1162489D12000494F58 /* JYNewSubViewController.m */; };
+		188BB11A2489D12F00494F58 /* JYNewExpViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 188BB1192489D12F00494F58 /* JYNewExpViewController.m */; };
+		188BB11D2489D14800494F58 /* JYNewMineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 188BB11C2489D14800494F58 /* JYNewMineViewController.m */; };
 		189970EC244441740058C0B1 /* ZKPrivacyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 189970EB244441740058C0B1 /* ZKPrivacyView.m */; };
 		18C9D8E7219A5F9F001AC829 /* UITabBar+badge.m in Sources */ = {isa = PBXBuildFile; fileRef = 18C9D8E6219A5F9F001AC829 /* UITabBar+badge.m */; };
 		18E05CF922F11CDE001E5B44 /* README.txt in Resources */ = {isa = PBXBuildFile; fileRef = 18E05CF322F11CDD001E5B44 /* README.txt */; };
@@ -124,6 +128,14 @@
 		1880371D2193EB25006F9D7B /* JYSearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JYSearchViewController.h; sourceTree = "<group>"; };
 		188A144623273CAD00D39E7E /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
 		188A144823273CB300D39E7E /* UserNotificationsUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotificationsUI.framework; path = System/Library/Frameworks/UserNotificationsUI.framework; sourceTree = SDKROOT; };
+		188BB1122489D11300494F58 /* JYNewSearchViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JYNewSearchViewController.h; sourceTree = "<group>"; };
+		188BB1132489D11300494F58 /* JYNewSearchViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JYNewSearchViewController.m; sourceTree = "<group>"; };
+		188BB1152489D12000494F58 /* JYNewSubViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JYNewSubViewController.h; sourceTree = "<group>"; };
+		188BB1162489D12000494F58 /* JYNewSubViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JYNewSubViewController.m; sourceTree = "<group>"; };
+		188BB1182489D12F00494F58 /* JYNewExpViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JYNewExpViewController.h; sourceTree = "<group>"; };
+		188BB1192489D12F00494F58 /* JYNewExpViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JYNewExpViewController.m; sourceTree = "<group>"; };
+		188BB11B2489D14800494F58 /* JYNewMineViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JYNewMineViewController.h; sourceTree = "<group>"; };
+		188BB11C2489D14800494F58 /* JYNewMineViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JYNewMineViewController.m; sourceTree = "<group>"; };
 		189970EA244441740058C0B1 /* ZKPrivacyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ZKPrivacyView.h; sourceTree = "<group>"; };
 		189970EB244441740058C0B1 /* ZKPrivacyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ZKPrivacyView.m; sourceTree = "<group>"; };
 		18B2DF4021ACDA5D00B5C93F /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
@@ -175,7 +187,7 @@
 		C55FF3BD20230E7E0088AECC /* NewWebController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NewWebController.m; sourceTree = "<group>"; };
 		C55FF3BE20230E7E0088AECC /* NewWebController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NewWebController.xib; sourceTree = "<group>"; };
 		C5B194D3202EA46C00F0AC76 /* arrowLeft@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "arrowLeft@2x.png"; sourceTree = "<group>"; };
-		C5BE6E372011D99100F28B36 /* JianYuIOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = JianYuIOS.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		C5BE6E372011D99100F28B36 /* 剑鱼标讯.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "剑鱼标讯.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		C5BE6E3D2011D99100F28B36 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
 		C5BE6E412011D99100F28B36 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		C5BE6E432011D99100F28B36 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -263,6 +275,14 @@
 				1880371C2193EB25006F9D7B /* JYExpViewController.m */,
 				188037182193EB25006F9D7B /* JYMineViewController.h */,
 				188037172193EB25006F9D7B /* JYMineViewController.m */,
+				188BB1122489D11300494F58 /* JYNewSearchViewController.h */,
+				188BB1132489D11300494F58 /* JYNewSearchViewController.m */,
+				188BB1152489D12000494F58 /* JYNewSubViewController.h */,
+				188BB1162489D12000494F58 /* JYNewSubViewController.m */,
+				188BB1182489D12F00494F58 /* JYNewExpViewController.h */,
+				188BB1192489D12F00494F58 /* JYNewExpViewController.m */,
+				188BB11B2489D14800494F58 /* JYNewMineViewController.h */,
+				188BB11C2489D14800494F58 /* JYNewMineViewController.m */,
 				187B4EE121EC356100A9368D /* UIView+Extension.h */,
 				187B4EE221EC356100A9368D /* UIView+Extension.m */,
 			);
@@ -398,7 +418,7 @@
 		C5BE6E382011D99100F28B36 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				C5BE6E372011D99100F28B36 /* JianYuIOS.app */,
+				C5BE6E372011D99100F28B36 /* 剑鱼标讯.app */,
 				C5BE6E4F2011D99100F28B36 /* JianYuIOSTests.xctest */,
 				C5BE6E5A2011D99100F28B36 /* JianYuIOSUITests.xctest */,
 			);
@@ -474,7 +494,7 @@
 			);
 			name = JianYuIOS;
 			productName = JianYuIOS;
-			productReference = C5BE6E372011D99100F28B36 /* JianYuIOS.app */;
+			productReference = C5BE6E372011D99100F28B36 /* 剑鱼标讯.app */;
 			productType = "com.apple.product-type.application";
 		};
 		C5BE6E4E2011D99100F28B36 /* JianYuIOSTests */ = {
@@ -661,6 +681,9 @@
 				189970EC244441740058C0B1 /* ZKPrivacyView.m in Sources */,
 				C519972F2020238D007946E8 /* LXDataBaseManager.m in Sources */,
 				187B4EE321EC356100A9368D /* UIView+Extension.m in Sources */,
+				188BB11D2489D14800494F58 /* JYNewMineViewController.m in Sources */,
+				188BB11A2489D12F00494F58 /* JYNewExpViewController.m in Sources */,
+				188BB1172489D12000494F58 /* JYNewSubViewController.m in Sources */,
 				184EC6662435C45C00CA89F0 /* ZKMethod.m in Sources */,
 				C550BEFA20180AF000F0BC2A /* main.m in Sources */,
 				188036FC2193EA09006F9D7B /* JYTabBarController.m in Sources */,
@@ -669,6 +692,7 @@
 				C5321C76202BD89B0023CFEA /* LXProgressView.m in Sources */,
 				C519972C2020238D007946E8 /* LXUserDefaults.m in Sources */,
 				181F894A2472305B00CD0019 /* NJKWebViewProgress.m in Sources */,
+				188BB1142489D11300494F58 /* JYNewSearchViewController.m in Sources */,
 				C5FE4B5720468BC900CC8A2F /* NoNetView.m in Sources */,
 				C519972E2020238D007946E8 /* LXViewControllerManager.m in Sources */,
 				188037202193EB25006F9D7B /* JYSubViewController.m in Sources */,
@@ -913,7 +937,7 @@
 					"-all_load",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.topnet.jianyuiOS;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "剑鱼标讯";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -997,7 +1021,7 @@
 					"-all_load",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.topnet.jianyuiOS;
-				PRODUCT_NAME = "$(TARGET_NAME)";
+				PRODUCT_NAME = "剑鱼标讯";
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";

ios/JianYuIOS/JianYuIOS.xcodeproj/xcuserdata/apple.xcuserdatad/xcschemes/JianYuIOS.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "C5BE6E362011D99100F28B36"
-               BuildableName = "JianYuIOS.app"
+               BuildableName = "&#x5251;&#x9c7c;&#x6807;&#x8baf;Web.app"
                BlueprintName = "JianYuIOS"
                ReferencedContainer = "container:JianYuIOS.xcodeproj">
             </BuildableReference>
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C5BE6E362011D99100F28B36"
+            BuildableName = "&#x5251;&#x9c7c;&#x6807;&#x8baf;Web.app"
+            BlueprintName = "JianYuIOS"
+            ReferencedContainer = "container:JianYuIOS.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -49,17 +58,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "C5BE6E362011D99100F28B36"
-            BuildableName = "JianYuIOS.app"
-            BlueprintName = "JianYuIOS"
-            ReferencedContainer = "container:JianYuIOS.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -76,7 +74,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C5BE6E362011D99100F28B36"
-            BuildableName = "JianYuIOS.app"
+            BuildableName = "&#x5251;&#x9c7c;&#x6807;&#x8baf;Web.app"
             BlueprintName = "JianYuIOS"
             ReferencedContainer = "container:JianYuIOS.xcodeproj">
          </BuildableReference>
@@ -88,8 +86,6 @@
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
@@ -102,7 +98,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "C5BE6E362011D99100F28B36"
-            BuildableName = "JianYuIOS.app"
+            BuildableName = "&#x5251;&#x9c7c;&#x6807;&#x8baf;Web.app"
             BlueprintName = "JianYuIOS"
             ReferencedContainer = "container:JianYuIOS.xcodeproj">
          </BuildableReference>

ios/JianYuIOS/JianYuIOS/AppDelegate.m

@@ -57,7 +57,6 @@
     [self initJPush:launchOptions];
     [self initUM];
     [self registeredPush]; //注册原生推送
-    
 
     if (launchOptions) {
         self.wakeUpBool = YES;//唤醒启动

ios/JianYuIOS/JianYuIOS/BaseClass1/LXNetworkManager.m

@@ -30,7 +30,7 @@ progress:(void (^)(NSProgress * progress))upProgress
     AFHTTPSessionManager * manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
     [manager.requestSerializer willChangeValueForKey:@"timeoutInterval"];
-    manager.requestSerializer.timeoutInterval=30.0;
+    manager.requestSerializer.timeoutInterval=15.0;
     [manager.requestSerializer didChangeValueForKey:@"timeoutInterval"];
     
     manager.responseSerializer.acceptableContentTypes = [NSSet setWithObjects:@"text/html", @"application/json",@"image/png",@"application/pdf",@"image/jpeg", @"application/octet-stream",@"text/json", nil];

ios/JianYuIOS/JianYuIOS/BaseClass1/PrefixHeader.pch

@@ -157,7 +157,7 @@ _Pragma("clang diagnostic pop")\
 //#define kHost @"https://app-jytest.jianyu360.cn/" //老测试
 
 //#define kHost @"https://res.jianyu360.com/"//正式https
-//#define kHost @"http://res.jianyu360.com/"//正式http
+#define kHost @"http://res.jianyu360.com/"//正式http
 
 //#define kHost @"http://anti.jianyu360.cn/"//新测试
 
@@ -166,7 +166,7 @@ _Pragma("clang diagnostic pop")\
 //#define kHost @"https://app3-jytest.jianyu360.cn/" //app3测试
 
 
-#define kHost @"http://web-jydev-zyx.jianyu360.cn/"
+//#define kHost @"http://web-jydev-zyx.jianyu360.cn/"
 
 
 /*

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewExpViewController.h

@@ -0,0 +1,17 @@
+//
+//  JYNewExpViewController.h
+//  JianYuIOS
+//
+//  Created by apple on 2020/6/5.
+//  Copyright © 2020 lixianglan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface JYNewExpViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewExpViewController.m

@@ -0,0 +1,32 @@
+//
+//  JYNewExpViewController.m
+//  JianYuIOS
+//
+//  Created by apple on 2020/6/5.
+//  Copyright © 2020 lixianglan. All rights reserved.
+//
+
+#import "JYNewExpViewController.h"
+
+@interface JYNewExpViewController ()
+
+@end
+
+@implementation JYNewExpViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewMineViewController.h

@@ -0,0 +1,17 @@
+//
+//  JYNewMineViewController.h
+//  JianYuIOS
+//
+//  Created by apple on 2020/6/5.
+//  Copyright © 2020 lixianglan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface JYNewMineViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewMineViewController.m

@@ -0,0 +1,32 @@
+//
+//  JYNewMineViewController.m
+//  JianYuIOS
+//
+//  Created by apple on 2020/6/5.
+//  Copyright © 2020 lixianglan. All rights reserved.
+//
+
+#import "JYNewMineViewController.h"
+
+@interface JYNewMineViewController ()
+
+@end
+
+@implementation JYNewMineViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSearchViewController.h

@@ -0,0 +1,17 @@
+//
+//  JYNewSearchViewController.h
+//  JianYuIOS
+//
+//  Created by apple on 2020/6/5.
+//  Copyright © 2020 lixianglan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface JYNewSearchViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSearchViewController.m

@@ -0,0 +1,228 @@
+//
+//  JYNewSearchViewController.m
+//  JianYuIOS
+//
+//  Created by apple on 2020/6/5.
+//  Copyright © 2020 lixianglan. All rights reserved.
+//
+
+#import "JYNewSearchViewController.h"
+#import <WebKit/WebKit.h>
+#import "JYTabBarController.h"
+#import <CoreLocation/CoreLocation.h>
+
+@interface JYNewSearchViewController ()<WKNavigationDelegate,WKUIDelegate,WKScriptMessageHandler>
+
+@property (nonatomic, strong) UIProgressView *progressView;
+@property (nonatomic, strong) WKWebView *webView;
+@property (nonatomic, readonly) double estimatedProgress;//进度条
+
+@end
+
+@implementation JYNewSearchViewController
+
+-(void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    [self.navigationController setNavigationBarHidden:YES animated:animated];
+}
+//进度条
+- (UIProgressView *)progressView
+{
+    if (_progressView == nil) {
+        _progressView = [[UIProgressView alloc] initWithFrame:CGRectMake(0,STATUS_BAR_HEIGHT - 2,WIDTH,2)];
+        _progressView.tintColor = [UIColor blueColor];
+        _progressView.trackTintColor = [UIColor whiteColor];
+    }
+    return _progressView;
+}
+
+- (WKWebView *)webView
+{
+    if(_webView == nil) {
+        WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
+        config.preferences = [[WKPreferences alloc] init];
+        config.preferences.minimumFontSize = 0;
+        config.preferences.javaScriptEnabled = YES;
+        config.preferences.javaScriptCanOpenWindowsAutomatically = NO;
+        //创建UserContentController(提供javaScript向webView发送消息的方法)
+        WKUserContentController *userContent = [[WKUserContentController alloc] init];
+        //添加消息处理，注意：self指代的是需要遵守WKScriptMessageHandler协议，结束时需要移除
+
+        [userContent addScriptMessageHandler:self name:@"loginByWeixin"];
+
+        //将UserContentController设置到配置文件中
+        config.userContentController = userContent;
+        //高端的自定义配置创建WKWebView
+        if (iPhoneX) {
+            _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, 0, WIDTH, HEIGHT-TAB_BAR_HEIGHT) configuration:config];
+            if (@available(iOS 11.0, *)) {
+                _webView.scrollView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+            }
+        }else {
+            _webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, -STATUS_BAR_HEIGHT, WIDTH, HEIGHT-TAB_BAR_HEIGHT+STATUS_BAR_HEIGHT) configuration:config];
+        }
+        _webView.scrollView.bounces = NO;
+        _webView.UIDelegate = self;
+        _webView.navigationDelegate = self;
+        [_webView addObserver:self forKeyPath:@"estimatedProgress" options:NSKeyValueObservingOptionNew context:nil];
+    }
+    return _webView;
+}
+
+-(void)webViewFirstRequest
+{
+    NSString *url = [NSString stringWithFormat:@"%@%@", kHost, @"jyapp/free/index"];
+    NSString *token = [LXUserDefaults token];
+    if (token) {
+        url = [url stringByAppendingString:[NSString stringWithFormat:@"?sign=%@&url=/jyapp/jylab/mainSearch&from=restart", token]];
+    }
+    NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:url]];
+    [self.webView loadRequest:request];
+}
+
+#pragma mark - event response
+// 计算wkWebView进度条
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+    if (object == self.webView && [keyPath isEqualToString:@"estimatedProgress"]) {
+        CGFloat newprogress = [[change objectForKey:NSKeyValueChangeNewKey] doubleValue];
+        self.progressView.alpha = 1.0f;
+        [self.progressView setProgress:newprogress animated:YES];
+        if (newprogress >= 1.0f) {
+            [UIView animateWithDuration:0.3f
+                                  delay:0.3f
+                                options:UIViewAnimationOptionCurveEaseOut
+                             animations:^{
+                                 self.progressView.alpha = 0.0f;
+                             }
+                             completion:^(BOOL finished) {
+                                 [self.progressView setProgress:0 animated:NO];
+                             }];
+        }
+        
+    } else {
+        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+    }
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    NSLog(@"首页初始化");
+    self.view.backgroundColor = [UIColor whiteColor];
+    [self.view addSubview:self.webView];
+    [self.view addSubview:self.progressView];
+    [self webViewFirstRequest];//加载服务器url的方法
+}
+#pragma mark - WKNavigationDelegate
+/* 页面加载完成 */
+- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation{
+    NSLog(@"-----页面加载完成");
+}
+/* 页面开始加载 */
+- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation{
+
+}
+/* 开始返回内容 */
+- (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation{
+
+}
+/* 页面加载失败 */
+- (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation{
+    
+}
+
+
+#pragma mark *****JS与OC交互
+#pragma mark - WKScriptMessageHandler JS调OC交互
+- (void)userContentController:(WKUserContentController *)userContentController didReceiveScriptMessage:(WKScriptMessage *)message {
+    NSLog(@"原生收到了js发送过来的消息message.name = %@ message.body = %@",message.name,message.body);
+    if ([message.name isEqualToString:@"loginByWeixin"]) {
+       
+    }else if ([message.name isEqualToString:@"share"]) {
+       
+    }else if ([message.name isEqualToString:@"saveUserToken"]) {
+       
+    }else if ([message.name isEqualToString:@"getUserToken"]) {
+       
+    }else if ([message.name isEqualToString:@"removeUserToken"]) {
+       
+    }else if ([message.name isEqualToString:@"checkNoticePermission"]) {
+       
+    }else if ([message.name isEqualToString:@"openSystemNotification"]) {
+       
+    }else if ([message.name isEqualToString:@"getPushRid"]) {
+       
+    }else if ([message.name isEqualToString:@"lightStatusBar"]) {
+       
+    }else if ([message.name isEqualToString:@"openExternalLink"]) {
+       
+    }else if ([message.name isEqualToString:@"getVersion"]) {
+       
+    }else if ([message.name isEqualToString:@"alert"]) {
+       
+    }else if ([message.name isEqualToString:@"isInstallWeixin"]) {
+       
+    }else if ([message.name isEqualToString:@"changeMessageType"]) {
+       
+    }else if ([message.name isEqualToString:@"openActivityPage"]) {
+       
+    }else if ([message.name isEqualToString:@"getCipherText"]) {
+       
+    }else if ([message.name isEqualToString:@"business"]) {
+       
+    }else if ([message.name isEqualToString:@"hiddenBottom"]) {
+       
+    }else if ([message.name isEqualToString:@"checkLab"]) {
+       
+    }else if ([message.name isEqualToString:@"loginSuccess"]) {
+       
+    }else if ([message.name isEqualToString:@"backUrl"]) {
+       
+    }else if ([message.name isEqualToString:@"clearPushMessage"]) {
+       
+    }else if ([message.name isEqualToString:@"hideRedSpotOnMenu"]) {
+       
+    }else if ([message.name isEqualToString:@"showRedSpotOnMenu"]) {
+       
+    }else if ([message.name isEqualToString:@"wxPay"]) {
+       
+    }else if ([message.name isEqualToString:@"aliPay"]) {
+       
+    }else if ([message.name isEqualToString:@"getOtherPushRid"]) {
+       
+    }else if ([message.name isEqualToString:@"getPhoneBrand"]) {
+       
+    }else if ([message.name isEqualToString:@"getLocation"]) {
+       
+    }else if ([message.name isEqualToString:@"chooseTab"]) {
+       
+    }else if ([message.name isEqualToString:@"skipCamera"]) {
+       
+    }else if ([message.name isEqualToString:@"skipAlbum"]) {
+       
+    }else {
+        
+    }
+}
+
+#pragma mark - OC调JS交互
+-(void)ocCallToJS:(NSString *)jsStr{
+    [self.webView evaluateJavaScript:jsStr completionHandler:^(id _Nullable result, NSError * _Nullable error) {
+        NSLog(@"%@----%@",result, error);
+    }];
+}
+
+
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSubViewController.h

@@ -0,0 +1,17 @@
+//
+//  JYNewSubViewController.h
+//  JianYuIOS
+//
+//  Created by apple on 2020/6/5.
+//  Copyright © 2020 lixianglan. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface JYNewSubViewController : UIViewController
+
+@end
+
+NS_ASSUME_NONNULL_END

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYNewSubViewController.m

@@ -0,0 +1,32 @@
+//
+//  JYNewSubViewController.m
+//  JianYuIOS
+//
+//  Created by apple on 2020/6/5.
+//  Copyright © 2020 lixianglan. All rights reserved.
+//
+
+#import "JYNewSubViewController.h"
+
+@interface JYNewSubViewController ()
+
+@end
+
+@implementation JYNewSubViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

ios/JianYuIOS/JianYuIOS/Classes（模块）/JYSearchViewController.m

@@ -175,6 +175,8 @@ NSString *const AesKey_0 = @"mGlAgnIBB8bx2nch";
     
     [[LXViewControllerManager shareViewControllerManager] showHudText:nil];
     [self webViewFirstRequest];//请求页面数据
+    
+    
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(requestWebView:) name:kRequestWebViewWithUrl object:nil];
     //点击订阅通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(clickSubNotiMethods:) name:ClickSubNotiMethods object:nil];

ios/JianYuIOS/JianYuIOS/Info.plist

@@ -5,7 +5,7 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>zh_CN</string>
 	<key>CFBundleDisplayName</key>
-	<string>剑鱼标讯</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>

ios/JianYuIOS/JianYuIOS/JYTabBarController.m

@@ -12,6 +12,10 @@
 #import "JYSubViewController.h"
 #import "JYExpViewController.h"
 #import "JYMineViewController.h"
+#import "JYNewSearchViewController.h"
+#import "JYNewSubViewController.h"
+#import "JYNewExpViewController.h"
+#import "JYNewMineViewController.h"
 
 
 @interface JYTabBarController ()<UITabBarControllerDelegate>
@@ -21,6 +25,11 @@
 @property (nonatomic,strong)JYExpViewController *V3;
 @property (nonatomic,strong)JYMineViewController *V4;
 
+@property (nonatomic,strong)JYNewSearchViewController *VC1;
+@property (nonatomic,strong)JYNewSubViewController *VC2;
+@property (nonatomic,strong)JYNewExpViewController *VC3;
+@property (nonatomic,strong)JYNewMineViewController *VC4;
+
 
 @end
 
@@ -96,8 +105,11 @@
 #pragma mark - -----------------------------------------
 - (void)setUpAllChildVc
 {
-    self.V1 = [[JYSearchViewController alloc] init];
-    [self setUpOneChildVcWithVc:self.V1 Image:@"one_1" selectedImage:@"one" title:@"首页" tag:0];
+//    self.V1 = [[JYSearchViewController alloc] init];
+//    [self setUpOneChildVcWithVc:self.V1 Image:@"one_1" selectedImage:@"one" title:@"首页" tag:0];
+    self.VC1 = [[JYNewSearchViewController alloc] init];
+    [self setUpOneChildVcWithVc:self.VC1 Image:@"one_1" selectedImage:@"one" title:@"首页" tag:0];
+    
 
     self.V2 = [[JYSubViewController alloc] init];
     [self setUpOneChildVcWithVc:self.V2 Image:@"two_1" selectedImage:@"two" title:@"订阅" tag:1];

ios/JianYuIOS/JianYuIOS/guide/ZKGuideView.m

@@ -40,9 +40,7 @@
     UIImageView *imgView = [[UIImageView alloc]initWithFrame:self.frame];
     [imgView setImage:[UIImage imageNamed:@"guide"]];
     [self addSubview:imgView];
-    
-//     [self noNetWorkProtocol];
-//return;
+
     //网络请求
     [[LXNetworkManager shareLXNetworkManager]postWithURLStr:[NSString stringWithFormat:@"%@jyapp/free/policy",kHost] parameters:nil progress:^(NSProgress *progress) {
         NSLog(@"成功：%@",progress);
@@ -56,7 +54,7 @@
         }
     } failure:^(NSError *error) {
         NSLog(@"error=%@",error);
-         [self noNetWorkProtocol];
+        [self noNetWorkProtocol];
     }];
 }