no message

zhangxiaowen
1 parent c421b988
Showing 4 changed files with 34 additions and 35 deletions
CNLiveQrCodeModule/Classes/Controller/CNLiveGroupQrCodeController.m
CNLiveQrCodeModule/Classes/View/CNLiveGroupQrCodeView.m
CNLiveQrCodeModule/Classes/View/CNLiveMyQrCodeView.m
Example/CNLiveQrCodeModule/CNLIVEAppDelegate.m
@@ -89,7 +89,7 @@ static const CGFloat timeValue = 1.5;
 }
 - (CNLiveGroupQrCodeView *)groupView {
     if (!_groupView) {
-        _groupView = [[CNLiveGroupQrCodeView alloc] initWithFrame:CGRectMake(0, 0, 310, 342)];
+        _groupView = [[CNLiveGroupQrCodeView alloc] initWithFrame:CGRectMake(0, 0, 310, 450)];
         _groupView.center = CGPointMake(self.view.center.x, self.view.center.y-20);
         _groupView.layer.masksToBounds = YES;
         _groupView.layer.cornerRadius = 10;
@@ -172,8 +172,6 @@ static const CGFloat timeValue = 1.5;
 #pragma mark - 分享二维码
 - (void)shareDidClicked:(UIButton *)btn{
     UIImage *image = [self generateImage:self.groupView];
-    NSArray *imageArray = @[@"sport_china_download"].copy;
-    NSArray *titleArray = @[@"保存"].copy;
 //    [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) {
@@ -11,6 +11,7 @@
 #import <SDWebImage/SDWebImage.h>
 #import "QMUIKit.h"
 #import "SGQRCode.h"//二维码库
+#import "MJExtension.h"
 #import "CNUserInfoManager.h"
 #import "CNLiveCategory.h"
@@ -22,7 +23,7 @@
 @interface CNLiveGroupQrCodeView()
 @property (nonatomic, strong) UIImageView *groupHead;
 @property (nonatomic, strong) UILabel *groupName;
-@property (nonatomic, strong) UIImageView *qrcode;
+@property (nonatomic, strong) UIImageView *qrCode;
 @property (nonatomic, strong) UILabel *desc;
 @end
@@ -56,8 +57,8 @@ static const NSInteger margin = 15;
     }];
-    [self addSubview:self.qrcode];
-    [self.qrcode mas_makeConstraints:^(MASConstraintMaker *make) {
+    [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);
@@ -68,8 +69,8 @@ static const NSInteger margin = 15;
     [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);
+        make.top.mas_equalTo(self.qrCode.mas_bottom);
+        make.bottom.mas_equalTo(self.mas_bottom);
    }];
 }
@@ -86,23 +87,22 @@ static const NSInteger margin = 15;
     _group = group;
     if(group.avatorIcon){
         _groupHead.image = group.avatorIcon;
+        
     }else{
 //        [_groupHead setImageWithGroupId:group.groupInfo.groupId];
     }
     _groupName.text = group.groupInfo.groupName;
-//    [QMUITips showLoadingInView:self];
-//    [[CNGroupActiveViewModel sharedCNGroupActiveViewModel] requestServerForDownloadAppActionUrlSourceCompleterBlock:^(NSString *shareUrl) {
-//        [QMUITips hideAllTipsInView:self];
-//        NSString *wjjQr = [EncryptAndDecrypt base64StringFromText:[@{@"content":[@{@"groupId":CNLiveStringIsEmpty(group.groupInfo.groupId)?@"":group.groupInfo.groupId,@"groupName":group.groupInfo.groupName} mj_JSONString],@"type":@"groupQrType"} mj_JSONString] encryptKey:@"cnliveIm"];
-//        NSString *qrCode = [NSString stringWithFormat:@"%@wjjQrSkipType=wjjQrPublicGroupType&isWjjQr=%@",shareUrl,wjjQr];
-//        self.qrcode.image = [SGQRCodeGenerateManager generateWithLogoQRCodeData:qrCode logoImageName:nil logoScaleToSuperView:0.2];
-//
-//        UIImage *xw_image = [self getImageWithImageName:@"qr_code_icon" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
-//        [strongSelf.qrCode sd_setImageWithURL:nil placeholderImage:[SGQRCodeObtain generateQRCodeWithData:jsonStr size:SCREEN_WIDTH-12*margin logoImage:xw_image ratio:0.2]];
-//
-//    }];
+    NSString *groupId = CNLiveStringIsEmpty(group.groupInfo.groupId)?@"":group.groupInfo.groupId;
+    NSString *wjjQr = [NSString base64StringFromText:[@{@"content":[@{@"groupId":groupId,@"groupName":@"group.groupInfo.groupName"} mj_JSONString],@"type":@"groupQrType"} mj_JSONString] encryptKey:@"cnliveIm"];
+    NSString *jsonStr = [NSString stringWithFormat:@"%@wjjQrSkipType=wjjQrPublicGroupType&isWjjQr=%@",@"shareUrl",wjjQr];
+    UIImage *xw_image = [self getImageWithImageName:@"qr_code_icon" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
+    UIImage *image = [SGQRCodeObtain generateQRCodeWithData:jsonStr size:220.0 logoImage:xw_image ratio:0.2];
+
+    _qrCode.image = image;
+    [[SDImageCache sharedImageCache] storeImage:image forKey:groupId toDisk:YES completion:NULL];
+    
 }
 #pragma mark - Getter
