移除 YYCategories

niudaojian
1 parent 319bfc3b
Showing 16 changed files with 440 additions and 13 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Extensions/CALayer+CNLiveExtensions.swift
metaCode/Classes/Extensions/NSDate+CNLiveExtensions.swift
metaCode/Classes/Extensions/NSString+CNLiveExtensions.swift
metaCode/Classes/Extensions/UIView+CNLiveExtensions.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/CNDownSlideViewRemindView.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/HomePage/View/CNUpSlideView.swift
metaCode/Classes/Main/HomePage/View/CNUpSlideViewRemindView.swift
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveInfoShowViewController.swift
metaCode/Classes/Vendors/NewPagedFlowView.m
@@ -12,7 +12,7 @@ target &#39;metaCode&#39; do
   # Comment the next line if you don't want to use dynamic frameworks
   use_frameworks!
-  pod 'YYCategories'
+#  pod 'YYCategories'
   # Pods for metaCode
   #网络请求基础库
@@ -64,6 +64,8 @@
 		7C7C62F62A4D72E9007A912E /* CNIdentityDB.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C7C62F52A4D72E9007A912E /* CNIdentityDB.swift */; };
 		7C83B43E2A52B8BA004BF4A4 /* CNHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */; };
 		7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B43F2A52BB2B004BF4A4 /* CNGlobalEnum.swift */; };
+		7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */; };
+		7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */; };
 		7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675282A270F6A008354C1 /* WJColorChange.m */; };
 		7CD6753C2A2740B0008354C1 /* CNUpSlideViewRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */; };
 		7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675382A2740B0008354C1 /* CNMainView.swift */; };
@@ -162,6 +164,8 @@
 		7C7C62F52A4D72E9007A912E /* CNIdentityDB.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNIdentityDB.swift; sourceTree = "<group>"; };
 		7C83B43D2A52B8BA004BF4A4 /* CNHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageViewModel.swift; sourceTree = "<group>"; };
 		7C83B43F2A52BB2B004BF4A4 /* CNGlobalEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNGlobalEnum.swift; sourceTree = "<group>"; };
+		7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CALayer+CNLiveExtensions.swift"; sourceTree = "<group>"; };
+		7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSDate+CNLiveExtensions.swift"; sourceTree = "<group>"; };
 		7CD675262A270F69008354C1 /* metaCode-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "metaCode-Bridging-Header.h"; sourceTree = "<group>"; };
 		7CD675272A270F6A008354C1 /* WJColorChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WJColorChange.h; sourceTree = "<group>"; };
 		7CD675282A270F6A008354C1 /* WJColorChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WJColorChange.m; sourceTree = "<group>"; };
@@ -238,10 +242,12 @@
 				790D01842A2D89E100C5978D /* UIColor+CNLiveExtensions.swift */,
 				7C49312C2A2DB9FA000E44B4 /* UITabBar+CNLiveExtensions.swift */,
 				790D019C2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift */,
+				7C83B4412A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift */,
 				79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */,
 				798A44EF2A305BC200815935 /* UIButton+CNLiveExtensions.swift */,
 				79396EEC2A319F220053E1AF /* NSObject+CNLiveExtensions.swift */,
 				790B1FB52A41938F0074CF00 /* UIImage+CNLiveExtensions.swift */,
+				7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -843,13 +849,15 @@
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
 				7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */,
+				7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */,
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNIdentityDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
-				790B1FB62A41938F0074CF00 /* UIImage+CNLiveColorImage.swift in Sources */,
-				790D019D2A2DCBD000C5978D /* UIView+CNGradient.swift in Sources */,
+				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
+				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
+				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
 				7CD675522A29C04B008354C1 /* CNLiveConfigstant.swift in Sources */,
@@ -7,7 +7,6 @@
 import Foundation
 import Qiniu
-import YYCategories
 import CNLiveRequestBastKit
 typealias ProgressBlcok = (_ key: String,_ percent: CGFloat) -> Void
