iOS Team / CNLiveMateCode · Commits

Commit 7ba5fe624e0d20727f265d6da6094fe3ea36a0fd

Authored by niudaojian
1 parent 319bfc3b

移除 YYCategories

Inline Side-by-side
Showing 16 changed files with 440 additions and 13 deletions
... ... @@ -12,7 +12,7 @@ target 'metaCode' do
12 12 # Comment the next line if you don't want to use dynamic frameworks
13 13 use_frameworks!
14 14  
15   - pod 'YYCategories'
  15 +# pod 'YYCategories'
16 16  
17 17 # Pods for metaCode
18 18 #网络请求基础库
... ...
metaCode.xcodeproj/project.pbxproj
  View file @7ba5fe6
... ... @@ -64,6 +64,8 @@
64 64 7C7C62F62A4D72E9007A912E /* CNIdentityDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7C62F52A4D72E9007A912E /* CNIdentityDB.swift */; };
65 65 7C83B43E2A52B8BA004BF4A4 /* CNHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */; };
66 66 7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B43F2A52BB2B004BF4A4 /* CNGlobalEnum.swift */; };
  67 + 7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */; };
  68 + 7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */; };
67 69 7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675282A270F6A008354C1 /* WJColorChange.m */; };
68 70 7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */; };
69 71 7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675382A2740B0008354C1 /* CNMainView.swift */; };
... ... @@ -162,6 +164,8 @@
162 164 7C7C62F52A4D72E9007A912E /* CNIdentityDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNIdentityDB.swift; sourceTree = "<group>"; };
163 165 7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageViewModel.swift; sourceTree = "<group>"; };
164 166 7C83B43F2A52BB2B004BF4A4 /* CNGlobalEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNGlobalEnum.swift; sourceTree = "<group>"; };
  167 + 7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+CNLiveExtensions.swift"; sourceTree = "<group>"; };
  168 + 7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDate+CNLiveExtensions.swift"; sourceTree = "<group>"; };
165 169 7CD675262A270F69008354C1 /* metaCode-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "metaCode-Bridging-Header.h"; sourceTree = "<group>"; };
166 170 7CD675272A270F6A008354C1 /* WJColorChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WJColorChange.h; sourceTree = "<group>"; };
167 171 7CD675282A270F6A008354C1 /* WJColorChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WJColorChange.m; sourceTree = "<group>"; };
... ... @@ -238,10 +242,12 @@
238 242 790D01842A2D89E100C5978D /* UIColor+CNLiveExtensions.swift */,
239 243 7C49312C2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift */,
240 244 790D019C2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift */,
  245 + 7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */,
241 246 79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */,
242 247 798A44EF2A305BC200815935 /* UIButton+CNLiveExtensions.swift */,
243 248 79396EEC2A319F220053E1AF /* NSObject+CNLiveExtensions.swift */,
244 249 790B1FB52A41938F0074CF00 /* UIImage+CNLiveExtensions.swift */,
  250 + 7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */,
245 251 );
246 252 path = Extensions;
247 253 sourceTree = "<group>";
... ... @@ -843,13 +849,15 @@
843 849 798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
844 850 790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
845 851 7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */,
  852 + 7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */,
846 853 7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
847 854 790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
848 855 7C7C62F62A4D72E9007A912E /* CNIdentityDB.swift in Sources */,
849 856 790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
850 857 790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
851   - 790B1FB62A41938F0074CF00 /* UIImage+CNLiveColorImage.swift in Sources */,
852   - 790D019D2A2DCBD000C5978D /* UIView+CNGradient.swift in Sources */,
  858 + 790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
  859 + 790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
  860 + 7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
853 861 798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
854 862 7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
855 863 7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */,
... ...
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
  View file @7ba5fe6
