no message

zhangxiaowen
1 parent b059b30a
Showing 17 changed files with 657 additions and 320 deletions
CNLiveQrCodeModule.podspec
CNLiveQrCodeModule/Assets/CNLiveQrCodeModule.xcassets/code_back_black_b.imageset/Contents.json
CNLiveQrCodeModule/Assets/CNLiveQrCodeModule.xcassets/code_back_black_b.imageset/code_back_black_b@2x.png
CNLiveQrCodeModule/Assets/CNLiveQrCodeModule.xcassets/code_back_black_b.imageset/code_back_black_b@3x.png
CNLiveQrCodeModule/Classes/Controller/CNLiveGroupQrCodeController.h
CNLiveQrCodeModule/Classes/Controller/CNLiveGroupQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveMyQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveScanQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveScanResultController.h
CNLiveQrCodeModule/Classes/Controller/CNLiveScanResultController.m
CNLiveQrCodeModule/Classes/View/CNLiveGroupQrCodeView.m
CNLiveQrCodeModule/Classes/View/CNLiveQrCodeNavigationBar.h
CNLiveQrCodeModule/Classes/View/CNLiveQrCodeNavigationBar.m
CNLiveQrCodeModule/Classes/View/CNLiveWebView.h
CNLiveQrCodeModule/Classes/View/CNLiveWebView.m
Example/CNLiveQrCodeModule/CNLIVEAppDelegate.m
Example/CNLiveQrCodeModule/CNLiveQrCodeModule-Info.plist
@@ -49,7 +49,7 @@ TODO: 网家家-二维码模块.
   s.dependency 'CNLiveTripartiteManagement/SDWebImage'
   s.dependency 'CNLiveTripartiteManagement/Masonry'
   s.dependency 'CNLiveTripartiteManagement/MJExtension'
-  s.dependency 'SGQRCode'
+  s.dependency 'SGQRCode', '3.0.1'
   # 服务层
   s.dependency 'CNLiveServices'
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "code_back_black_b@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "code_back_black_b@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -14,9 +14,11 @@
 #import <UIKit/UIKit.h>
 NS_ASSUME_NONNULL_BEGIN
+@class IMAGroup;
 @interface CNLiveGroupQrCodeController : UIViewController
 @property (nonatomic, assign) BOOL isScanCode;
+@property (nonatomic, strong) IMAGroup *group;
 @end
@@ -7,67 +7,190 @@
 //
 #import "CNLiveGroupQrCodeController.h"
-
+#import <Masonry/Masonry.h>
 #import "QMUIKit.h"
+#import "SGQRCode.h"//二维码库
 #import "CNLiveQrCodeNavigationBar.h"
+#import "CNLiveGroupQrcodeView.h"
+#import "CNLiveQrCodeNavigationBar.h"
-@interface CNLiveGroupQrCodeController()
+@interface CNLiveGroupQrCodeController ()<CNLiveQrCodeNavigationBarDelegate>
+@property (nonatomic, strong) CNLiveQrCodeNavigationBar *navigationBar;
+@property (nonatomic, strong) CNLiveGroupQrCodeView *groupView;
+@property (nonatomic, strong) UIButton *save;
+@property (nonatomic, strong) UIButton *share;
 @end
 @implementation CNLiveGroupQrCodeController
-static const NSInteger kHEIGHT = 250;
-
-#pragma mark - 加载数据
-- (void)loadData {
-    
-    
-}
-
+static const NSInteger margin = 10;
 #pragma mark - 生命周期
 - (void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     self.navigationController.navigationBarHidden = YES;
-
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.view.backgroundColor = [UIColor colorWithRed:244.0/255.0 green:244.0/255.0 blue:244.0/255.0 alpha:1.0];
-    [self createSubViews];
-    [self loadData];
-}
-
-- (void)dealloc {
+    // Do any additional setup after loading the view.
+    self.view.backgroundColor = [UIColor colorWithRed:245/255.0 green:245/255.0 blue:249/255.0 alpha:1.0];
+    [self.view addSubview:self.navigationBar];
+    [self.view addSubview:self.groupView];
+    [self.view addSubview:self.save];
+    CGFloat width = (SCREEN_WIDTH-6*margin)/2.0;
+    [self.save mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.view.mas_left).mas_offset(2.5*margin);
+        make.top.mas_equalTo(self.groupView.mas_bottom).mas_offset(2*margin);
+        make.width.mas_equalTo(width);
+        make.height.mas_equalTo(40);
+
+    }];
+    [self.view addSubview:self.share];
+    [self.share mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.save.mas_right).mas_offset(margin);
+        make.top.mas_equalTo(self.save.mas_top);
+        make.width.mas_equalTo(self.save.mas_width);
+        make.height.mas_equalTo(self.save.mas_height);
+
+    }];
 }