+//
+//  CALayer+CNLiveExtensions.swift
+//  metaCode
+//
+//  Created by daojian on 2023/7/4.
+//
+
+import Foundation
+
+extension CALayer{
+    
+    public var left:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.x = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.x
+            
+        }
+        
+    }
+    
+    public var top:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.y = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.y
+            
+        }
+        
+    }
+    
+    public var right:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.x = newValue - frame.size.width
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.x + self.frame.size.width
+            
+        }
+        
+    }
+    
+    public var bottom:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.y = newValue - frame.size.height
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.y + self.frame.size.height
+            
+        }
+        
+    }
+    public var center:CGPoint{
+        set{
+            var frame = self.frame;
+            frame.origin.x = newValue.x - frame.size.width * 0.5;
+            frame.origin.y = newValue.y - frame.size.height * 0.5;
+            self.frame = frame;
+        }
+        
+        get{
+            
+            return CGPointMake(self.frame.origin.x + self.frame.size.width * 0.5,
+                               self.frame.origin.y + self.frame.size.height * 0.5);
+        }
+    }
+    public var centerX:CGFloat{
+        
+        set{
+            
+            var  frame = self.frame;
+            frame.origin.x = newValue - frame.size.width * 0.5;
+            self.frame = frame;
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.x + self.frame.size.width * 0.5;
+            
+        }
+        
+    }
+    
+    public var centerY:CGFloat{
+        
+        set{
+            
+            var frame = self.frame;
+            frame.origin.y = newValue - frame.size.height * 0.5;
+            self.frame = frame;
+        }
+        
+        get{
+            
+            return self.frame.origin.y + self.frame.size.height * 0.5;
+
+        }
+        
+    }
+    
+    public var width:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.size.width = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.size.width
+            
+        }
+        
+    }
+    
+   public var height:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.size.height = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.size.height
+            
+        }
+        
+    }
+    
+
+    public var origin:CGPoint{
+        set{
+            var frame = self.frame
+            frame.origin = newValue
+            self.frame = frame
+        }
+        
+        get{
+            return self.frame.origin
+        }
+    }
+    
+    public var size:CGSize {
+        set{
+            var frame = self.frame;
+            frame.size = newValue;
+            self.frame = frame;
+        }
+        
+        get{
+            return self.frame.size
+        }
+    }
+}
+//
+//  NSDate+CNLiveExtensions.swift
+//  metaCode
+//
+//  Created by daojian on 2023/7/4.
+//
+
+import Foundation
+
+extension NSDate{
+    
+//    - (NSString *)stringWithFormat:(NSString *)format {
+//        NSDateFormatter *formatter = [[NSDateFormatter alloc] init];
+//        [formatter setDateFormat:format];
+//        [formatter setLocale:[NSLocale currentLocale]];
+//        return [formatter stringFromDate:self];
+//    }
+    
+    func string(withFormat format:String)->String{
+        let formatter: DateFormatter = DateFormatter()
+        formatter.dateFormat = format
+        formatter.locale = Locale.current
+        return formatter.string(from: self as Date)
+    }
+    
+}
@@ -18,4 +18,25 @@ extension NSString {
         var val:Int = 0
         return scan.scanInt(&val) && scan.isAtEnd
     }
+    
+    func isNotBlank()->Bool {
+       //        NSCharacterSet *blank = [NSCharacterSet whitespaceAndNewlineCharacterSet];
+
+        //        for (NSInteger i = 0; i < self.length; ++i) {
+        //            unichar c = [self characterAtIndex:i];
+        //            if (![blank characterIsMember:c]) {
+        //                return YES;
+        //            }
+        //        }
+        let blank:NSCharacterSet = NSCharacterSet.whitespacesAndNewlines as NSCharacterSet
+
+        let count = self.length
+        for i in (0..<count) {
+            let c: unichar = self.character(at: i)
+            if(!blank.characterIsMember(c)){
+                return true
+            }
+        }
+        return false;
+    }
 }
@@ -57,4 +57,182 @@ extension UIView {
         maskLayer.path = maskPath.cgPath
         self.layer.mask = maskLayer
     }
+    
+    
+    public var left:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.x = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.x
+            
+        }
+        
+    }
+    
+    public var top:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.y = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.y
+            
+        }
+        
+    }
+    
+    public var right:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.x = newValue - frame.size.width
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.x + self.frame.size.width
+            
+        }
+        
+    }
+    
+    public var bottom:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.origin.y = newValue - frame.size.height
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.origin.y + self.frame.size.height
+            
+        }
+        
+    }
+    
+    public var centerX:CGFloat{
+        
+        set{
+            
+            self.center = CGPoint(x:newValue, y:self.center.x)
+            
+        }
+        
+        get{
+            
+            return self.center.x
+            
+        }
+        
+    }
+    
+    public var centerY:CGFloat{
+        
+        set{
+            
+            self.center = CGPoint(x:self.center.x, y:newValue)
+            
+        }
+        
+        get{
+            
+            return self.center.y
+            
+        }
+        
+    }
+    
+    public var width:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.size.width = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.size.width
+            
+        }
+        
+    }
+    
+   public var height:CGFloat{
+        
+        set{
+            
+            var frame = self.frame
+            
+            frame.size.height = newValue
+            
+            self.frame = frame
+            
+        }
+        
+        get{
+            
+            return self.frame.size.height
+            
+        }
+        
+    }
+    
+
+    public var origin:CGPoint{
+        set{
+            var frame = self.frame
+            frame.origin = newValue
+            self.frame = frame
+        }
+        
+        get{
+            return self.frame.origin
+        }
+    }
+    
+    public var size:CGSize {
+        set{
+            var frame = self.frame;
+            frame.size = newValue;
+            self.frame = frame;
+        }
+        
+        get{
+            return self.frame.size
+        }
+    }
 }
@@ -7,7 +7,6 @@
 import Foundation
 import UIKit
-import YYCategories
 import SwiftGifOrigin
 import CNLiveRequestBastKit
@@ -7,7 +7,6 @@
 import Foundation
 import UIKit
-import YYCategories
 typealias backBlock = ()->Void;
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 ///下滑显示提醒View
 class CNDownSlideViewRemindView : UIView{
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 ///旋转动画时间
 let KTransformAnimationTime:CGFloat  = 0.75;
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 import WebKit
 ///上滑显示的VIew
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 /// 上拉显示提醒View
 class CNUpSlideViewRemindView:UIView{
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 import CNLiveRequestBastKit
 import HandyJSON
@@ -6,7 +6,6 @@
 //
 import Foundation
-import YYCategories
 import WebKit
 enum ListShowInfoType {
@@ -11,7 +11,6 @@
 #import "NewPagedFlowView.h"
 //#import<CNLiveCommonCategory/UIColor+CNLiveExtension.h>
-//#import<YYCategories/YYCategories.h>
 @interface NewPagedFlowView ()