... ... @@ -7,7 +7,6 @@
7 7  
8 8 import Foundation
9 9 import Qiniu
10   -import YYCategories
11 10 import CNLiveRequestBastKit
12 11  
13 12 typealias ProgressBlcok = (_ key: String,_ percent: CGFloat) -> Void
... ...
metaCode/Classes/Extensions/CALayer+CNLiveExtensions.swift 0 → 100644
  View file @7ba5fe6
  1 +//
  2 +// CALayer+CNLiveExtensions.swift
  3 +// metaCode
  4 +//
  5 +// Created by daojian on 2023/7/4.
  6 +//
  7 +
  8 +import Foundation
  9 +
  10 +extension CALayer{
  11 +
  12 + public var left:CGFloat{
  13 +
  14 + set{
  15 +
  16 + var frame = self.frame
  17 +
  18 + frame.origin.x = newValue
  19 +
  20 + self.frame = frame
  21 +
  22 + }
  23 +
  24 + get{
  25 +
  26 + return self.frame.origin.x
  27 +
  28 + }
  29 +
  30 + }
  31 +
  32 + public var top:CGFloat{
  33 +
  34 + set{
  35 +
  36 + var frame = self.frame
  37 +
  38 + frame.origin.y = newValue
  39 +
  40 + self.frame = frame
  41 +
  42 + }
  43 +
  44 + get{
  45 +
  46 + return self.frame.origin.y
  47 +
  48 + }
  49 +
  50 + }
  51 +
  52 + public var right:CGFloat{
  53 +
  54 + set{
  55 +
  56 + var frame = self.frame
  57 +
  58 + frame.origin.x = newValue - frame.size.width
  59 +
  60 + self.frame = frame
  61 +
  62 + }
  63 +
  64 + get{
  65 +
  66 + return self.frame.origin.x + self.frame.size.width
  67 +
  68 + }
  69 +
  70 + }
  71 +
  72 + public var bottom:CGFloat{
  73 +
  74 + set{
  75 +
  76 + var frame = self.frame
  77 +
  78 + frame.origin.y = newValue - frame.size.height
  79 +
  80 + self.frame = frame
  81 +
  82 + }
  83 +
  84 + get{
  85 +
  86 + return self.frame.origin.y + self.frame.size.height
  87 +
  88 + }
  89 +
  90 + }
  91 + public var center:CGPoint{
  92 + set{
  93 + var frame = self.frame;
  94 + frame.origin.x = newValue.x - frame.size.width * 0.5;
  95 + frame.origin.y = newValue.y - frame.size.height * 0.5;
  96 + self.frame = frame;
  97 + }
  98 +
  99 + get{
  100 +
  101 + return CGPointMake(self.frame.origin.x + self.frame.size.width * 0.5,
  102 + self.frame.origin.y + self.frame.size.height * 0.5);
  103 + }
  104 + }
  105 + public var centerX:CGFloat{
  106 +
  107 + set{
  108 +
  109 + var frame = self.frame;
  110 + frame.origin.x = newValue - frame.size.width * 0.5;
  111 + self.frame = frame;
  112 +
  113 + }
  114 +
  115 + get{
  116 +
  117 + return self.frame.origin.x + self.frame.size.width * 0.5;
  118 +
  119 + }
  120 +
  121 + }
  122 +
  123 + public var centerY:CGFloat{
  124 +
  125 + set{
  126 +
  127 + var frame = self.frame;
  128 + frame.origin.y = newValue - frame.size.height * 0.5;
  129 + self.frame = frame;
  130 + }
  131 +
  132 + get{
  133 +
  134 + return self.frame.origin.y + self.frame.size.height * 0.5;
  135 +
  136 + }
  137 +
  138 + }
  139 +
  140 + public var width:CGFloat{
  141 +
  142 + set{
  143 +
  144 + var frame = self.frame
  145 +
  146 + frame.size.width = newValue
  147 +
  148 + self.frame = frame
  149 +
  150 + }
  151 +
  152 + get{
  153 +
  154 + return self.frame.size.width
  155 +
  156 + }
  157 +
  158 + }
  159 +
  160 + public var height:CGFloat{
  161 +
  162 + set{
  163 +
  164 + var frame = self.frame
  165 +
  166 + frame.size.height = newValue
  167 +
  168 + self.frame = frame
  169 +
  170 + }
  171 +
  172 + get{
  173 +
  174 + return self.frame.size.height
  175 +
  176 + }
  177 +
  178 + }
  179 +
  180 +
  181 + public var origin:CGPoint{
  182 + set{
  183 + var frame = self.frame
  184 + frame.origin = newValue
  185 + self.frame = frame
  186 + }
  187 +
  188 + get{
  189 + return self.frame.origin
  190 + }
  191 + }
  192 +
  193 + public var size:CGSize {
  194 + set{
  195 + var frame = self.frame;
  196 + frame.size = newValue;
  197 + self.frame = frame;
  198 + }
  199 +
  200 + get{
  201 + return self.frame.size
  202 + }
  203 + }
  204 +}
