no message

zhangxiaowen
1 parent 2bf37f4f
Showing 12 changed files with 96 additions and 154 deletions
CNLiveLoginModule.podspec
CNLiveLoginModule/Classes/Controller/CNLiveLoginController.m
CNLiveLoginModule/Classes/Model/CNLiveLoginRequestModel.m
CNLiveLoginModule/Classes/ThreeLogin/CNLiveBindingTelController.m
CNLiveLoginModule/Classes/ThreeLogin/CNLiveBindingTelView.m
CNLiveLoginModule/Classes/ThreeLogin/CNLiveThreeLoginView.m
CNLiveLoginModule/Classes/View/CNLiveCompleteInfoView.m
CNLiveLoginModule/Classes/View/CNLiveLoginCountryView.m
CNLiveLoginModule/Classes/View/CNLiveLoginNavigationBar.m
CNLiveLoginModule/Classes/View/CNLiveLoginView.m
Example/CNLiveLoginModule.xcodeproj/project.pbxproj
Example/CNLiveLoginModule/CNLIVEAppDelegate.m
@@ -111,6 +111,9 @@ TODO: 网家家-登录模块.
   s.dependency 'tingyunApp', '~>2.14.0'
+  # 类别
+  s.dependency 'CNLiveCategory'
+
   s.static_framework = true
 end
@@ -13,6 +13,7 @@
 #import "YYKit.h"
 #import "CNLiveUserAgreementManager.h"
+#import "CNLiveCategory.h"
 #import "CNLiveLoginView.h"
 #import "CNLiveThreeLoginView.h"
@@ -143,7 +144,7 @@
         _close = [UIButton buttonWithType:UIButtonTypeCustom];
         _close.frame = CGRectMake(SCREEN_WIDTH-44-10, StatusBarHeight, 44, 44);
         _close.hidden = !self.isShowClose;
