no message

zhangxiaowen
1 parent 9b145d92
Showing 14 changed files with 33 additions and 96 deletions
CNLiveSettingModule.podspec
CNLiveSettingModule/Classes/AboutUs/CNLiveAboutUsController.m
CNLiveSettingModule/Classes/Cancellation/CNLiveCancellationView.m
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingCell.m
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingContentButton.m
CNLiveSettingModule/Classes/FontSIze/CNLiveFontSettingController.m
CNLiveSettingModule/Classes/Privacy/CNLiveNotSeeCollectionViewCell.m
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyContactTableViewCell.m
CNLiveSettingModule/Classes/Privacy/CNLivePrivacyTableViewCell.m
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelController.m
CNLiveSettingModule/Classes/UpdateTel/CNLiveUpdateTelView.m
CNLiveSettingModule/Classes/View/CNLiveSettingCell.m
CNLiveSettingModule/Classes/View/CNLiveSettingNavigationBar.m
Example/CNLiveSettingModule.xcodeproj/project.pbxproj
@@ -153,6 +153,9 @@ TODO: 网家家-设置模块.
   # 管理类
   s.dependency 'CNLiveManager'
+  
+  # 分类
+  s.dependency 'CNLiveCategory'
   s.static_framework = true
@@ -13,6 +13,7 @@
 #import "CNLiveServices.h"
 #import "CNLiveUserAgreementManager.h"
 #import "CNLiveEnvironment.h"
+#import "CNLiveCategory.h"
 #import "CNLiveSettingModel.h"
 #import "CNLiveSettingCell.h"
@@ -259,7 +260,7 @@ static const NSInteger timeValue = 1.5;
         _headerView.clipsToBounds = YES;
         _headerView.backgroundColor = [UIColor colorWithRed:242/255.0 green:242/255.0 blue:242/255.0 alpha:1.0];
         UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake((SCREEN_WIDTH-70)/2.0, 30, 70, 140)];
-        UIImage *image = [self xw_getImageName:@"about_us_icon" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingNavigationBar class]];
+        UIImage *image = [UIImage cn_getImageName:@"about_us_icon" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingNavigationBar class]];
         imageView.image = [image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
         imageView.contentMode = UIViewContentModeScaleAspectFill;
         imageView.clipsToBounds = YES;
@@ -9,6 +9,7 @@
 #import "CNLiveCancellationView.h"
 #import "YYKit.h"
 #import <Masonry/Masonry.h>
+#import "CNLiveCategory.h"
 @interface CNLiveCancellationView()<UITextViewDelegate>
 @property (nonatomic, strong) UIButton *agreeBtn;
@@ -105,9 +106,9 @@ static const NSInteger margin = 15;
 - (UIButton *)agreeBtn{
     if (!_agreeBtn) {
         _agreeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        UIImage *xw_image1 = [self xw_getImageName:@"cancellation_agree" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveCancellationView class]];
+        UIImage *xw_image1 = [UIImage cn_getImageName:@"cancellation_agree" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveCancellationView class]];
-        UIImage *xw_image2 = [self xw_getImageName:@"cancellation_agree_sel" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveCancellationView class]];
+        UIImage *xw_image2 = [UIImage cn_getImageName:@"cancellation_agree_sel" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveCancellationView class]];
         [_agreeBtn setImage:xw_image1 forState:UIControlStateNormal];
         [_agreeBtn setImage:xw_image2 forState:UIControlStateSelected];
@@ -10,6 +10,7 @@
 #import <SDWebImage/SDWebImage.h>
 #import "CNLiveBaseKit.h"
+#import "CNLiveCategory.h"
 #import "CNLiveFontSettingModel.h"
 #import "CNLiveFontSettingFrame.h"
@@ -49,7 +50,7 @@
     // 1.设置头像
     self.headImage.frame = fontSettingFrame.iconFrame;