... ...
metaCode/Classes/Extensions/NSDate+CNLiveExtensions.swift 0 → 100644
  View file @7ba5fe6
  1 +//
  2 +// NSDate+CNLiveExtensions.swift
  3 +// metaCode
  4 +//
  5 +// Created by daojian on 2023/7/4.
  6 +//
  7 +
  8 +import Foundation
  9 +
  10 +extension NSDate{
  11 +
  12 +// - (NSString *)stringWithFormat:(NSString *)format {
  13 +// NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
  14 +// [formatter setDateFormat:format];
  15 +// [formatter setLocale:[NSLocale currentLocale]];
  16 +// return [formatter stringFromDate:self];
  17 +// }
  18 +
  19 + func string(withFormat format:String)->String{
  20 + let formatter: DateFormatter = DateFormatter()
  21 + formatter.dateFormat = format
  22 + formatter.locale = Locale.current
  23 + return formatter.string(from: self as Date)
  24 + }
  25 +
  26 +}
... ...
metaCode/Classes/Extensions/NSString+CNLiveExtensions.swift
  View file @7ba5fe6
... ... @@ -18,4 +18,25 @@ extension NSString {
18 18 var val:Int = 0
19 19 return scan.scanInt(&val) && scan.isAtEnd
20 20 }
  21 +
  22 + func isNotBlank()->Bool {
  23 + // NSCharacterSet *blank = [NSCharacterSet whitespaceAndNewlineCharacterSet];
  24 +
  25 + // for (NSInteger i = 0; i < self.length; ++i) {
  26 + // unichar c = [self characterAtIndex:i];
  27 + // if (![blank characterIsMember:c]) {
  28 + // return YES;
  29 + // }
  30 + // }
  31 + let blank:NSCharacterSet = NSCharacterSet.whitespacesAndNewlines as NSCharacterSet
  32 +
  33 + let count = self.length
  34 + for i in (0..<count) {
  35 + let c: unichar = self.character(at: i)
  36 + if(!blank.characterIsMember(c)){
  37 + return true
  38 + }
  39 + }
  40 + return false;
  41 + }
21 42 }
... ...
metaCode/Classes/Extensions/UIView+CNLiveExtensions.swift
  View file @7ba5fe6
... ... @@ -57,4 +57,182 @@ extension UIView {
57 57 maskLayer.path = maskPath.cgPath
58 58 self.layer.mask = maskLayer
59 59 }
  60 +
  61 +
  62 + public var left:CGFloat{
  63 +
  64 + set{
  65 +
  66 + var frame = self.frame
  67 +
  68 + frame.origin.x = newValue
  69 +
  70 + self.frame = frame
  71 +
  72 + }
  73 +
  74 + get{
  75 +
  76 + return self.frame.origin.x
  77 +
  78 + }
  79 +
  80 + }
  81 +
  82 + public var top:CGFloat{
  83 +
  84 + set{
  85 +
  86 + var frame = self.frame
  87 +
  88 + frame.origin.y = newValue
  89 +
  90 + self.frame = frame
  91 +
  92 + }
  93 +
  94 + get{
  95 +
  96 + return self.frame.origin.y
  97 +
  98 + }
  99 +
  100 + }
  101 +
  102 + public var right:CGFloat{
  103 +
  104 + set{
  105 +
  106 + var frame = self.frame
  107 +
  108 + frame.origin.x = newValue - frame.size.width
  109 +
  110 + self.frame = frame
  111 +
  112 + }
  113 +
  114 + get{
  115 +
  116 + return self.frame.origin.x + self.frame.size.width
  117 +
  118 + }
  119 +
  120 + }
  121 +
  122 + public var bottom:CGFloat{
  123 +
  124 + set{
  125 +
  126 + var frame = self.frame
  127 +
  128 + frame.origin.y = newValue - frame.size.height
  129 +
  130 + self.frame = frame
  131 +
  132 + }
  133 +
  134 + get{
  135 +
  136 + return self.frame.origin.y + self.frame.size.height
  137 +
  138 + }
  139 +
  140 + }
  141 +
  142 + public var centerX:CGFloat{
  143 +
  144 + set{
  145 +
  146 + self.center = CGPoint(x:newValue, y:self.center.x)
  147 +
  148 + }
  149 +
  150 + get{
  151 +
  152 + return self.center.x
  153 +
  154 + }
  155 +
  156 + }
  157 +
  158 + public var centerY:CGFloat{
  159 +
  160 + set{
  161 +
  162 + self.center = CGPoint(x:self.center.x, y:newValue)
  163 +
  164 + }
  165 +
  166 + get{
  167 +
  168 + return self.center.y
  169 +
  170 + }
  171 +
  172 + }
  173 +
  174 + public var width:CGFloat{
  175 +
  176 + set{
  177 +
  178 + var frame = self.frame
  179 +
  180 + frame.size.width = newValue
  181 +
  182 + self.frame = frame
  183 +
  184 + }
  185 +
  186 + get{
  187 +
  188 + return self.frame.size.width
  189 +
  190 + }
  191 +
  192 + }
  193 +
  194 + public var height:CGFloat{
  195 +
  196 + set{
  197 +
  198 + var frame = self.frame
  199 +
  200 + frame.size.height = newValue
  201 +
  202 + self.frame = frame
  203 +
  204 + }
  205 +
  206 + get{
  207 +
  208 + return self.frame.size.height
  209 +
  210 + }
  211 +
  212 + }
  213 +
  214 +
  215 + public var origin:CGPoint{
  216 + set{
  217 + var frame = self.frame
  218 + frame.origin = newValue
  219 + self.frame = frame
  220 + }
  221 +
  222 + get{
  223 + return self.frame.origin
  224 + }
  225 + }
  226 +
  227 + public var size:CGSize {
  228 + set{
  229 + var frame = self.frame;
  230 + frame.size = newValue;
  231 + self.frame = frame;
  232 + }
  233 +
  234 + get{
  235 + return self.frame.size
  236 + }
  237 + }