-- (void)createSubViews {
- 
+/*
+#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.
 }
+*/
-#pragma mark - 状态栏
-/**
- * 状态栏的颜色
- *
- * @return UIStatusBarStyle
- *
- */
-- (UIStatusBarStyle)preferredStatusBarStyle{
-    return UIStatusBarStyleLightContent;
-    
+#pragma mark - 代理
+- (void)navigationBar:(CNLiveQrCodeNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
+    if ([actionEvents isEqualToString:@"1"]) {
+        [self goBack];
+    }
 }
 #pragma mark - 懒加载
-
+- (CNLiveQrCodeNavigationBar *)navigationBar {
+    if (!_navigationBar) {
+        _navigationBar = [[CNLiveQrCodeNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
+        _navigationBar.backgroundColor = [UIColor whiteColor];
+        _navigationBar.delegate = self;
+        UIImage *image = [self xw_getImageName:@"code_back_black_b" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveGroupQrCodeController class]];
+        [_navigationBar.left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
+        _navigationBar.title.text = @"群二维码名片";
+        _navigationBar.title.textColor = [UIColor blackColor];
+        _navigationBar.right = nil;
+    }
+    return _navigationBar;
+}
+- (CNLiveGroupQrCodeView *)groupView {
+    if (!_groupView) {
+        _groupView = [[CNLiveGroupQrCodeView alloc] initWithFrame:CGRectMake(0, 0, 310, 342)];
+        _groupView.center = CGPointMake(self.view.center.x, self.view.center.y-20);
+        _groupView.layer.masksToBounds = YES;
+        _groupView.layer.cornerRadius = 10;
+//        _groupView.group = self.group;
+    }
+    return _groupView;
+}
+- (UIButton *)save{
+    if(!_save){
+        _save = [UIButton buttonWithType:UIButtonTypeCustom];
+        _save.titleLabel.font = [UIFont systemFontOfSize:16.0];
+        _save.backgroundColor = [UIColor whiteColor];
+        _save.layer.cornerRadius = 5;
+        _save.layer.masksToBounds = YES;
+        [_save addTarget:self action:@selector(saveBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
+        [_save setTitle:@"保存到手机" forState:UIControlStateNormal];
+        [_save setTitleColor:[UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0] forState:UIControlStateNormal];
+        _save.backgroundColor = [UIColor colorWithRed:234/255.0 green:236/255.0 blue:244/255.0 alpha:1.0];
+        
+    }
+    return _save;
+    
+}
+- (UIButton *)share{
+    if(!_share){
+        _share = [UIButton buttonWithType:UIButtonTypeCustom];
+        _share.titleLabel.font = [UIFont systemFontOfSize:16.0];
+        _share.backgroundColor = [UIColor whiteColor];
+        _share.layer.cornerRadius = 5;
+        _share.layer.masksToBounds = YES;
+        [_share addTarget:self action:@selector(shareDidClicked:) forControlEvents:UIControlEventTouchUpInside];
+        [_share setTitle:@"分享二维码" forState:UIControlStateNormal];
+        [_share setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        _share.backgroundColor = [UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0];
+        
+    }
+    return _share;
+    
+}
 #pragma mark - 响应方法
-- (void)soccerDidClicked:(UIButton *)btn{
+- (void)goBack {
+    if (self.presentingViewController != nil) {
+        [self dismissViewControllerAnimated:YES completion:nil];
+        
+    }
+    else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
+#pragma mark - 保存到手机
+- (void)saveBtnDidClicked:(UIButton *)btn{
+    UIImage *image = [self generateImage:self.groupView];
+    [QMUITips showLoadingInView:self.view];
+    [self saveImage:image];
+    [QMUITips hideAllTipsInView:self.view];
+
+}
+
+- (void)saveImage:(UIImage *)image {
+    [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
+        [PHAssetChangeRequest creationRequestForAssetFromImage:image];
+        
+    } completionHandler:^(BOOL success, NSError * _Nullable error) {
+        if (!success) return ;
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [QMUITips showSucceed:@"已保存到系统相册" inView:self.view hideAfterDelay:1.5];
+        });
+    }];
 }
+#pragma mark - 分享二维码
+- (void)shareDidClicked:(UIButton *)btn{
+    UIImage *image = [self generateImage:self.groupView];
+    NSArray *imageArray = @[@"sport_china_download"].copy;
+    NSArray *titleArray = @[@"保存"].copy;
+    __weak typeof(self) weakSelf = self;
+//    [CNLiveShareManager showShareViewWithParamForShareTitle:nil ShareUrl:nil ShareDesc:nil ShareImage:image ScreenFull:NO HiddenWjj:NO HiddenQQ:NO HiddenWB:NO HiddenWechat:NO HiddenSafari:YES TopImage:imageArray TopTitles:titleArray PlatformType:CNLiveSharePlatformTypeAll TouchActionBlock:^(NSString *title) {
+//
+//    } CompleterBlock:^(CNLiveShareResultType resultType, CNLiveSharePlatformType platformType, NSString *typtString) {
+//
+//    }];
+}
+
+// UIView转UIImage
+- (UIImage *)generateImage:(UIView *)view{
+    // 1.开启上下文
+    UIGraphicsBeginImageContextWithOptions(view.frame.size, NO, 0.0);
+    // 2. 将控制器View的Layer渲染到上下文
+    [view.layer renderInContext:UIGraphicsGetCurrentContext()];
+    // 3.取出图片
+    UIImage *newImage = UIGraphicsGetImageFromCurrentImageContext();
+    // 4.结束上下文
+    UIGraphicsEndImageContext();
+
+    return newImage;
+}
+
 /**
  *  创建图片
  *
@@ -7,23 +7,20 @@
 //
 #import "CNLiveMyQrCodeController.h"
-#import "QMUIKit.h"
-
 #import <Photos/Photos.h>
 #import <Accelerate/Accelerate.h>
+#import "QMUIKit.h"
 #import <Masonry/Masonry.h>
 #import <SDWebImage/SDWebImage.h>
-
-#import "CNLiveMyQrCodeView.h"
 #import "CNLiveQrCodeNavigationBar.h"
+#import "CNLiveMyQrCodeView.h"
 @interface CNLiveMyQrCodeController ()<CNLiveQrCodeNavigationBarDelegate>
 @property (nonatomic, strong) CNLiveQrCodeNavigationBar *navigationBar;
-@property (nonatomic, weak) UIImageView *bgView;
-@property (nonatomic, weak) CNLiveMyQrCodeView *qrCodeView;
-@property (nonatomic, weak) UIButton *rightBtn;
+@property (nonatomic, strong) UIImageView *bgView;
+@property (nonatomic, strong) CNLiveMyQrCodeView *qrCodeView;
 @end
@@ -54,20 +51,8 @@ static const CGFloat timeValue = 1.5;
 }
 - (void)createSubViews {
-    UIImageView *bgView = [[UIImageView alloc]initWithFrame:self.view.bounds];
-    UIImage *image = [self xw_getImageName:@"qr_code_bg" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeController class]];
-    [bgView sd_setImageWithURL:[NSURL URLWithString:@"User_Head"] placeholderImage:image completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
-        if(image){
-//            bgView.image = [image blurImageWithRadius:4];
-        }
-    }];
-    [self.view addSubview:bgView];
-    self.bgView = bgView;
-    
-    CNLiveMyQrCodeView *qrCodeView = [[CNLiveMyQrCodeView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-2*margin, 420)];
-    qrCodeView.center = self.view.center;
-    [self.view addSubview:qrCodeView];
-    self.qrCodeView = qrCodeView;
+    [self.view addSubview:self.bgView];
+    [self.view addSubview:self.qrCodeView];
     [self.view addSubview:self.navigationBar];
 }
@@ -201,15 +186,35 @@ static const CGFloat timeValue = 1.5;
     }];
 }
-#pragma mark - 懒加载
+#pragma mark - 代理
 - (void)navigationBar:(CNLiveQrCodeNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
     if ([actionEvents isEqualToString:@"1"]) {
         [self goBack];
     }
 }
+#pragma mark - 懒加载
+- (UIImageView *)bgView{
+    if(!_bgView){
+        _bgView = [[UIImageView alloc]initWithFrame:self.view.bounds];
+        UIImage *image = [self xw_getImageName:@"qr_code_bg" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeController class]];
+        [_bgView sd_setImageWithURL:[NSURL URLWithString:@"User_Head"] placeholderImage:image completed:^(UIImage * _Nullable image, NSError * _Nullable error, SDImageCacheType cacheType, NSURL * _Nullable imageURL) {
+            if(image){
+    //            bgView.image = [image blurImageWithRadius:4];
+            }
+        }];
+    }
+    return _bgView;
+}
+- (CNLiveMyQrCodeView *)qrCodeView {
+    if (!_qrCodeView) {
+        _qrCodeView = [[CNLiveMyQrCodeView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-2*margin, 420)];
+        _qrCodeView.center = self.view.center;
+    }
+    return _qrCodeView;
+}
 - (CNLiveQrCodeNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveQrCodeNavigationBar alloc] initWithFrame:CGRectMake(0, 0, [[UIScreen mainScreen] bounds].size.width, NavigationContentTop)];
+        _navigationBar = [[CNLiveQrCodeNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
         _navigationBar.delegate = self;
         _navigationBar.title.text = @"我的二维码";
         UIImage *image2 = [self xw_getImageName:@"mine_code_more" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeController class]];
@@ -16,7 +16,7 @@
 #import "CNLiveMyQrCodeController.h"
 #import "CNLiveQrCodeNavigationBar.h"
-//#import "XWScanSuccessController.h"
+#import "CNLiveScanResultController.h"
 @interface CNLiveScanQrCodeController ()<CNLiveQrCodeNavigationBarDelegate>{
     SGQRCodeObtain *obtain;
@@ -151,9 +151,10 @@ static const CGFloat timeValue = 1.5;
     [obtain establishQRCodeObtainScanWithController:self configure:configure];
     [obtain startRunningWithBefore:^{
-//        [SVProgressHUD showWithStatus:@"正在加载..."];
+        [QMUITips showInfo:@"正在加载..."];
+        
     } completion:^{
-//        [SVProgressHUD dismiss];
+        [QMUITips hideAllTips];
     }];
     [obtain setBlockWithQRCodeObtainScanResult:^(SGQRCodeObtain *obtain, NSString *result) {
         __strong typeof(weakSelf) strongSelf = weakSelf;
@@ -228,9 +229,9 @@ static const CGFloat timeValue = 1.5;
     }
     // 不是app的业务
     else{
-//        XWScanSuccessController *jumpVC = [[XWScanSuccessController alloc] init];
-//        jumpVC.jump_URL = result;
-//        [self.navigationController pushViewController:jumpVC animated:YES];
+        CNLiveScanResultController *jumpVC = [[CNLiveScanResultController alloc] init];
+        jumpVC.jump_URL = result;
+        [self.navigationController pushViewController:jumpVC animated:YES];
     }
 }
@@ -267,15 +268,16 @@ static const CGFloat timeValue = 1.5;
     return UIStatusBarStyleLightContent;
 }
-#pragma mark - 懒加载
+#pragma mark - 代理
 - (void)navigationBar:(CNLiveQrCodeNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
     if ([actionEvents isEqualToString:@"1"]) {
         [self goBack];
     }
 }
+#pragma mark - 懒加载
 - (CNLiveQrCodeNavigationBar *)navigationBar {
     if (!_navigationBar) {
-        _navigationBar = [[CNLiveQrCodeNavigationBar alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, NavigationContentTop)];
+        _navigationBar = [[CNLiveQrCodeNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
         _navigationBar.delegate = self;
         _navigationBar.title.text = @"扫一扫";
         [_navigationBar.right setTitle:@"相册" forState:UIControlStateNormal];
@@ -291,7 +293,7 @@ static const CGFloat timeValue = 1.5;
 - (UIButton *)flashlightBtn {
     if (!_flashlightBtn) {
         _flashlightBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        CGFloat flashlightBtnW = 60;
+        CGFloat flashlightBtnW = 100;
         CGFloat flashlightBtnH = 50;
         CGFloat flashlightBtnX = 0.5 * (self.view.frame.size.width - flashlightBtnW);
         CGFloat flashlightBtnY = 0.55 * self.view.frame.size.height;
@@ -300,7 +302,14 @@ static const CGFloat timeValue = 1.5;
         UIImage *image2 = [self xw_getImageName:@"flashlight_open" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanQrCodeController class]];
         [_flashlightBtn setImage:image1 forState:UIControlStateNormal];
         [_flashlightBtn setImage:image2 forState:UIControlStateSelected];
+        [_flashlightBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
+        [_flashlightBtn setTitleColor:[UIColor greenColor] forState:UIControlStateSelected];
+        [_flashlightBtn setTitle:@"轻触点亮" forState:UIControlStateNormal];
+        [_flashlightBtn setTitle:@"轻触关闭" forState:UIControlStateSelected];
+        _flashlightBtn.titleLabel.font = [UIFont systemFontOfSize:13];
         [_flashlightBtn addTarget:self action:@selector(flashlightButtonDidClicked:) forControlEvents:UIControlEventTouchUpInside];
+        _flashlightBtn.titleEdgeInsets = UIEdgeInsetsMake(_flashlightBtn.imageView.frame.size.height+10, -_flashlightBtn.imageView.frame.size.width, 0, 0);
+        _flashlightBtn.imageEdgeInsets = UIEdgeInsetsMake(-_flashlightBtn.titleLabel.bounds.size.height, 0, 10, -_flashlightBtn.titleLabel.bounds.size.width);
     }
     return _flashlightBtn;
@@ -325,18 +334,20 @@ static const CGFloat timeValue = 1.5;
 - (UIButton *)codeButton {
     if (!_codeButton) {
         _codeButton = [UIButton buttonWithType:(UIButtonTypeCustom)];
-        CGFloat flashlightBtnW = 120;
+        CGFloat flashlightBtnW = 100;
         CGFloat flashlightBtnH = 50;
         CGFloat flashlightBtnX = 0.5 * (self.view.frame.size.width - flashlightBtnW);
         CGFloat flashlightBtnY = CGRectGetMaxY(self.promptLabel.frame)+15;
         _codeButton.frame = CGRectMake(flashlightBtnX, flashlightBtnY, flashlightBtnW, flashlightBtnH);
         UIImage *image = [self xw_getImageName:@"qr_code_green" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanQrCodeController class]];
         [_codeButton setImage:image forState:UIControlStateNormal];
-        [_codeButton setTitle:@"  我的二维码" forState:UIControlStateNormal];
+        [_codeButton setTitle:@"我的二维码" forState:UIControlStateNormal];
         _codeButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Regular" size:15.0f];
         [_codeButton setTitleColor:[UIColor colorWithRed:26/255.0 green:161/255.0 blue:45/255.0 alpha:1.0] forState:UIControlStateNormal];
         [_codeButton addTarget:self action:@selector(codeButtonDidClicked:) forControlEvents:UIControlEventTouchUpInside];
         [_codeButton  setAdjustsImageWhenHighlighted:NO];
+        _codeButton.titleEdgeInsets = UIEdgeInsetsMake(0, -20, 0, 20);
+        _codeButton.imageEdgeInsets = UIEdgeInsetsMake(0, 80, 0, -80);
     }
     return _codeButton;
+//
+//  CNLiveScanResultController.h
+//  CNLiveQrCodeModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface CNLiveScanResultController : UIViewController
+/** 是否返回到Root */
+@property (nonatomic, assign) BOOL isPopToRoot;
+@property (nonatomic, copy) NSString *jump_URL;
+
+@end
+//
+//  CNLiveScanResultController.m
+//  CNLiveQrCodeModule
+//
+//  Created by 153993236@qq.com on 11/12/2019.
+//  Copyright (c) 2019 153993236@qq.com. All rights reserved.
+//
+
+#import "CNLiveScanResultController.h"
+#import "QMUIKit.h"
+
+#import "CNLiveQrCodeNavigationBar.h"
+#import "CNLiveWebView.h"
+
+@interface CNLiveScanResultController () <CNLiveQrCodeNavigationBarDelegate, CNLiveWebViewDelegate>
+@property (nonatomic, strong) CNLiveQrCodeNavigationBar *navigationBar;
+@property (nonatomic, strong) CNLiveWebView *webView;
+
+@end
+
+@implementation CNLiveScanResultController
+#pragma mark - 生命周期
+- (void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBarHidden = YES;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    self.view.backgroundColor = [UIColor whiteColor];
+    [self setupSubView];
+
+    if ([self.jump_URL hasPrefix:@"http://"]||[self.jump_URL hasPrefix:@"https://"]) {
+        [_webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:self.jump_URL]]];
+
+    } else {
+        [_webView loadHTMLString:[self html:self.jump_URL]];
+    }
+}
+
+- (NSString *)html:(NSString *)url{
+    return [NSString stringWithFormat:@"<div style=\"font-size:40px\">%@</div>",url];
+}
+
+- (void)setupSubView {
+    [self.view addSubview:self.navigationBar];
+    [self.view addSubview:self.webView];
+}
+
+- (void)webView:(CNLiveWebView *)webView didFinishLoadWithURL:(NSURL *)url {
+    NSLog(@"didFinishLoad");
+    if(webView.navigationItemTitle.length != 0){
+        self.navigationBar.title.text = webView.navigationItemTitle;
+    }else{
+        self.navigationBar.title.text = @"识别结果";
+
+    }
+
+}
+#pragma mark - 代理
+- (void)navigationBar:(CNLiveQrCodeNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
+    if ([actionEvents isEqualToString:@"1"]) {
+//        [self goBack];
+    }
+}
+
+- (void)webView:(CNLiveWebView *)webView didFailLoadWithError:(NSError *)error{
+    
+}
+
+#pragma mark - 懒加载
+- (CNLiveQrCodeNavigationBar *)navigationBar {
+    if (!_navigationBar) {
+        _navigationBar = [[CNLiveQrCodeNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
+        _navigationBar.delegate = self;
+        _navigationBar.title.textColor = [UIColor blackColor];
+        _navigationBar.delegate = self;
+        
+        UIImage *image = [self xw_getImageName:@"code_back_black_b" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanResultController class]];
+        [_navigationBar.left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
+        _navigationBar.right = nil;
+        
+    }
+    return _navigationBar;
+}
+
+- (CNLiveWebView *)webView {
+    if (!_webView) {
+        _webView = [CNLiveWebView webViewWithFrame:CGRectMake(0, NavigationContentTop, SCREEN_WIDTH, SCREEN_HEIGHT-NavigationContentTop)];
+        _webView.isNavigationBarOrTranslucent = NO;
+        _webView.delegate = self;
+    }
+    return _webView;
+}
+
+/**
+ *  创建图片
+ *
+ *  @param imageName 图片名字
+ *  @param bundleName 图片所在的bundle名字
+ *  @param targetClass 类和bundle的同级目录
+ *  @return 返回UIImage
+ */
+- (UIImage *)xw_getImageName:(NSString *)imageName bundleName:(NSString *)bundleName targetClass:(Class)targetClass{
+    NSBundle *bundle = [NSBundle bundleForClass:targetClass];
+    NSURL *url = [bundle URLForResource:bundleName withExtension:@"bundle"];
+    NSBundle *targetBundle = [NSBundle bundleWithURL:url];
+    UIImage *image = [UIImage imageNamed:imageName inBundle:targetBundle compatibleWithTraitCollection:nil];
+    return image?image:[UIImage imageNamed:imageName inBundle:[NSBundle mainBundle] compatibleWithTraitCollection:nil];
+}
+
+@end
@@ -10,278 +10,127 @@
 #import <Masonry/Masonry.h>
 #import <SDWebImage/SDWebImage.h>
 #import "QMUIKit.h"
+#import "SGQRCode.h"//二维码库
-@interface CNLiveGroupQrCodeView ()
-@property (nonatomic, strong) UIImageView *bgView;
-@property (nonatomic, strong) UIButton *witness;
+//#import "SGQRCodeGenerateManager.h"
+//#import "CNLiveGroupAvatorManager.h"
-@property (nonatomic, strong) UIImageView *header;
-@property (nonatomic, strong) UILabel *name;
-@property (nonatomic, strong) UILabel *certification;
-@property (nonatomic, strong) UILabel *address;
-@property (nonatomic, strong) UIButton *sign;
+@interface CNLiveGroupQrCodeView()
+@property (nonatomic, strong) UIImageView *groupHead;
+@property (nonatomic, strong) UILabel *groupName;
+@property (nonatomic, strong) UIImageView *qrcode;
+@property (nonatomic, strong) UILabel *desc;
 @end
-
 @implementation CNLiveGroupQrCodeView
-static const NSInteger margin = 20;
+static const NSInteger margin = 15;
-- (instancetype)initWithFrame:(CGRect)frame{
-    self = [super initWithFrame:frame];
-    if(self){
-        self.userInteractionEnabled = YES;
-        self.backgroundColor = [UIColor colorWithRed:244.0/255.0 green:244.0/255.0 blue:244.0/255.0 alpha:1.0];
-        [self createSubViews];
+- (instancetype)initWithFrame:(CGRect)frame {
+    if (self = [super initWithFrame:frame]) {
+        self.backgroundColor = [UIColor whiteColor];
+        [self createUI];
     }
     return self;
 }
-// 实现方法
-- (void)userInfoUpdateNotification:(NSNotification *)noti{
-    //使用userInfo处理消息
-//    NSDictionary *dic = [noti userInfo];
-//    XWUserInfoDataType type = [[dic objectForKey:@"type"] integerValue];
-//    if(type == XWUserInfoDataTypeHead){
-//        UIImage *info = [dic objectForKey:@"info"];
-//        _header.image = info;
-//
-//    }else if(type == XWUserInfoDataTypeNickname){
-//        NSString *info = [dic objectForKey:@"info"];
-//        _name.attributedText = [self createAttributedImageName:@"mine_code" string:info isFront:NO];
-//
-//    }else if(type == XWUserInfoDataTypeAddress){
-//        NSString *info = [dic objectForKey:@"info"];
-//        _address.attributedText = [self createAttributedImageName:@"mine_location" string:info isFront:YES];
-//
-//    }
-}
-
-- (void)dealloc {
-    NSLog(@"CNLiveGroupQrCodeView -- dealloc");
-//    [XWUserInfoNotification removeObserver:self];
-
-}
-
-- (void)createSubViews {
-    [self addSubview:self.bgView];
-    [self addSubview:self.witness];
-
-    [self addSubview:self.header];
-    [self addSubview:self.name];
-    [self addSubview:self.certification];
-    [self addSubview:self.address];
-    [self addSubview:self.sign];
-}
-
-- (void)layoutSubviews{
-    [super layoutSubviews];
-    [_witness mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.mas_left).with.offset(1.5*margin);
-        make.right.equalTo(self.mas_right).with.offset(-1.5*margin);
-        make.width.height.offset(60);
-        make.bottom.equalTo(self.mas_bottom).with.offset(-0.5*margin);
-        
+#pragma mark - UI
+- (void)createUI{
+    [self addSubview:self.groupHead];
+    [self.groupHead mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self).mas_offset(margin);
+        make.top.mas_equalTo(self).mas_offset(margin);
+        make.width.mas_equalTo(36);
+        make.height.mas_equalTo(36);
     }];
-    [_bgView mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.mas_left).with.offset(0);
-        make.right.equalTo(self.mas_right).with.offset(-0);
-        make.top.equalTo(self.mas_top).with.offset(0);
-        make.bottom.equalTo(self.witness.mas_centerY).with.offset(0.5*margin);
-        
-    }];
-    
-    [_header mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self.mas_left).with.offset(margin);
-        make.centerY.equalTo(self.bgView.mas_centerY).with.offset(0);
-        make.width.height.offset(60);
+    [self addSubview:self.groupName];
+    [self.groupName mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.groupHead.mas_right).mas_offset(margin);
+        make.right.mas_equalTo(self.mas_right).mas_offset(-margin);
+        make.top.mas_equalTo(self.groupHead.mas_top);
+        make.height.mas_equalTo(self.groupHead.mas_height);
     }];
-    [_certification mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.centerY.equalTo(self.header.mas_centerY);
-        make.left.equalTo(self.header.mas_right).with.offset(margin/2.0);
-        make.height.offset(35);
-        
-    }];
-    
-    [_name mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.bottom.equalTo(self.certification.mas_top);
-        make.left.equalTo(self.certification.mas_left);
-        make.right.equalTo(self.bgView.mas_right).with.offset(-margin);
-        make.height.equalTo(self.certification.mas_height);
-        
+    [self addSubview:self.qrcode];
+    [self.qrcode mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.centerX.mas_equalTo(self.mas_centerX);
+        make.top.mas_equalTo(self.groupName.mas_bottom).mas_offset(margin);
+        make.width.mas_equalTo(220.0);
+        make.height.mas_equalTo(220.0);
     }];
-    [_address mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self.certification.mas_bottom);
-        make.left.equalTo(self.name.mas_left);
-        make.right.equalTo(self.name.mas_right);
-        make.height.equalTo(self.name.mas_height);
-        
-    }];
+    [self addSubview:self.desc];
+    [self.desc mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(self.mas_left).mas_offset(margin);
+        make.right.mas_equalTo(self.mas_right).mas_offset(-margin);
+        make.top.mas_equalTo(self.qrcode.mas_bottom).mas_offset(0);
+        make.bottom.mas_equalTo(self.mas_bottom).mas_offset(-0);
-    [_sign mas_remakeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(self.mas_right).with.offset(0);
-        make.centerY.equalTo(self.header.mas_centerY).with.offset(0);
-        make.width.mas_equalTo(105);
-        make.height.mas_equalTo(32);
-        
-    }];
+   }];
 }
 /*
- // Only override drawRect: if you perform custom drawing.
- // An empty implementation adversely affects performance during animation.
- - (void)drawRect:(CGRect)rect {
- // Drawing code
- }
- */
-#pragma mark - Private Methods
-- (NSMutableAttributedString *)createAttributedImageName:(NSString *)imageName string:(NSString *)string isFront:(BOOL)isFront{
-    if(isFront){
-        string = [NSString stringWithFormat:@" %@",string];
-    }
-    // 1.创建一个富文本
-    NSMutableAttributedString *attri =  [[NSMutableAttributedString alloc] initWithString:string];
-    // 修改富文本中的不同文字的样式
-//    [attri addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(0, string.length)];
-//    [attri addAttribute:NSFontAttributeName value:[UIFont systemFontOfSize:14] range:NSMakeRange(0, string.length)];
-    // 2.添加表情图片
-    NSTextAttachment *attch = [[NSTextAttachment alloc] init];
-    // 表情图片
-    UIImage *xw_image = [self xw_getImageName:imageName bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveGroupQrCodeView class]];
-    attch.image = xw_image;
-    if(isFront){
-        // 设置图片大小
-        attch.bounds = CGRectMake(0, -1.5, 10, 12);
-        // 创建带有图片的富文本
-        NSAttributedString *str = [NSAttributedString attributedStringWithAttachment:attch];
-        [attri insertAttributedString:str atIndex:0];// 插入某个位置
-    }else{
-        // 设置图片大小
-        attch.bounds = CGRectMake(10, -2, 15, 15);
-        // 创建带有图片的富文本
-        NSAttributedString *str = [NSAttributedString attributedStringWithAttachment:attch];
-        [attri insertAttributedString:str atIndex:string.length];// 插入某个位置
-
-    }
-    return attri;
-    
-}
-- (NSMutableAttributedString *)createAttributedImages:(NSArray *)images {
-    // 1.创建一个富文本
-    NSMutableAttributedString *attri =  [[NSMutableAttributedString alloc] initWithString:@""];
-    for(NSString *image in images){
-        // 2.添加表情图片
-        NSTextAttachment *attch = [[NSTextAttachment alloc] init];
-        // 表情图片
-        UIImage *xw_image = [self xw_getImageName:image bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveGroupQrCodeView class]];
-        attch.image = xw_image;
-        // 创建带有图片的富文本
-        NSAttributedString *str = [NSAttributedString attributedStringWithAttachment:attch];
-        NSAttributedString *space = [[NSAttributedString alloc]initWithString:@" "];
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+#pragma mark - Setter
+//- (void)setGroup:(IMAGroup *)group{
+//    _group = group;
+//    if(group.avatorIcon){
+//        _groupHead.image = group.avatorIcon;
+//    }else{
+//        [_groupHead setImageWithGroupId:group.groupInfo.groupId];
+//
+//    }
+//    _groupName.text = group.groupInfo.groupName;
+//    _qrcode.image = [SGQRCodeObtain generateWithLogoQRCodeData:group.groupInfo.groupId logoImageName:nil logoScaleToSuperView:0.2];
+//
+//}
-        [attri insertAttributedString:space atIndex:0];
-        [attri insertAttributedString:str atIndex:0];// 插入某个位置
+#pragma mark - Getter
+- (UIImageView *)groupHead {
+    if (!_groupHead) {
+        _groupHead = [[UIImageView alloc] init];
+        _groupHead.backgroundColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
     }
-    return attri;
-    
+    return _groupHead;
 }
-#pragma mark - 懒加载
-- (UIButton *)witness {
-    if (!_witness) {
-        _witness = [UIButton buttonWithType:UIButtonTypeCustom];
-        UIImage *xw_image = [self xw_getImageName:@"mine_observer" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveGroupQrCodeView class]];
-        _witness.imageView.contentMode = UIViewContentModeScaleAspectFit;
-        [_witness setImage:xw_image forState:UIControlStateNormal];
-        _witness.adjustsImageWhenHighlighted = NO;
-        [_witness addTarget:self action:@selector(witnessDidClicked:) forControlEvents:UIControlEventTouchUpInside];
+- (UILabel *)groupName {
+    if (!_groupName) {
+        _groupName = [[UILabel alloc] init];
+        _groupName.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
+        _groupName.font = UIFontMake(15);
+        _groupName.numberOfLines = 1;
+        _groupName.text = @"张晓文";
     }
-    return _witness;
-}
-- (UIImageView *)bgView {
-    if (!_bgView) {
-        _bgView = [[UIImageView alloc] init];
-        _bgView.userInteractionEnabled = YES;
-        UIImage *xw_image = [self xw_getImageName:@"mine_bg" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveGroupQrCodeView class]];
-        _bgView.image = xw_image;
-    }
-    return _bgView;
-}
-- (UIImageView *)header {
-    if (!_header) {
-        _header = [[UIImageView alloc] init];
-        _header.userInteractionEnabled = YES;
-        _header.layer.masksToBounds = YES;
-        _header.layer.cornerRadius = 30;
-        UIImage *xw_image = [self xw_getImageName:@"default_avatar_y" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveGroupQrCodeView class]];
-        [_header sd_setImageWithURL:[NSURL URLWithString:@"头像"] placeholderImage:xw_image];
-        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(headerTapDidClicked:)];
-        [_header addGestureRecognizer:tap];
-    }
-    return _header;
+    return _groupName;
 }
