no message

zhangxiaowen
1 parent efb4111a
Showing 14 changed files with 239 additions and 18 deletions
CNLiveCommonClass.podspec
CNLiveCommonClass/Classes/CNCommonTableViewController.h
CNLiveCommonClass/Classes/CNCommonTableViewController.m
CNLiveCommonClass/Classes/CNCommonView.h
CNLiveCommonClass/Classes/CNCommonView.m
CNLiveCommonClass/Classes/CNCommonViewController.h
CNLiveCommonClass/Classes/CNCommonViewController.m
CNLiveCommonClass/Classes/CNLiveCommonClass.h
CNLiveCommonClass/Classes/CNThemeManager.h
CNLiveCommonClass/Classes/CNThemeManager.m
CNLiveCommonClass/Classes/CNThemeProtocol.h
Example/CNLiveCommonClass.xcodeproj/project.pbxproj
Example/CNLiveCommonClass/CNLiveViewController.m
Example/Podfile
@@ -38,5 +38,7 @@ TODO: Add long description of the pod here.
  
   # s.public_header_files = 'Pod/Classes/**/*.h'
   # s.frameworks = 'UIKit', 'MapKit'
-  # s.dependency 'AFNetworking', '~> 2.3'
+  s.dependency 'QMUIKit'
+  s.dependency 'CNLiveBaseKit'
+  s.dependency 'CNLiveRequestBastKit'
 end
@@ -7,6 +7,7 @@
 //
  
 #import "QMUIKit.h"
+#import "CNThemeProtocol.h"
  
 @interface CNCommonTableViewController : QMUICommonTableViewController <CNChangingThemeDelegate>
  
@@ -7,8 +7,11 @@
 //
  
 #import "CNCommonTableViewController.h"
-#import "CNAttentionViewController.h"
-#import "CNMineHomeController.h"
+//#import "CNAttentionViewController.h"
+//#import "CNMineHomeController.h"
+#import "QMUIKit.h"
+#import "CNThemeManager.h"
+#import "CNLiveBaseKit.h"
  
 @interface CNCommonTableViewController ()
  
@@ -19,12 +22,12 @@
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
-    if ([self isKindOfClass:[CNAttentionViewController class]] || [self isKindOfClass:[CNMineHomeController class]]) {
-        self.tabBarController.tabBar.hidden = NO;
-    }else{
-        
-        self.tabBarController.tabBar.hidden = YES;
-    }
+//    if ([self isKindOfClass:[CNAttentionViewController class]] || [self isKindOfClass:[CNMineHomeController class]]) {
+//        self.tabBarController.tabBar.hidden = NO;
+//    }else{
+//
+//        self.tabBarController.tabBar.hidden = YES;
+//    }
 //    self.navigationController.interactivePopGestureRecognizer.delegate = (id)self;
 }
  