60 238 }
... ...
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
  View file @7ba5fe6
... ... @@ -7,7 +7,6 @@
7 7  
8 8 import Foundation
9 9 import UIKit
10   -import YYCategories
11 10 import SwiftGifOrigin
12 11 import CNLiveRequestBastKit
13 12  
... ...
metaCode/Classes/Main/HomePage/View/CNDownSlideView.swift
  View file @7ba5fe6
... ... @@ -7,7 +7,6 @@
7 7  
8 8 import Foundation
9 9 import UIKit
10   -import YYCategories
11 10  
12 11 typealias backBlock = ()->Void;
13 12  
... ...
metaCode/Classes/Main/HomePage/View/CNDownSlideViewRemindView.swift
  View file @7ba5fe6
... ... @@ -6,7 +6,6 @@
6 6 //
7 7  
8 8 import Foundation
9   -import YYCategories
10 9  
11 10 ///下滑显示提醒View
12 11 class CNDownSlideViewRemindView : UIView{
... ...
metaCode/Classes/Main/HomePage/View/CNMainView.swift
  View file @7ba5fe6
... ... @@ -6,7 +6,6 @@
6 6 //
7 7  
8 8 import Foundation
9   -import YYCategories
10 9  
11 10 ///旋转动画时间
12 11 let KTransformAnimationTime:CGFloat = 0.75;
... ...
metaCode/Classes/Main/HomePage/View/CNUpSlideView.swift
  View file @7ba5fe6
... ... @@ -6,7 +6,6 @@
6 6 //
7 7  
8 8 import Foundation
9   -import YYCategories
10 9 import WebKit
11 10  
12 11 ///上滑显示的VIew
... ...
metaCode/Classes/Main/HomePage/View/CNUpSlideViewRemindView.swift
  View file @7ba5fe6
... ... @@ -6,7 +6,6 @@
6 6 //
7 7  
8 8 import Foundation
9   -import YYCategories
10 9  
11 10 /// 上拉显示提醒View
12 11 class CNUpSlideViewRemindView:UIView{
... ...
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
  View file @7ba5fe6
... ... @@ -6,7 +6,6 @@
6 6 //
7 7  
8 8 import Foundation
9   -import YYCategories
10 9 import CNLiveRequestBastKit
11 10 import HandyJSON
12 11  
... ...
metaCode/Classes/Main/MinePage/Controller/CNLiveInfoShowViewController.swift
  View file @7ba5fe6
... ... @@ -6,7 +6,6 @@
6 6 //
7 7  
8 8 import Foundation
9   -import YYCategories
10 9 import WebKit
11 10  
12 11 enum ListShowInfoType {
... ...
metaCode/Classes/Vendors/NewPagedFlowView.m
  View file @7ba5fe6
... ... @@ -11,7 +11,6 @@
11 11 #import "NewPagedFlowView.h"
12 12  
13 13 //#import<CNLiveCommonCategory/UIColor+CNLiveExtension.h>
14   -//#import<YYCategories/YYCategories.h>
15 14  
16 15 @interface NewPagedFlowView ()
17 16  
... ...