no message

zhangxiaowen
1 parent dd5a2268
Showing 9 changed files with 14 additions and 14 deletions
CNLiveQrCodeModule/Classes/Controller/CNLiveGenerateQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveGroupQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveMyQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveScanQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveScanResultController.m
CNLiveQrCodeModule/Classes/View/CNLiveGenerateCodeView.m
CNLiveQrCodeModule/Classes/View/CNLiveGroupQrCodeView.m
CNLiveQrCodeModule/Classes/View/CNLiveMyQrCodeView.m
CNLiveQrCodeModule/Classes/View/CNLiveQrCodeNavigationBar.m
@@ -235,7 +235,7 @@ static const CGFloat timeValue = 1.5;
         _navigationBar = [[CNLiveQrCodeNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
         _navigationBar.delegate = self;
         _navigationBar.title.text = @"生成二维码";
-        UIImage *image2 = [UIImage cn_getImageName:@"mine_code_more" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
+        UIImage *image2 = [self getImageWithImageName:@"mine_code_more" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
         [_navigationBar.right setImage:[image2 imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
     }
     return _navigationBar;
@@ -87,7 +87,7 @@ static const CGFloat timeValue = 1.5;
         _navigationBar = [[CNLiveQrCodeNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
         _navigationBar.backgroundColor = [UIColor whiteColor];
         _navigationBar.delegate = self;
-        UIImage *image = [UIImage cn_getImageName:@"code_back_black_b" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveGroupQrCodeController class]];
+        UIImage *image = [self getImageWithImageName:@"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];
@@ -229,7 +229,7 @@ static const CGFloat timeValue = 1.5;
 - (UIImageView *)bgView{
     if(!_bgView){
         _bgView = [[UIImageView alloc]initWithFrame:self.view.bounds];
-        UIImage *image = [UIImage cn_getImageName:@"qr_code_bg" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeController class]];
+        UIImage *image = [self getImageWithImageName:@"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) {
         }];
     }
@@ -248,7 +248,7 @@ static const CGFloat timeValue = 1.5;
         _navigationBar = [[CNLiveQrCodeNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
         _navigationBar.delegate = self;
         _navigationBar.title.text = @"我的二维码";
-        UIImage *image2 = [UIImage cn_getImageName:@"mine_code_more" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeController class]];
+        UIImage *image2 = [self getImageWithImageName:@"mine_code_more" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeController class]];
         [_navigationBar.right setImage:[image2 imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
     }
     return _navigationBar;
@@ -300,8 +300,8 @@ static const CGFloat timeValue = 1.5;
         CGFloat flashlightBtnX = 0.5 * (self.view.frame.size.width - flashlightBtnW);
         CGFloat flashlightBtnY = 0.55 * self.view.frame.size.height;
         _flashlightBtn.frame = CGRectMake(flashlightBtnX, flashlightBtnY, flashlightBtnW, flashlightBtnH);
-        UIImage *image1 = [UIImage cn_getImageName:@"flashlight_close" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanQrCodeController class]];
-        UIImage *image2 = [UIImage cn_getImageName:@"flashlight_open" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanQrCodeController class]];
+        UIImage *image1 = [self getImageWithImageName:@"flashlight_close" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanQrCodeController class]];
+        UIImage *image2 = [self getImageWithImageName:@"flashlight_open" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanQrCodeController class]];
         [_flashlightBtn setImage:image1 forState:UIControlStateNormal];
         [_flashlightBtn setImage:image2 forState:UIControlStateSelected];
         [_flashlightBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
@@ -343,7 +343,7 @@ static const CGFloat timeValue = 1.5;
         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 = [UIImage cn_getImageName:@"qr_code_green" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanQrCodeController class]];
+        UIImage *image = [self getImageWithImageName:@"qr_code_green" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanQrCodeController class]];
         [_codeButton setImage:image forState:UIControlStateNormal];
         [_codeButton setTitle:@"我的二维码" forState:UIControlStateNormal];
         _codeButton.titleLabel.font = [UIFont fontWithName:@"PingFang-SC-Regular" size:15.0f];
@@ -79,7 +79,7 @@
         _navigationBar.title.textColor = [UIColor blackColor];
         _navigationBar.delegate = self;
-        UIImage *image = [UIImage cn_getImageName:@"code_back_black_b" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanResultController class]];
+        UIImage *image = [self getImageWithImageName:@"code_back_black_b" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveScanResultController class]];
         [_navigationBar.left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
         _navigationBar.right = nil;
@@ -98,7 +98,7 @@ static const NSInteger margin = 20;
     NSString *jsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    UIImage *xw_image = [UIImage cn_getImageName:@"qr_code_icon" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
+    UIImage *xw_image = [self getImageWithImageName:@"qr_code_icon" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
     [self.qrCode sd_setImageWithURL:nil placeholderImage:[SGQRCodeObtain generateQRCodeWithData:jsonStr size:SCREEN_WIDTH-12*margin logoImage:xw_image ratio:0.2]];
 }
@@ -124,7 +124,7 @@ static const NSInteger margin = 20;
         _header = [[UIImageView alloc] init];
         _header.layer.masksToBounds = YES;
         _header.layer.cornerRadius = 5;
-        UIImage *xw_image = [UIImage cn_getImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
+        UIImage *xw_image = [self getImageWithImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
         [_header sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
     }
     return _header;
@@ -106,7 +106,7 @@ static const NSInteger margin = 15;
     if (!_groupHead) {
         _groupHead = [[UIImageView alloc] init];
         _groupHead.backgroundColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
-        UIImage *xw_image = [UIImage cn_getImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
+        UIImage *xw_image = [self getImageWithImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
         [_groupHead sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
     }
@@ -124,7 +124,7 @@ static const CGFloat timeValue = 1.5;
             NSData *jsonData = [NSJSONSerialization dataWithJSONObject:jsonDic options:NSJSONWritingPrettyPrinted error:nil];
             NSString *jsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-            UIImage *xw_image = [UIImage cn_getImageName:@"qr_code_icon" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeView class]];
+            UIImage *xw_image = [self getImageWithImageName:@"qr_code_icon" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeView class]];
             [strongSelf.qrCode sd_setImageWithURL:nil placeholderImage:[SGQRCodeObtain generateQRCodeWithData:jsonStr size:SCREEN_WIDTH-12*margin logoImage:xw_image ratio:0.2]];
             if([type isEqualToString:@"reset"]){
@@ -162,7 +162,7 @@ static const CGFloat timeValue = 1.5;
         _header = [[UIImageView alloc] init];
         _header.layer.masksToBounds = YES;
         _header.layer.cornerRadius = 5;
-        UIImage *xw_image = [UIImage cn_getImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
+        UIImage *xw_image = [self getImageWithImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
         [_header sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
     }
     return _header;
@@ -60,7 +60,7 @@ static const NSInteger margin = 15;
         _left= [UIButton buttonWithType:UIButtonTypeCustom];
         _left.adjustsImageWhenHighlighted = NO;
         _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
-        UIImage *image = [UIImage cn_getImageName:@"mine_back_white_b" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveQrCodeNavigationBar class]];
+        UIImage *image = [self getImageWithImageName:@"mine_back_white_b" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveQrCodeNavigationBar class]];
         [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
         [_left setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
         [_left addTarget:self action:@selector(goBack) forControlEvents:UIControlEventTouchUpInside];