-- (UILabel *)name {
-    if (!_name) {
-        _name = [[UILabel alloc] init];
-        _name.userInteractionEnabled = YES;
-        _name.numberOfLines = 1;
-        _name.textColor = [UIColor whiteColor];
-        _name.font = [UIFont systemFontOfSize:16];
-        _name.attributedText = [self createAttributedImageName:@"mine_code" string:@"张晓文" isFront:NO];
-        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(nameTapDidClicked:)];
-        [_name addGestureRecognizer:tap];
-        
-    }
-    return _name;
-}
-- (UILabel *)certification {
-    if (!_certification) {
-        _certification = [[UILabel alloc] init];
-        _certification.numberOfLines = 1;
-        _certification.textColor = [UIColor whiteColor];
-        _certification.font = [UIFont systemFontOfSize:16];
-        _certification.attributedText = [self createAttributedImages:@[@"mine_overbadge",@"mine_common", @"mine_wjj_certification"]];
-    }
-    return _certification;
-}
-- (UILabel *)address {
-    if (!_address) {
-        _address = [[UILabel alloc] init];
-        _address.numberOfLines = 1;
-        _address.textColor = [UIColor colorWithRed:140/255.0 green:140/255.0 blue:142/255.0 alpha:1.0];
-        _address.font = [UIFont systemFontOfSize:13];
-        _address.attributedText = [self createAttributedImageName:@"mine_location" string:@"北京海淀区花园桥" isFront:YES];
+- (UIImageView *)qrcode {
+    if (!_qrcode) {
+        _qrcode = [[UIImageView alloc] init];
+        _qrcode.backgroundColor = [UIColor greenColor];
+        _qrcode.image = [SGQRCodeObtain generateQRCodeWithData:@"群组id" size:220.0 logoImage:nil ratio:0.2];
     }
-    return _address;
+    return _qrcode;
 }
-- (UIButton *)sign {
-    if (!_sign) {
-        _sign = [UIButton buttonWithType:UIButtonTypeCustom];
-        _sign.frame = CGRectMake(0, 0, 105, 32);
-        _sign.backgroundColor = [[UIColor whiteColor] colorWithAlphaComponent:0.2];
-        [_sign setTitle:@"签到赚积分" forState:UIControlStateNormal];
-        _sign.titleLabel.font = [UIFont systemFontOfSize:13.0];
-        [_sign setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        UIImage *xw_image = [self xw_getImageName:@"sign_in_soccer" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveGroupQrCodeView class]];
-        [_sign setImage:xw_image forState:UIControlStateNormal];
-        [_sign addTarget:self action:@selector(signDidClicked:) forControlEvents:UIControlEventTouchUpInside];
-        UIBezierPath *maskPath = [UIBezierPath bezierPathWithRoundedRect:_sign.layer.bounds byRoundingCorners:UIRectCornerBottomLeft | UIRectCornerTopLeft cornerRadii:CGSizeMake(16, 16)];
-        CAShapeLayer *maskLayer = [CAShapeLayer layer];
-        maskLayer.frame = _sign.bounds;
-        maskLayer.path = maskPath.CGPath;
-        _sign.layer.mask = maskLayer;
-    }
-    return _sign;
-}
-
-#pragma mark - 响应方法
-- (void)headerTapDidClicked:(UITapGestureRecognizer *)tap{
-    
+- (UILabel *)desc {
+    if (!_desc) {
+        _desc = [[UILabel alloc] init];
+        _desc.textColor = [UIColor colorWithRed:153/255.0 green:153/255.0 blue:153/255.0 alpha:1.0];
+        _desc.font = UIFontMake(15);
+        _desc.numberOfLines = 1;
+        _desc.text = @"用“网家家”扫描二维码，加入该群";
+        _desc.textAlignment = NSTextAlignmentCenter;
+    }
+    return _desc;
 }
 /**
@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UIView *navView;
 @property (nonatomic, strong) UIButton *left;
 @property (nonatomic, strong) UILabel *title;
-@property (nonatomic, strong) UIButton *right;
+@property (nonatomic, strong, nullable) UIButton *right;
 @end
@@ -57,6 +57,7 @@ static const NSInteger margin = 15;
 - (UIButton *)left {
     if (!_left) {
         _left= [UIButton buttonWithType:UIButtonTypeSystem];
+        _left.adjustsImageWhenHighlighted = NO;
         _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
         UIImage *image = [self xw_getImageName:@"mine_back_white_b" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveQrCodeNavigationBar class]];
         [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
+//
+//  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
@@ -9,6 +9,8 @@
 #import "CNLIVEAppDelegate.h"
 #import "CNLiveMyQrCodeController.h"
 #import "CNLiveScanQrCodeController.h"
+#import "CNLiveGroupQrCodeController.h"
+#import "CNLiveScanResultController.h"
 @implementation CNLIVEAppDelegate
@@ -18,8 +20,8 @@
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    CNLiveScanQrCodeController *vc = [[CNLiveScanQrCodeController alloc] init];
-   
+    CNLiveScanResultController *vc = [[CNLiveScanResultController alloc] init];
+    vc.jump_URL = @"http://www.baidu.com";
     UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
     self.window.rootViewController = nav;//设置根视图控制器
@@ -2,14 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSCameraUsageDescription</key>
-    <string>App需要您的同意,才能访问相机</string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string>App需要您的同意,才能访问麦克风</string>
-    <key>NSPhotoLibraryAddUsageDescription</key>
-    <string>App需要您的同意,才能访问相册</string>
-    <key>NSPhotoLibraryUsageDescription</key>
-    <string>App需要您的同意,才能访问相册</string>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -32,6 +29,14 @@
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>App需要您的同意,才能访问相机</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>App需要您的同意,才能访问麦克风</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>App需要您的同意,才能访问相册</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>App需要您的同意,才能访问相册</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -43,8 +48,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>