-        UIImage *image = [self xw_getImageName:@"login_close" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+        UIImage *image = [UIImage cn_getImageName:@"login_close" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
         [_close setImage:image forState:UIControlStateNormal];
         [_close addTarget:self action:@selector(closeDidSelected:) forControlEvents:UIControlEventTouchUpInside];
         _close.adjustsImageWhenHighlighted = NO;
@@ -152,20 +153,4 @@
 }
-/**
- *  创建图片
- *
- *  @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
@@ -28,7 +28,6 @@
             if (responseObject && ![responseObject isKindOfClass:[NSNull class]] && [responseObject isKindOfClass:[NSDictionary class]] && [[responseObject allKeys] containsObject:@"data"] && [[responseObject objectForKey:@"data"] isKindOfClass:[NSDictionary class]]) {
                 NSNumber *code = responseObject[@"errorCode"];
                 if (code && code.intValue == 0) {
-//                    self.userSig = responseObject[@"data"][@"token"];
                     if (successBlock) {
                         successBlock(responseObject[@"data"][@"token"]);
                     }
@@ -12,12 +12,15 @@
 #import "NSAttributedString+YYText.h"
 #import "QMUIKit.h"
+#import "CNLiveLoginNavigationBar.h"
 #import "CNLiveBindingTelView.h"
-@interface CNLiveBindingTelController()<CNLiveBindingTelViewDelegate>
+@interface CNLiveBindingTelController()<CNLiveBindingTelViewDelegate, CNLiveLoginNavigationBarDelegate>
 @property (nonatomic, assign) CNLiveThreeLoginType type;
-@property (nonatomic, weak) CNLiveBindingTelView *bindingTelView;
-@property (nonatomic, weak) YYLabel *protocol;
+@property (nonatomic, strong) CNLiveLoginNavigationBar *navigationBar;
+
+@property (nonatomic, strong) CNLiveBindingTelView *bindingTelView;
+@property (nonatomic, strong) YYLabel *protocol;
 @end
@@ -26,11 +29,15 @@
     self = [super init];
     if (self) {
         self.type = type;
-
     }
     return self;
 }
+#pragma mark - 生命周期
+- (void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    self.navigationController.navigationBarHidden = YES;
+}
 - (void)viewDidLoad {
     [super viewDidLoad];
@@ -40,34 +47,10 @@
     self.extendedLayoutIncludesOpaqueBars = YES;
     self.edgesForExtendedLayout = UIRectEdgeBottom;
     self.view.backgroundColor = [UIColor whiteColor];
-    self.title = @"绑定手机号";
-
-    CNLiveBindingTelView *bindingTelView = [[CNLiveBindingTelView alloc] initWithFrame:CGRectMake(self.view.frame.size.width/8.0, NavigationContentTop, self.view.frame.size.width*3/4.0, 400) type:self.type];
-    bindingTelView.delegate = self;
-    [self.view addSubview:bindingTelView];
-    self.bindingTelView = bindingTelView;
-    YYLabel *protocol = [[YYLabel alloc] initWithFrame:CGRectMake(0, self.view.frame.size.height-30-NavigationContentTop-SafeAreaInsetsConstantForDeviceWithNotch.bottom, self.view.frame.size.width, 30)];
-    protocol.textAlignment = NSTextAlignmentCenter;
-    protocol.textColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
-    protocol.font = [UIFont systemFontOfSize:14.0];
-    NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:@"已阅读并同意《账户绑定确认书(网家家)》"];
-    NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
-    style.alignment = NSTextAlignmentCenter;//对齐方式
-    [text addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, text.length)];
-    text.color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
-    text.font = [UIFont systemFontOfSize:14.0];
-    __weak typeof(self) weakSelf = self;
-    [text setTextHighlightRange:NSMakeRange(7, 12) color:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-        if(!strongSelf) return;
-        [strongSelf.view endEditing:YES];
-//        [XWAgreementManager jumpToAgreementH5WithType:XWAgreementTypeBindingLogin];
-
-    }];
-    protocol.attributedText = text;
-    [self.view addSubview:protocol];
-    self.protocol = protocol;
+    [self.view addSubview:self.navigationBar];
+    [self.view addSubview:self.bindingTelView];
+    [self.view addSubview:self.protocol];
 }
@@ -80,6 +63,19 @@
 - (void)bindingSuccess:(CNLiveBindingTelView *)view type:(CNLiveThreeLoginType)type{
 }
+#pragma mark - CNLiveLoginNavigationBarDelegate
+- (void)navigationBar:(CNLiveLoginNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
+    if ([actionEvents isEqualToString:@"1"]) {
+        if (self.navigationController.topViewController == self) {
+            [self.navigationController popViewControllerAnimated:YES];
+        }else{
+            [self dismissViewControllerAnimated:YES completion:nil];
+        }
+        
+    }else if ([actionEvents isEqualToString:@"2"]){
+        
+    }
+}
 /*
 #pragma mark - Navigation
@@ -90,5 +86,50 @@
     // Pass the selected object to the new view controller.
 }
 */
+#pragma mark - 懒加载
+- (CNLiveLoginNavigationBar *)navigationBar {
+    if (!_navigationBar) {
+        _navigationBar = [[CNLiveLoginNavigationBar alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, NavigationContentTop)];
+        _navigationBar.backgroundColor = [UIColor whiteColor];
+        _navigationBar.delegate = self;
+        _navigationBar.title.text = @"绑定手机号";
+        _navigationBar.right = nil;
+    }
+    return _navigationBar;
+}
+
+- (CNLiveBindingTelView *)bindingTelView {
+    if (!_bindingTelView) {
+        _bindingTelView = [[CNLiveBindingTelView alloc] initWithFrame:CGRectMake(self.view.frame.size.width/8.0, NavigationContentTop, self.view.frame.size.width*3/4.0, 400) type:self.type];
+        _bindingTelView.delegate = self;
+    }
+    return _bindingTelView;
+}
+
+- (YYLabel *)protocol {
+    if (!_protocol) {
+        _protocol = [[YYLabel alloc] initWithFrame:CGRectMake(0, self.view.frame.size.height-30-NavigationContentTop-SafeAreaInsetsConstantForDeviceWithNotch.bottom, self.view.frame.size.width, 30)];
+        _protocol.textAlignment = NSTextAlignmentCenter;
+        _protocol.textColor = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
+        _protocol.font = [UIFont systemFontOfSize:14.0];
+        NSMutableAttributedString *text = [[NSMutableAttributedString alloc] initWithString:@"已阅读并同意《账户绑定确认书(网家家)》"];
+        NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+        style.alignment = NSTextAlignmentCenter;//对齐方式
+        [text addAttribute:NSParagraphStyleAttributeName value:style range:NSMakeRange(0, text.length)];
+        text.color = [UIColor colorWithRed:173/255.0 green:173/255.0 blue:173/255.0 alpha:1.0];
+        text.font = [UIFont systemFontOfSize:14.0];
+        __weak typeof(self) weakSelf = self;
+        [text setTextHighlightRange:NSMakeRange(7, 12) color:[UIColor colorWithRed:35/255.0 green:212/255.0 blue:30/255.0 alpha:1.0] backgroundColor:[UIColor clearColor] tapAction:^(UIView * _Nonnull containerView, NSAttributedString * _Nonnull text, NSRange range, CGRect rect) {
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if(!strongSelf) return;
+            [strongSelf.view endEditing:YES];
+    //        [XWAgreementManager jumpToAgreementH5WithType:XWAgreementTypeBindingLogin];
+
+        }];
+        _protocol.attributedText = text;
+    
+    }
+    return _protocol;
+}
 @end
@@ -9,6 +9,7 @@
 #import "CNLiveBindingTelView.h"
 #import "YYKit.h"
 #import "QMUIKit.h"
+#import "CNLiveCategory.h"
 #import "CNLiveLoginCountryView.h"
 #import "CNLiveLoginTextField.h"
@@ -78,7 +79,7 @@ static const NSInteger timeValue = 1.5;
     countDown.dataSource = self;
     countDown.delegate = self;
     countDown.frame = CGRectMake(frame.size.width-80, account.bottom+space+10, 80, rowHeight-10);
-    UIImage *image2 = [self xw_getImageName:@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+    UIImage *image2 = [UIImage cn_getImageName:@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
     [countDown setImage:image2 forState:UIControlStateNormal];
     countDown.adjustsImageWhenHighlighted = NO;
     [countDown setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
@@ -253,7 +254,7 @@ static const NSInteger timeValue = 1.5;
     button.backgroundColor = [UIColor whiteColor];
     button.userInteractionEnabled = YES;
     [button setTitle:@"" forState:UIControlStateNormal];
-    UIImage *image2 = [self xw_getImageName:@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+    UIImage *image2 = [UIImage cn_getImageName:@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
     [button setImage:image2 forState:UIControlStateNormal];
 }
@@ -292,20 +293,5 @@ static const NSInteger timeValue = 1.5;
 }
-/**
- *  创建图片
- *
- *  @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
@@ -8,6 +8,7 @@
 #import "CNLiveThreeLoginView.h"
 #import "YYKit.h"
+#import "CNLiveCategory.h"
 //#import "WXApi.h"
@@ -56,7 +57,7 @@ static NSInteger const rowHeight = 80;
         UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
         btn.tag = 10000+i;
         btn.frame = CGRectMake(btnWidth*i, name.bottom, btnWidth, rowHeight);
-        UIImage *image = [self xw_getImageName:pics[i] bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+        UIImage *image = [UIImage cn_getImageName:pics[i] bundleName:@"CNLiveLoginModule" targetClass:[self class]];
         [btn setImage:image forState:UIControlStateNormal];
         btn.adjustsImageWhenHighlighted = NO;
         [btn addTarget:self action:@selector(btnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
@@ -103,20 +104,4 @@ static NSInteger const rowHeight = 80;
 }
 */
-/**
- *  创建图片
- *
- *  @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
@@ -25,6 +25,8 @@
 #import "CommonLibrary.h"
 #import "NBSAppAgent.h"
 #import "CNLiveBusinessTools.h"
+#import "CNLiveCategory.h"
+
 #import "CNLiveLoginRequestModel.h"
 @interface CNLiveCompleteInfoView()<UITextFieldDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate,TZImagePickerControllerDelegate,QMUIAlertControllerDelegate>{
@@ -60,7 +62,7 @@ static const NSInteger timeValue = 1.5;
     head.layer.cornerRadius = 40;
     head.layer.masksToBounds = YES;
     head.adjustsImageWhenHighlighted = NO;
-    UIImage *image = [self xw_getImageName:@"login_camera" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+    UIImage *image = [UIImage cn_getImageName:@"login_camera" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
     [head setImage:image forState:UIControlStateNormal];
     [head addTarget:self action:@selector(headDidClicked:) forControlEvents:UIControlEventTouchUpInside];
     [self addSubview:head];
@@ -346,20 +348,4 @@ static const NSInteger timeValue = 1.5;
 }
 */
-/**
- *  创建图片
- *
- *  @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
@@ -8,6 +8,7 @@
 #import "CNLiveLoginCountryView.h"
 #import "YYKit.h"
+#import "CNLiveCategory.h"
 #import "CNLiveChooseCountryController.h"
@@ -46,7 +47,7 @@
     [code setTitle:[NSString stringWithFormat:@"+%@",_countryCode] forState:UIControlStateNormal];
     [code setTitleColor:[UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0] forState:UIControlStateNormal];
     code.titleLabel.font = [UIFont systemFontOfSize:14];
-    UIImage *image = [self xw_getImageName:@"login_country" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+    UIImage *image = [UIImage cn_getImageName:@"login_country" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
     [code setImage:image forState:UIControlStateNormal];
     code.adjustsImageWhenHighlighted = NO;
     //button图片的偏移量，距上左下右分别(0, 0, 0, 0)像素点
@@ -88,20 +89,4 @@
     }
 }
-/**
- *  创建图片
- *
- *  @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
@@ -8,6 +8,7 @@
 #import "CNLiveLoginNavigationBar.h"
 #import "QMUIKit.h"
+#import "CNLiveCategory.h"
 @interface CNLiveLoginNavigationBar ()
@@ -59,7 +60,7 @@ static const NSInteger margin = 15;
         _left= [UIButton buttonWithType:UIButtonTypeCustom];
         _left.adjustsImageWhenHighlighted = NO;
         _left.frame = CGRectMake(margin, StatusBarHeight, NavigationBarHeight, NavigationBarHeight);
-        UIImage *image = [self xw_getImageName:@"mine_back_black_b" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+        UIImage *image = [UIImage cn_getImageName:@"mine_back_black_b" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
         [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
         _left.titleLabel.font = [UIFont systemFontOfSize:15];
         [_left setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
@@ -103,21 +104,4 @@ static const NSInteger margin = 15;
     }
 }
-/**
- *  创建图片
- *
- *  @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
@@ -15,6 +15,7 @@
 #import <CNLiveUserSystemSDK/CNLiveUserSystemTypeDef.h>
 #import "CNUserInfoManager.h"
 #import "CNLiveEnvironment.h"
+#import "CNLiveCategory.h"
 #import "CNLiveLoginCountryView.h"
 #import "CNLiveLoginTextField.h"
@@ -56,7 +57,7 @@ static const NSInteger timeValue = 1.5;
 }
 - (void)createSubviews:(CGRect)frame{
     UIImageView *logo = [[UIImageView alloc] initWithFrame:CGRectMake((frame.size.width-75)/2.0, 0, 75, 100)];
-    UIImage *image = [self xw_getImageName:@"login_logo" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+    UIImage *image = [UIImage cn_getImageName:@"login_logo" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
     logo.image = image;
     [self addSubview:logo];
     self.logo = logo;
@@ -96,7 +97,7 @@ static const NSInteger timeValue = 1.5;
     countDown.dataSource = self;
     countDown.delegate = self;
     countDown.frame = CGRectMake(frame.size.width-80, account.bottom+space+10, 80, rowHeight-10);
-    UIImage *image2 = [self xw_getImageName:@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+    UIImage *image2 = [UIImage cn_getImageName:@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
     [countDown setImage:image2 forState:UIControlStateNormal];
     countDown.adjustsImageWhenHighlighted = NO;
     [countDown setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
@@ -296,7 +297,7 @@ static const NSInteger timeValue = 1.5;
     button.backgroundColor = [UIColor whiteColor];
     button.userInteractionEnabled = YES;
     [button setTitle:@"" forState:UIControlStateNormal];
-    UIImage *image2 = [self xw_getImageName:@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
+    UIImage *image2 = [UIImage cn_getImageName:@"login_get_code" bundleName:@"CNLiveLoginModule" targetClass:[self class]];
     [button setImage:image2 forState:UIControlStateNormal];
 }
@@ -357,20 +358,4 @@ static const NSInteger timeValue = 1.5;
     }
 }
-/**
- *  创建图片
- *
- *  @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
@@ -335,6 +335,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCacheManagerKit/CNLiveCacheManagerKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
@@ -365,6 +366,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCacheManagerKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveChooseCountry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
@@ -50,6 +50,7 @@
     }];
     CNLiveLoginController *vc = [[CNLiveLoginController alloc] init];
+    vc.isShowClose = YES;
     UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:vc];
     self.window.rootViewController = nav;//设置根视图控制器
     [self.window makeKeyAndVisible];//设置成为