-    UIImage *image = [self xw_getImageName:@"font_size_logo" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
+    UIImage *image = [UIImage cn_getImageName:@"font_size_logo" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
     [_headImage sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:image];
     // 2.设置内容
@@ -8,6 +8,8 @@
 #import "CNLiveFontSettingContentButton.h"
 #import "CNLiveBaseKit.h"
+#import "CNLiveCategory.h"
+
 #import "CNLiveFontSettingFrame.h"
 #import "CNLiveFontSettingModel.h"
@@ -35,11 +37,11 @@
     CNLiveFontSettingModel *FontSetting = fontSettingFrame.model;
     if ([FontSetting.fromMe isEqualToString:@"1"]) {
-        normal = [self xw_getImageName:@"font_size_message_me" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
+        normal = [UIImage cn_getImageName:@"font_size_message_me" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
         normal = [normal stretchableImageWithLeftCapWidth:normal.size.width * 0.5 topCapHeight:normal.size.height * 0.9];
     }
     else{
-        normal = [self xw_getImageName:@"font_size_message_other" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
+        normal = [UIImage cn_getImageName:@"font_size_message_other" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
         normal = [normal stretchableImageWithLeftCapWidth:normal.size.width * 0.5 topCapHeight:normal.size.height * 0.9];
     }
@@ -11,6 +11,7 @@
 #import "QMUIKit.h"
 #import "CNLiveBaseKit.h"
 #import "CNUserInfoManager.h"
+#import "CNLiveCategory.h"
 #import "CNLiveSettingNavigationBar.h"
 #import "CNLiveFontSettingFrame.h"
@@ -118,7 +119,7 @@
     //背景图
     UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width-70-30, 8)];
     imageView.center = self.slider.center;
-    UIImage *image = [self xw_getImageName:@"font_size_slider" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
+    UIImage *image = [UIImage cn_getImageName:@"font_size_slider" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
     imageView.image = image;
     [bottomView addSubview:imageView];
     [bottomView addSubview:self.slider];
@@ -10,6 +10,7 @@
 #import <SDWebImage/SDWebImage.h>
 #import "QMUIKit.h"
 #import <Masonry/Masonry.h>
+#import "CNLiveCategory.h"
 #import "CNLiveNotSeeModel.h"
@@ -37,14 +38,14 @@
     if(model.type == CNLiveNotSeeModelTypeAdd){
         _avatarImage.layer.masksToBounds = NO;
         _avatarImage.layer.cornerRadius = 0;
-        UIImage *xw_image = [self xw_getImageName:@"privacy_plus" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveNotSeeCollectionViewCell class]];
+        UIImage *xw_image = [UIImage cn_getImageName:@"privacy_plus" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveNotSeeCollectionViewCell class]];
         [_avatarImage sd_setImageWithURL:[NSURL URLWithString:@""] placeholderImage:xw_image];
         _nameLabel.text = @"";
     }else if (model.type == CNLiveNotSeeModelTypeMinus){
         _avatarImage.layer.masksToBounds = NO;
         _avatarImage.layer.cornerRadius = 0;
-        UIImage *xw_image = [self xw_getImageName:@"privacy_less" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveNotSeeCollectionViewCell class]];
+        UIImage *xw_image = [UIImage cn_getImageName:@"privacy_less" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveNotSeeCollectionViewCell class]];
         [_avatarImage sd_setImageWithURL:[NSURL URLWithString:@""] placeholderImage:xw_image];
         _nameLabel.text = @"";
@@ -146,21 +147,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
@@ -9,6 +9,7 @@
 #import "CNLivePrivacyContactTableViewCell.h"
 #import <Masonry/Masonry.h>
 #import "QMUIKit.h"
+#import "CNLiveCategory.h"
 @interface CNLivePrivacyContactTableViewCell ()
 @property (nonatomic, strong) UIImageView *iconImage;
@@ -193,26 +194,10 @@
 - (UIImageView *)moreImage {
     if (!_moreImage) {
-        UIImage *xw_image = [self xw_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyContactTableViewCell class]];
+        UIImage *xw_image = [UIImage cn_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyContactTableViewCell class]];
         _moreImage = [[UIImageView alloc] initWithImage:xw_image];
     }
     return _moreImage;
 }
-/**
- *  创建图片
- *
- *  @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
@@ -14,6 +14,7 @@
 #import "CNLiveNetworking.h"
 #import "CNLiveEnvironment.h"
 #import "CNUserInfoManager.h"
+#import "CNLiveCategory.h"
 #import "CNLivePrivacyModel.h"
@@ -140,7 +141,7 @@ static const NSInteger margin = 12;
 - (UIImageView *)arrowImage {
     if (!_arrowImage) {
         _arrowImage = [[UIImageView alloc] init];
-        UIImage *xw_image = [self xw_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyTableViewCell class]];
+        UIImage *xw_image = [UIImage cn_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLivePrivacyTableViewCell class]];
         _arrowImage.image = xw_image;
     }
     return _arrowImage;
@@ -154,21 +155,4 @@ static const NSInteger margin = 12;
     return _notifiSwitch;
 }
-/**
- *  创建图片
- *
- *  @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/CNLiveUserSystemCenter.h>
 #import "CNUserInfoManager.h"
 #import "NSString+CNLiveExtension.h"
+#import "CNLiveCategory.h"
 #import "CNLiveSettingNavigationBar.h"
 #import "CNLiveUpdateTelView.h"
@@ -201,22 +202,6 @@ 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];
-}
-
 #pragma mark - CNLiveSettingNavigationBarDelegate
 - (void)navigationBar:(CNLiveSettingNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
     if ([actionEvents isEqualToString:@"1"]) {
@@ -14,6 +14,7 @@
 #import <CNLiveUserSystemSDK/CNLiveUserSystemCenter.h>
 #import "NSString+CNLiveExtension.h"
 #import "CNUserInfoManager.h"
+#import "CNLiveCategory.h"
 #define TIMECOUNT 60;
@@ -203,7 +204,7 @@ static const NSInteger timeValue = 1.5;
     if (!_countryImg) {
         _countryImg = [[UIImageView alloc] init];
         _countryImg.userInteractionEnabled = YES;
-        UIImage *image = [self xw_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
+        UIImage *image = [UIImage cn_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[self class]];
         _countryImg.image = image;
         _countryImg.contentMode = UIViewContentModeCenter;
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(countryTap:)];
@@ -314,22 +315,6 @@ static const NSInteger timeValue = 1.5;
 }
 #pragma mark - 私有方法
-/**
- *  创建图片
- *
- *  @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];
-    
-}
 #pragma mark - Action
 - (void)countryTap:(UITapGestureRecognizer *)tap{
@@ -8,6 +8,8 @@
 #import "CNLiveSettingCell.h"
 #import <Masonry/Masonry.h>
+#import "CNLiveCategory.h"
+
 #import "CNLiveSettingModel.h"
 @interface CNLiveSettingCell()
@@ -161,7 +163,7 @@ static const NSInteger margin = 12;
 - (UIImageView *)front {
     if (!_front) {
         _front = [[UIImageView alloc] init];
-        UIImage *xw_image = [self xw_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingCell class]];
+        UIImage *xw_image = [UIImage cn_getImageName:@"mine_info_front" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingCell class]];
         _front.image = xw_image;
         _front.contentMode = UIViewContentModeCenter;
@@ -8,6 +8,7 @@
 #import "CNLiveSettingNavigationBar.h"
 #import "QMUIKit.h"
+#import "CNLiveCategory.h"
 @interface CNLiveSettingNavigationBar ()
@@ -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:@"CNLiveSettingModule" targetClass:[CNLiveSettingNavigationBar class]];
+        UIImage *image = [UIImage cn_getImageName:@"mine_back_black_b" bundleName:@"CNLiveSettingModule" targetClass:[CNLiveSettingNavigationBar class]];
         [_left setImage:[image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] forState:UIControlStateNormal];
         _left.titleLabel.font = [UIFont systemFontOfSize:15];
         [_left setContentHorizontalAlignment:UIControlContentHorizontalAlignmentLeft];
@@ -352,6 +352,7 @@
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseTools/CNLiveBaseTools.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBusinessTools/CNLiveBusinessTools.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCategory/CNLiveCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveChooseCountry/CNLiveChooseCountry.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
@@ -380,6 +381,7 @@
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseTools.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBusinessTools.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}/CNLiveCommonClass.framework",