@@ -111,8 +111,7 @@ static const NSInteger margin = 15;
         _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 = [self getImageWithImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
-        [_groupHead sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
-
+        _groupHead.image = xw_image;
     }
     return _groupHead;
 }
@@ -123,18 +122,20 @@ static const NSInteger margin = 15;
         _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 = @"张晓文";
+        _groupName.text = @"";
     }
     return _groupName;
 }
-- (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];
+- (UIImageView *)qrCode {
+    if (!_qrCode) {
+        _qrCode = [[UIImageView alloc] init];
+        _qrCode.backgroundColor = [UIColor greenColor];
+        NSString *groupId = CNLiveStringIsEmpty(self.group.groupInfo.groupId)?@"":self.group.groupInfo.groupId;
+        UIImage *image = [[SDImageCache sharedImageCache] imageFromDiskCacheForKey:groupId];
+        _qrCode.image = image;
     }
-    return _qrcode;
+    return _qrCode;
 }
 - (UILabel *)desc {
@@ -142,9 +143,10 @@ static const NSInteger margin = 15;
         _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;
+        _desc.numberOfLines = 0;
+        _desc.lineBreakMode = NSLineBreakByWordWrapping;
+        _desc.textAlignment = NSTextAlignmentLeft;
+        _desc.text = @">>保存到手机:用户有网家家客户端前提下,可以直接识别二维码进群聊天\n\n>>分享二维码:用户需先点击识别二维 码下载网家家客户端后,在已登录状态下,直接进入申请加群界面,点击“申请加群”按钮,进群聊天";
     }
     return _desc;
 }
@@ -140,7 +140,7 @@ static const CGFloat timeValue = 1.5;
             UIImage *xw_image = [self getImageWithImageName:@"qr_code_icon" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeView class]];
             UIImage *image = [SGQRCodeObtain generateQRCodeWithData:jsonStr size:SCREEN_WIDTH-12*margin logoImage:xw_image ratio:0.2];
-            [strongSelf.qrCode sd_setImageWithURL:nil placeholderImage:image];
+            strongSelf.qrCode.image = image;
             [[SDImageCache sharedImageCache] storeImage:image forKey:CNUserShareModel.uid toDisk:YES completion:NULL];
             if([type isEqualToString:@"reset"]){
@@ -184,8 +184,7 @@ static const CGFloat timeValue = 1.5;
         _header = [[UIImageView alloc] init];
         _header.layer.masksToBounds = YES;
         _header.layer.cornerRadius = 5;
-        UIImage *xw_image = [self getImageWithImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[self class]];
-        [_header sd_setImageWithURL:[NSURL URLWithString:CNUserShareModel.faceUrl] placeholderImage:xw_image];
+        _header.image = [[SDImageCache sharedImageCache] imageFromDiskCacheForKey:CNUserShareModel.uid];
     }
     return _header;
 }
@@ -63,7 +63,7 @@
     }];
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    CNLiveMyQrCodeController *vc = [[CNLiveMyQrCodeController alloc] init];
+    CNLiveGroupQrCodeController *vc = [[CNLiveGroupQrCodeController alloc] init];
 //    vc.ID = @"http://www.baidu.com";
     UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];