no message

zhangxiaowen
1 parent 91798ff4
Showing 4 changed files with 21 additions and 209 deletions
CNLiveQrCodeModule/Classes/Controller/CNLiveScanResultController.m
CNLiveQrCodeModule/Classes/View/CNLiveWebView.h
CNLiveQrCodeModule/Classes/View/CNLiveWebView.m
Example/CNLiveQrCodeModule.xcodeproj/project.pbxproj
@@ -52,8 +52,8 @@
 #pragma mark - 代理
 - (void)webView:(CNLiveWebView *)webView didFinishLoadWithURL:(NSURL *)url {
     NSLog(@"didFinishLoad");
-    if(webView.navigationItemTitle.length != 0){
-        self.navigationBar.title.text = webView.navigationItemTitle;
+    if(webView.title.length != 0){
+        self.navigationBar.title.text = webView.title;
     }else{
         self.navigationBar.title.text = @"识别结果";
@@ -83,7 +83,6 @@
 - (CNLiveWebView *)webView {
     if (!_webView) {
         _webView = [CNLiveWebView webViewWithFrame:CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop)];
-        _webView.isNavigationBarOrTranslucent = NO;
         _webView.delegate = self;
     }
     return _webView;
-//
-//  CNLiveWebView.h
-//  CNLiveQrCodeModule
-//
-//  Created by 153993236@qq.com on 11/12/2019.
-//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
-//
-//  CNLiveWebView 使用注意点：
-//  如果 self.navigationController.navigationBar.translucent = NO；或者导航栏不存在; 那么 XWWebView 的 isNavigationBarOrTranslucent属性 必须设置 NO)
-
-#import <UIKit/UIKit.h>
-@class CNLiveWebView;
-
-@protocol CNLiveWebViewDelegate <NSObject>
-@optional
-/** 页面开始加载时调用 */
-- (void)webViewDidStartLoad:(CNLiveWebView *)webView;
-/** 内容开始返回时调用 */
-- (void)webView:(CNLiveWebView *)webView didCommitWithURL:(NSURL *)url;
-/** 页面加载失败时调用 */
-- (void)webView:(CNLiveWebView *)webView didFinishLoadWithURL:(NSURL *)url;
-/** 页面加载完成之后调用 */
-- (void)webView:(CNLiveWebView *)webView didFailLoadWithError:(NSError *)error;
-@end
-
-@interface CNLiveWebView : UIView
-/** XWDelegate */
-@property (nonatomic, weak) id<CNLiveWebViewDelegate> delegate;
-/** 进度条颜色(默认蓝色) */
-@property (nonatomic, strong) UIColor *progressViewColor;
-/** 导航栏标题 */
-@property (nonatomic, copy) NSString *navigationItemTitle;
-/** 导航栏存在且有穿透效果(默认导航栏存在且有穿透效果) */
-@property (nonatomic, assign) BOOL isNavigationBarOrTranslucent;
-
-/** 类方法创建 XWWebView */
-+ (instancetype)webViewWithFrame:(CGRect)frame;
-/** 加载 web */
-- (void)loadRequest:(NSURLRequest *)request;
-/** 加载 HTML */
-- (void)loadHTMLString:(NSString *)HTMLString;
-/** 刷新数据 */
-- (void)reloadData;
-
-@end
-//
-//  CNLiveWebView.m
-//  CNLiveQrCodeModule
-//
-//  Created by 153993236@qq.com on 11/12/2019.
-//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
-//
-
-#import "CNLiveWebView.h"
-#import <WebKit/WebKit.h>
-#import "QMUIKit.h"
-
-@interface CNLiveWebView () <WKNavigationDelegate, WKUIDelegate>
-// WKWebView
-@property (nonatomic, strong) WKWebView *wkWebView;
-// 进度条
-@property (nonatomic, strong) UIProgressView *progressView;
-
-@end
-
-@implementation CNLiveWebView
-
-static CGFloat const progressViewHeight = 2;
-
-- (instancetype)initWithFrame:(CGRect)frame {
-    if (self = [super initWithFrame:frame]) {
-        [self addSubview:self.wkWebView];
-        [self addSubview:self.progressView];
-    }
-    return self;
-}
-
-+ (instancetype)webViewWithFrame:(CGRect)frame {
-    return [[self alloc] initWithFrame:frame];
-}
-
-- (WKWebView *)wkWebView {
-    if (!_wkWebView) {
-        _wkWebView = [[WKWebView alloc] initWithFrame:self.bounds];
-        _wkWebView.navigationDelegate = self;
-        _wkWebView.UIDelegate = self;
-        // KVO
-        [self.wkWebView addObserver:self forKeyPath:NSStringFromSelector(@selector(estimatedProgress)) options:0 context:nil];
-    }
-    return _wkWebView;
-}
-
-- (UIProgressView *)progressView {
-    if (!_progressView) {
-        _progressView = [[UIProgressView alloc] initWithProgressViewStyle:UIProgressViewStyleDefault];
-        _progressView.trackTintColor = [UIColor clearColor];
-        // 高度默认有导航栏且有穿透效果
-        _progressView.frame = CGRectMake(0, NavigationContentTop, self.frame.size.width, progressViewHeight);
-        // 设置进度条颜色
-        _progressView.tintColor = [UIColor greenColor];
-    }
-    return _progressView;
-}
-
-- (void)setProgressViewColor:(UIColor *)progressViewColor {
-    _progressViewColor = progressViewColor;
-    if (progressViewColor) {
-        _progressView.tintColor = progressViewColor;
-    }
-}
-
-- (void)setIsNavigationBarOrTranslucent:(BOOL)isNavigationBarOrTranslucent {
-    _isNavigationBarOrTranslucent = isNavigationBarOrTranslucent;
-    
-    if (isNavigationBarOrTranslucent == YES) { // 导航栏存在且有穿透效果
-        _progressView.frame = CGRectMake(0, NavigationContentTop, self.frame.size.width, progressViewHeight);
-    } else { // 导航栏不存在或者没有有穿透效果
-        _progressView.frame = CGRectMake(0, 0, self.frame.size.width, progressViewHeight);
-    }
-}
-
-// KVO
-- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
-    if ([keyPath isEqualToString:NSStringFromSelector(@selector(estimatedProgress))] && object == self.wkWebView) {
-        self.progressView.alpha = 1.0;
-        BOOL animated = self.wkWebView.estimatedProgress > self.progressView.progress;
-        [self.progressView setProgress:self.wkWebView.estimatedProgress animated:animated];
-        if(self.wkWebView.estimatedProgress >= 0.97) {
-            [UIView animateWithDuration:0.1 delay:0.3 options:UIViewAnimationOptionCurveEaseOut animations:^{
-                self.progressView.alpha = 0.0;
-            } completion:^(BOOL finished) {
-                [self.progressView setProgress:0.0 animated:NO];
-            }];
-        }
-    } else {
-        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
-    }
-}
-
-#pragma mark - 加载的状态回调（WKNavigationDelegate）
-// 页面开始加载时调用
-- (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(webViewDidStartLoad:)]) {
-        [self.delegate webViewDidStartLoad:self];
-    }
-}
-// 当内容开始返回时调用
-- (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(webView:didCommitWithURL:)]) {
-        [self.delegate webView:self didCommitWithURL:self.wkWebView.URL];
-    }
-    self.navigationItemTitle = self.wkWebView.title;
-}
-// 页面加载完成之后调用
-- (void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation {
-    self.navigationItemTitle = self.wkWebView.title;
-    if (self.delegate && [self.delegate respondsToSelector:@selector(webView:didFinishLoadWithURL:)]) {
-        [self.delegate webView:self didFinishLoadWithURL:self.wkWebView.URL];
-    }
-    self.progressView.alpha = 0.0;
-}
-// 页面加载失败时调用
-- (void)webView:(WKWebView *)webView didFailNavigation:(WKNavigation *)navigation withError:(NSError *)error {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(webView:didFailLoadWithError:)]) {
-        [self.delegate webView:self didFailLoadWithError:error];
-    }
-    self.progressView.alpha = 0.0;
-}
-// 加载 web
-- (void)loadRequest:(NSURLRequest *)request {
-    [self.wkWebView loadRequest:request];
-}
-// 加载 HTML
-- (void)loadHTMLString:(NSString *)HTMLString {
-    [self.wkWebView loadHTMLString:HTMLString baseURL:nil];
-}
-// 刷新数据
-- (void)reloadData {
-    [self.wkWebView reload];
-}
-// dealloc
-- (void)dealloc {    
-    [self.wkWebView removeObserver:self forKeyPath:NSStringFromSelector(@selector(estimatedProgress))];
-}
-
-
-@end
@@ -207,8 +207,8 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				936400C36A68BB4DAA5C8A6E /* [CP] Embed Pods Frameworks */,
-				4644CC2D244368A8795F234F /* [CP] Copy Pods Resources */,
+				A6874231ED8CBF0F3DD0EA37 /* [CP] Embed Pods Frameworks */,
+				03C7BF1E246C9ADAE9CFD775 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -299,44 +299,44 @@
 /* End PBXResourcesBuildPhase section */
 /* Begin PBXShellScriptBuildPhase section */
