Quellcode durchsuchen

优化了文件划分,和方法命名

zzb vor 4 Jahren
Ursprung
Commit
638fe4f9d5

Datei-Diff unterdrückt, da er zu groß ist
+ 325 - 342
Example/Pods/Pods.xcodeproj/project.pbxproj


+ 1 - 2
Example/Pods/Target Support Files/ZZFoundation/ZZFoundation-umbrella.h

@@ -22,10 +22,9 @@
 #import "ZZSwizzle.h"
 #import "NSString+ZZPath.h"
 #import "NSString+ZZEx.h"
+#import "NSString+ZZRect.h"
 #import "NSString+ZZRegex.h"
 #import "ZZSecurity.h"
-#import "NSString+ZZRect.h"
-#import "NSString+ZZRange.h"
 #import "ZZFoundation_String.h"
 #import "ZZFoundation.h"
 

+ 1 - 1
Example/Tests/NSString+ZZPathTests.m

@@ -18,7 +18,7 @@ describe(@"StringEx", ^{
   context(@"of cache", ^{
       __block id value = nil;
       beforeEach(^{
-          value = [@"fileName" ZZCacheDir];
+          value = [@"fileName" ZZDirCache];
       });
       
       afterEach(^{

+ 8 - 0
Example/ZZFoundation.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

+ 3 - 3
ZZFoundation/Classes/String/DirPath/NSString+ZZPath.h

@@ -11,11 +11,11 @@
 @interface NSString (ZZPath)
 
 /// 拼接成cache目录
-- (instancetype)ZZCacheDir;
+- (instancetype)ZZDirCache;
 
 /// 拼接成Document目录
-- (instancetype)ZZDocDir;
+- (instancetype)ZZDirDoc;
 
 /// 拼接成Temp目录
-- (instancetype)ZZTempDir;
+- (instancetype)ZZDirTemp;
 @end

+ 3 - 3
ZZFoundation/Classes/String/DirPath/NSString+ZZPath.m

@@ -10,21 +10,21 @@
 
 @implementation NSString (ZZPath)
 ///MARK: - 获得目录路径
-- (instancetype)ZZCacheDir{
+- (instancetype)ZZDirCache{
 	// 1.获取caches目录
 	NSString *path = [NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES) lastObject];
 	// 2.生成绝对路径
 	return [path stringByAppendingPathComponent:[self lastPathComponent]];
 }
 
-- (instancetype)ZZDocDir{
+- (instancetype)ZZDirDoc{
 	// 1.获取caches目录
 	NSString *path = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject];
 	// 2.生成绝对路径
 	return [path stringByAppendingPathComponent:[self lastPathComponent]];
 }
 
-- (instancetype)ZZTempDir{
+- (instancetype)ZZDirTemp{
 	// 1.获取caches目录
 	NSString *path = NSTemporaryDirectory();
 	// 2.生成绝对路径

+ 6 - 2
ZZFoundation/Classes/String/NSString+ZZEx.h

@@ -6,7 +6,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <NSString+ZZRange.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -38,7 +37,12 @@ FOUNDATION_EXPORT NSString * ZZString(NSString *format, ...);
 -(NSArray *)ZZSplit:(NSString *)separator;
 
 
-/// 替换字符串
+
+/// 遍历字符串返回子字符串range的数组集合
+/// @param subStr 匹配的子字符串
+- (NSArray*)ZZRangeOfSubString:(NSString*)subStr;
+
+/// 用b替换字符串中所有的a
 /// @param aStr 匹配的字符串
 /// @param bStr 替换的字符串
 -(NSString *)ZZReplace:(NSString *)aStr with:(NSString *)bStr;

+ 14 - 0
ZZFoundation/Classes/String/NSString+ZZEx.m

@@ -64,6 +64,20 @@ NSString * ZZString(NSString *format, ...)
     return [self componentsSeparatedByString:separator];
 };
 
+- (NSArray*)ZZRangeOfSubString:(NSString*)subStr{
+    NSMutableArray *rangeArray = [NSMutableArray array];
+    NSString*string1 = [self stringByAppendingString:subStr];
+    NSString *temp;
+    for(int i =0; i < self.length; i ++) {
+        temp = [string1 substringWithRange:NSMakeRange(i, subStr.length)];
+        if ([temp isEqualToString:subStr]) {
+            NSRange range = {i,subStr.length};
+            [rangeArray addObject: [NSValue valueWithRange:range]];
+        }
+    }
+    return rangeArray;
+}
+
 -(NSString *)ZZReplace:(NSString *)aStr with:(NSString *)bStr{
     NSMutableString *muStr = [self mutableCopy];
     NSArray *ranges = [muStr ZZRangeOfSubString:aStr];

ZZFoundation/Classes/String/Size/NSString+ZZRect.h → ZZFoundation/Classes/String/Rect/NSString+ZZRect.h


ZZFoundation/Classes/String/Size/NSString+ZZRect.m → ZZFoundation/Classes/String/Rect/NSString+ZZRect.m


+ 1 - 1
ZZFoundation/Classes/String/Regex/NSString+ZZRegex.h

@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// 是否英文小写
 - (BOOL)ZZCheckSmallLetter;
 
-/// 有效的密码
+/// 有效的密码 长度为6到20位,包含字母、数字、不能为中文
 - (BOOL)ZZCheckValidPassword;
 
 /// 是不是全为空格

+ 0 - 17
ZZFoundation/Classes/String/StringRange/NSString+ZZRange.h

@@ -1,17 +0,0 @@
-//
-//  NSString+ZZRange.h
-//  Kiwi
-//
-//  Created by Max on 2020/12/25.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface NSString (ZZRange)
-/// 遍历字符串返回子字符串range的数组集合
-- (NSArray*)ZZRangeOfSubString:(NSString*)subStr;
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 26
ZZFoundation/Classes/String/StringRange/NSString+ZZRange.m

@@ -1,26 +0,0 @@
-//
-//  NSString+ZZRange.m
-//  Kiwi
-//
-//  Created by Max on 2020/12/25.
-//
-
-#import "NSString+ZZRange.h"
-
-@implementation NSString (ZZRange)
-
-- (NSArray*)ZZRangeOfSubString:(NSString*)subStr{
-    NSMutableArray *rangeArray = [NSMutableArray array];
-    NSString*string1 = [self stringByAppendingString:subStr];
-    NSString *temp;
-    for(int i =0; i < self.length; i ++) {
-        temp = [string1 substringWithRange:NSMakeRange(i, subStr.length)];
-        if ([temp isEqualToString:subStr]) {
-            NSRange range = {i,subStr.length};
-            [rangeArray addObject: [NSValue valueWithRange:range]];
-        }
-    }
-    return rangeArray;
-}
-
-@end

+ 0 - 1
ZZFoundation/Classes/String/ZZFoundation_String.h

@@ -12,6 +12,5 @@
 #import <NSString+ZZPath.h>
 #import <NSString+ZZRegex.h>
 #import <NSString+ZZRect.h>
-#import <NSString+ZZRange.h>
 
 #endif /* ZZFoundation_String_h */