@@ -66,7 +69,7 @@
  
 - (void)setCNNoNetworkingEmptyView
 {
-    self.emptyView.backgroundColor = kWhiteColor;
+    self.emptyView.backgroundColor = [UIColor whiteColor];
     self.emptyView.actionButton.backgroundColor = UIColorMake(0, 194, 0);
     self.emptyView.actionButton.layer.masksToBounds = YES;
     self.emptyView.actionButton.layer.cornerRadius = 6;
@@ -113,9 +116,26 @@
  
 - (UIImage *)navigationBarBackgroundImage
 {
-    return [UIImage imageWithColor:kWhiteColor];
+    return [self imageWithColor:[UIColor whiteColor]];
+}
+- (UIImage *)imageWithColor:(UIColor *)color {
+    return [self imageWithColor:color size:CGSizeMake(1, 1)];
 }
  
+- (UIImage *)imageWithColor:(UIColor *)color size:(CGSize)size {
+    if (color == nil) {
+        return nil;
+    }
+    
+    CGRect rect=CGRectMake(0.0f, 0.0f, size.width, size.height);
+    UIGraphicsBeginImageContext(rect.size);
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    CGContextSetFillColorWithColor(context, [color CGColor]);
+    CGContextFillRect(context, rect);
+    UIImage *theImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    return theImage;
+}
 - (UIInterfaceOrientationMask)supportedOrientationMask
 {
     return UIInterfaceOrientationMaskPortrait;
@@ -7,7 +7,7 @@
 //
  
 #import <UIKit/UIKit.h>
-
+#import "CNThemeProtocol.h"
 @interface CNCommonView : UIView <CNChangingThemeDelegate>
  
 @end
@@ -7,6 +7,7 @@
 //
  
 #import "CNCommonView.h"
+#import "CNThemeManager.h"
  
 @implementation CNCommonView
  
@@ -7,6 +7,7 @@
 //
  
 #import "CNThemeProtocol.h"
+#import "QMUICommonViewController.h"
  
 @interface CNCommonViewController : QMUICommonViewController <CNChangingThemeDelegate>
  
@@ -8,6 +8,8 @@
  
 #import "CNCommonViewController.h"
 #import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import "QMUIKit.h"
+#import "CNThemeManager.h"
  
 @interface CNCommonViewController ()
  
@@ -40,7 +42,7 @@
 }
 #pragma mark - UI
 - (void)setCNNoNetworkingEmptyView {
-    self.emptyView.backgroundColor = kWhiteColor;
+    self.emptyView.backgroundColor = [UIColor whiteColor];
     self.emptyView.actionButton.backgroundColor = UIColorMake(0, 194, 0);
     self.emptyView.actionButton.layer.masksToBounds = YES;
     self.emptyView.actionButton.layer.cornerRadius = 6;
@@ -73,8 +75,7 @@
 }
 #pragma mark - Network Monitoring
 - (void)p_startNetworkMonitoring {
-    weakself
-    
+    __weak typeof(self) weakSelf = self;
     [CNLiveNetworking networkStatusWithBlock:^(CNLiveNetworkStatusType status) {
         if (status == CNLiveNetworkStatusUnknown || status == CNLiveNetworkStatusNotReachable) {
             weakSelf.netStatus = status;
@@ -120,7 +121,25 @@
 }
 #pragma mark - Navigation Delegate
 - (UIImage *)navigationBarBackgroundImage {
-    return [UIImage imageWithColor:kWhiteColor];
+    return [self imageWithColor:[UIColor whiteColor]];
+}
+- (UIImage *)imageWithColor:(UIColor *)color {
+    return [self imageWithColor:color size:CGSizeMake(1, 1)];
+}
+
+- (UIImage *)imageWithColor:(UIColor *)color size:(CGSize)size {
+    if (color == nil) {
+        return nil;
+    }
+    
+    CGRect rect=CGRectMake(0.0f, 0.0f, size.width, size.height);
+    UIGraphicsBeginImageContext(rect.size);
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    CGContextSetFillColorWithColor(context, [color CGColor]);
+    CGContextFillRect(context, rect);
+    UIImage *theImage = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    return theImage;
 }
  
 #pragma mark - System Delegate
+//
+//  CNLiveCommonClass.h
+//  Pods
+//
+//  Created by CNLive-zxw on 2019/4/12.
+//
+
+#ifndef CNLiveCommonClass_h
+#define CNLiveCommonClass_h
+
+#import "CNThemeManager.h"
+#import "CNCommonView.h"
+
+#import "CNCommonViewController.h"
+#import "CNCommonTableViewController.h"
+#import "CNCommonListViewController.h"
+
+#endif /* CNLiveCommonClass_h */
+//
+//  CNThemeManager.h
+//  CNLiveNetAdd
+//
+//  Created by 张旭 on 2017/12/30.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "CNThemeProtocol.h"
+
+/// 当主题发生变化时，会发送这个通知
+extern NSString *const CNThemeChangedNotification;
+
+/// 主题发生改变前的值，类型为 NSObject<CNThemeProtocol>，可能为 NSNull
+extern NSString *const CNThemeBeforeChangedName;
+
+/// 主题发生改变后的值，类型为 NSObject<CNThemeProtocol>，可能为 NSNull
+extern NSString *const CNThemeAfterChangedName;
+
+/**
+ *  QMUI Demo 的皮肤管理器，当需要换肤时，请为 currentTheme 赋值；当需要获取当前皮肤时，可访问 currentTheme 属性。
+ *  可通过监听 CNThemeChangedNotification 通知来捕获换肤事件，默认地，CNCommonViewController 及 CNCommonTableViewController 均已支持响应换肤，其响应方法是通过 CNChangingThemeDelegate 接口来实现的。
+ */
+@interface CNThemeManager : NSObject
++ (instancetype)sharedInstance;
+
+@property(nonatomic, strong) NSObject<CNThemeProtocol> *currentTheme;
+@end
+//
+//  CNThemeManager.m
+//  CNLiveNetAdd
+//
+//  Created by 张旭 on 2017/12/30.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "CNThemeManager.h"
+
+NSString *const CNThemeChangedNotification = @"CNThemeChangedNotification";
+NSString *const CNThemeBeforeChangedName = @"CNThemeBeforeChangedName";
+NSString *const CNThemeAfterChangedName = @"CNThemeAfterChangedName";
+
+@implementation CNThemeManager
+
++ (instancetype)sharedInstance {
+    static dispatch_once_t onceToken;
+    static CNThemeManager *instance = nil;
+    dispatch_once(&onceToken,^{
+        instance = [[super allocWithZone:NULL] init];
+    });
+    return instance;
+}
+
++ (id)allocWithZone:(struct _NSZone *)zone{
+    return [self sharedInstance];
+}
+
+- (void)setCurrentTheme:(NSObject<CNThemeProtocol> *)currentTheme {
+    BOOL isThemeChanged = _currentTheme != currentTheme;
+    NSObject<CNThemeProtocol> *themeBeforeChanged = nil;
+    if (isThemeChanged) {
+        themeBeforeChanged = _currentTheme;
+    }
+    _currentTheme = currentTheme;
+    if (isThemeChanged) {
+        [currentTheme setupConfigurationTemplate];
+        [[NSNotificationCenter defaultCenter] postNotificationName:CNThemeChangedNotification object:self userInfo:@{CNThemeBeforeChangedName: themeBeforeChanged ?: [NSNull null], CNThemeAfterChangedName: currentTheme ?: [NSNull null]}];
+    }
+}
+
+@end
+//
+//  CNThemeProtocol.h
+//  CNLiveNetAdd
+//
+//  Created by 张旭 on 2017/12/30.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+
+#import <Foundation/Foundation.h>
+
+/// 所有主题均应实现这个协议，规定了 QMUI Demo 里常用的几个关键外观属性
+@protocol CNThemeProtocol <NSObject>
+
+@required
+
+/// 来自于 QMUIConfigurationTemplate 里的自带方法，用于应用配置表里的设置
+- (void)setupConfigurationTemplate;
+
+- (UIColor *)themeTintColor;
+- (UIColor *)themeListTextColor;
+- (UIColor *)themeCodeColor;
+- (UIColor *)themeGridItemTintColor;
+
+- (NSString *)themeName;
+
+@end
+
+
+/// 所有能响应主题变化的对象均应实现这个协议，目前主要用于 CNCommonViewController 及 CNCommonTableViewController
+@protocol CNChangingThemeDelegate <NSObject>
+
+@required
+
+- (void)themeBeforeChanged:(NSObject<CNThemeProtocol> *)themeBeforeChanged afterChanged:(NSObject<CNThemeProtocol> *)themeAfterChanged;
+
+@end
@@ -226,6 +226,7 @@
 				6003F5AA195388D20070C39A /* Sources */,
 				6003F5AB195388D20070C39A /* Frameworks */,
 				6003F5AC195388D20070C39A /* Resources */,
+				FAC38C7F6FF8CF304CD35A48 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -350,19 +351,59 @@
 			);
 			inputPaths = (
 				"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveCommonClass_Example/Pods-CNLiveCommonClass_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
+				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
+				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 			);
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveCommonClass_Example/Pods-CNLiveCommonClass_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
+		FAC38C7F6FF8CF304CD35A48 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveCommonClass_Tests/Pods-CNLiveCommonClass_Tests-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
+				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
+				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveCommonClass_Tests/Pods-CNLiveCommonClass_Tests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
  
 /* Begin PBXSourcesBuildPhase section */
@@ -7,6 +7,7 @@
 //
  
 #import "CNLiveViewController.h"
+#import "CNLiveCommonClass.h"
  
 @interface CNLiveViewController ()
  
@@ -18,6 +19,7 @@
 {
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
+
 }
  
 - (void)didReceiveMemoryWarning
+source 'https://github.com/CocoaPods/Specs.git'
+source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
 use_frameworks!
  
-platform :ios, '8.0'
+platform :ios, '9.0'
  
 target 'CNLiveCommonClass_Example' do
   pod 'CNLiveCommonClass', :path => '../'
+  pod 'QMUIKit'
+  pod 'CNLiveRequestBastKit'
+  pod 'CNLiveBaseKit'
  
   target 'CNLiveCommonClass_Tests' do
     inherit! :search_paths
-
+    pod 'QMUIKit'
+    pod 'CNLiveRequestBastKit'
+    pod 'CNLiveBaseKit'
  
   end
 end