-		331689B0771077B305836D8A /* [CP] Check Pods Manifest.lock */ = {
+		03C7BF1E246C9ADAE9CFD775 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputFileListPaths = (
-			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveQrCodeModule_Example/Pods-CNLiveQrCodeModule_Example-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.bundle",
 			);
+			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-CNLiveQrCodeModule_Example-checkManifestLockResult.txt",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveQrCodeModule.bundle",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveQrCodeModule_Example/Pods-CNLiveQrCodeModule_Example-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		4644CC2D244368A8795F234F /* [CP] Copy Pods Resources */ = {
+		331689B0771077B305836D8A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
+			inputFileListPaths = (
+			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CNLiveQrCodeModule_Example/Pods-CNLiveQrCodeModule_Example-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.bundle",
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
 			);
-			name = "[CP] Copy Pods Resources";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/CNLiveQrCodeModule.bundle",
+				"$(DERIVED_FILE_DIR)/Pods-CNLiveQrCodeModule_Example-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveQrCodeModule_Example/Pods-CNLiveQrCodeModule_Example-resources.sh\"\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
 		667E6DC32E1A51CD56D1B74A /* [CP] Check Pods Manifest.lock */ = {
@@ -361,7 +361,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		936400C36A68BB4DAA5C8A6E /* [CP] Embed Pods Frameworks */ = {
+		A6874231ED8CBF0F3DD0EA37 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (