diff --git a/HiBit.xcodeproj/project.pbxproj b/HiBit.xcodeproj/project.pbxproj index a5e6940..844d42e 100644 --- a/HiBit.xcodeproj/project.pbxproj +++ b/HiBit.xcodeproj/project.pbxproj @@ -82,7 +82,7 @@ 916353392C12B6D400593047 /* SVRadialGradientLayer.m in Sources */ = {isa = PBXBuildFile; fileRef = 916352E72C12B6D400593047 /* SVRadialGradientLayer.m */; }; 9163533A2C12B6D400593047 /* HUDManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 916352EA2C12B6D400593047 /* HUDManager.m */; }; 9163533D2C12B6D400593047 /* KxMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 916352F02C12B6D400593047 /* KxMenu.m */; }; - 9163533E2C12B6D400593047 /* QJNetWorking.m in Sources */ = {isa = PBXBuildFile; fileRef = 916352F32C12B6D400593047 /* QJNetWorking.m */; }; + 9163533E2C12B6D400593047 /* HtyoNetWorking.m in Sources */ = {isa = PBXBuildFile; fileRef = 916352F32C12B6D400593047 /* HtyoNetWorking.m */; }; C8AC2283D47E2B99FF559E75 /* libPods-HiBit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 141F02EF5C0783797594009A /* libPods-HiBit.a */; }; /* End PBXBuildFile section */ @@ -242,8 +242,8 @@ 916352EA2C12B6D400593047 /* HUDManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HUDManager.m; sourceTree = ""; }; 916352EF2C12B6D400593047 /* KxMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KxMenu.h; sourceTree = ""; }; 916352F02C12B6D400593047 /* KxMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KxMenu.m; sourceTree = ""; }; - 916352F22C12B6D400593047 /* QJNetWorking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = QJNetWorking.h; sourceTree = ""; }; - 916352F32C12B6D400593047 /* QJNetWorking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = QJNetWorking.m; sourceTree = ""; }; + 916352F22C12B6D400593047 /* HtyoNetWorking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HtyoNetWorking.h; sourceTree = ""; }; + 916352F32C12B6D400593047 /* HtyoNetWorking.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HtyoNetWorking.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -288,15 +288,15 @@ 916351202C12AFE800593047 /* HiBit */ = { isa = PBXGroup; children = ( - 9163513B2C12B0A200593047 /* Project */, + 9163513B2C12B0A200593047 /* Basics */, 9163513D2C12B11A00593047 /* AppDelegate */, - 916351472C12B40900593047 /* Basics */, + 9163533F2C12C01E00593047 /* Services */, 916352F52C12B6D400593047 /* Utils */, ); path = HiBit; sourceTree = ""; }; - 9163513B2C12B0A200593047 /* Project */ = { + 9163513B2C12B0A200593047 /* Basics */ = { isa = PBXGroup; children = ( 916351322C12AFEA00593047 /* Info.plist */, @@ -306,7 +306,7 @@ 916351492C12B49B00593047 /* PrefixHeader.pch */, 9163514A2C12B4D800593047 /* HiBit-Bridging-Header.h */, ); - path = Project; + path = Basics; sourceTree = ""; }; 9163513D2C12B11A00593047 /* AppDelegate */ = { @@ -320,13 +320,6 @@ path = AppDelegate; sourceTree = ""; }; - 916351472C12B40900593047 /* Basics */ = { - isa = PBXGroup; - children = ( - ); - path = Basics; - sourceTree = ""; - }; 916352482C12B6D400593047 /* Foundation */ = { isa = PBXGroup; children = ( @@ -538,9 +531,9 @@ 916352912C12B6D400593047 /* GTM+AES */ = { isa = PBXGroup; children = ( + 9163528E2C12B6D400593047 /* GTMDefines.h */, 9163528C2C12B6D400593047 /* GTMBase64.h */, 9163528D2C12B6D400593047 /* GTMBase64.m */, - 9163528E2C12B6D400593047 /* GTMDefines.h */, 9163528F2C12B6D400593047 /* NSString+AES.h */, 916352902C12B6D400593047 /* NSString+AES.m */, ); @@ -680,13 +673,13 @@ path = KxMenu; sourceTree = ""; }; - 916352F42C12B6D400593047 /* NetWorking */ = { + 916352F42C12B6D400593047 /* HtyoNetWorking */ = { isa = PBXGroup; children = ( - 916352F22C12B6D400593047 /* QJNetWorking.h */, - 916352F32C12B6D400593047 /* QJNetWorking.m */, + 916352F22C12B6D400593047 /* HtyoNetWorking.h */, + 916352F32C12B6D400593047 /* HtyoNetWorking.m */, ); - path = NetWorking; + path = HtyoNetWorking; sourceTree = ""; }; 916352F52C12B6D400593047 /* Utils */ = { @@ -696,11 +689,18 @@ 916352912C12B6D400593047 /* GTM+AES */, 916352EE2C12B6D400593047 /* HUD */, 916352F12C12B6D400593047 /* KxMenu */, - 916352F42C12B6D400593047 /* NetWorking */, + 916352F42C12B6D400593047 /* HtyoNetWorking */, ); path = Utils; sourceTree = ""; }; + 9163533F2C12C01E00593047 /* Services */ = { + isa = PBXGroup; + children = ( + ); + path = Services; + sourceTree = ""; + }; B36329ED094310C499FEBA2F /* Frameworks */ = { isa = PBXGroup; children = ( @@ -870,7 +870,7 @@ 916353072C12B6D400593047 /* UIScreen+Extension.m in Sources */, 916353282C12B6D400593047 /* DGActivityIndicatorLineScalePulseOutAnimation.m in Sources */, 9163531C2C12B6D400593047 /* DGActivityIndicatorBallScaleMultipleAnimation.m in Sources */, - 9163533E2C12B6D400593047 /* QJNetWorking.m in Sources */, + 9163533E2C12B6D400593047 /* HtyoNetWorking.m in Sources */, 916353042C12B6D400593047 /* UIFont+Category.m in Sources */, 916353092C12B6D400593047 /* UITextField+Category.m in Sources */, 916353162C12B6D400593047 /* DGActivityIndicatorBallGridBeatAnimation.m in Sources */, @@ -1059,9 +1059,9 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 38X8FL2527; ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_PREFIX_HEADER = "$(SRCROOT)/Hibit/Project/PrefixHeader.pch"; + GCC_PREFIX_HEADER = "$(SRCROOT)/Hibit/Basics/PrefixHeader.pch"; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = HiBit/Project/Info.plist; + INFOPLIST_FILE = HiBit/Basics/Info.plist; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -1075,7 +1075,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.qinjiu.HiBit; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_OBJC_BRIDGING_HEADER = "HiBit/Project/HiBit-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "HiBit/Basics/HiBit-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -1093,9 +1093,9 @@ CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 38X8FL2527; ENABLE_USER_SCRIPT_SANDBOXING = NO; - GCC_PREFIX_HEADER = "$(SRCROOT)/Hibit/Project/PrefixHeader.pch"; + GCC_PREFIX_HEADER = "$(SRCROOT)/Hibit/Basics/PrefixHeader.pch"; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = HiBit/Project/Info.plist; + INFOPLIST_FILE = HiBit/Basics/Info.plist; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; INFOPLIST_KEY_UIMainStoryboardFile = Main; @@ -1109,7 +1109,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.qinjiu.HiBit; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_OBJC_BRIDGING_HEADER = "HiBit/Project/HiBit-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "HiBit/Basics/HiBit-Bridging-Header.h"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; diff --git a/HiBit/Project/Assets.xcassets/AccentColor.colorset/Contents.json b/HiBit/Basics/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from HiBit/Project/Assets.xcassets/AccentColor.colorset/Contents.json rename to HiBit/Basics/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/HiBit/Project/Assets.xcassets/AppIcon.appiconset/Contents.json b/HiBit/Basics/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from HiBit/Project/Assets.xcassets/AppIcon.appiconset/Contents.json rename to HiBit/Basics/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/HiBit/Project/Assets.xcassets/Contents.json b/HiBit/Basics/Assets.xcassets/Contents.json similarity index 100% rename from HiBit/Project/Assets.xcassets/Contents.json rename to HiBit/Basics/Assets.xcassets/Contents.json diff --git a/HiBit/Project/Base.lproj/LaunchScreen.storyboard b/HiBit/Basics/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from HiBit/Project/Base.lproj/LaunchScreen.storyboard rename to HiBit/Basics/Base.lproj/LaunchScreen.storyboard diff --git a/HiBit/Project/HiBit-Bridging-Header.h b/HiBit/Basics/HiBit-Bridging-Header.h similarity index 100% rename from HiBit/Project/HiBit-Bridging-Header.h rename to HiBit/Basics/HiBit-Bridging-Header.h diff --git a/HiBit/Project/Info.plist b/HiBit/Basics/Info.plist similarity index 100% rename from HiBit/Project/Info.plist rename to HiBit/Basics/Info.plist diff --git a/HiBit/Project/PrefixHeader.pch b/HiBit/Basics/PrefixHeader.pch similarity index 100% rename from HiBit/Project/PrefixHeader.pch rename to HiBit/Basics/PrefixHeader.pch diff --git a/HiBit/Project/en.lproj/LaunchScreen.storyboard b/HiBit/Basics/en.lproj/LaunchScreen.storyboard similarity index 100% rename from HiBit/Project/en.lproj/LaunchScreen.storyboard rename to HiBit/Basics/en.lproj/LaunchScreen.storyboard diff --git a/HiBit/Project/main.m b/HiBit/Basics/main.m similarity index 100% rename from HiBit/Project/main.m rename to HiBit/Basics/main.m diff --git a/HiBit/Utils/NetWorking/QJNetWorking.h b/HiBit/Utils/HtyoNetWorking/HtyoNetWorking.h similarity index 99% rename from HiBit/Utils/NetWorking/QJNetWorking.h rename to HiBit/Utils/HtyoNetWorking/HtyoNetWorking.h index 816b02f..0096b5c 100644 --- a/HiBit/Utils/NetWorking/QJNetWorking.h +++ b/HiBit/Utils/HtyoNetWorking/HtyoNetWorking.h @@ -19,7 +19,7 @@ typedef NS_ENUM(NSUInteger, HTTPMethod) { NS_ASSUME_NONNULL_BEGIN -@interface QJNetWorking : NSObject +@interface HtyoNetWorking : NSObject /// 网络请求 /// - Parameters: diff --git a/HiBit/Utils/NetWorking/QJNetWorking.m b/HiBit/Utils/HtyoNetWorking/HtyoNetWorking.m similarity index 97% rename from HiBit/Utils/NetWorking/QJNetWorking.m rename to HiBit/Utils/HtyoNetWorking/HtyoNetWorking.m index c8898e0..9a70103 100644 --- a/HiBit/Utils/NetWorking/QJNetWorking.m +++ b/HiBit/Utils/HtyoNetWorking/HtyoNetWorking.m @@ -5,9 +5,9 @@ // Created by 秦九 on 2024/4/29. // -#import "QJNetWorking.h" +#import "HtyoNetWorking.h" -@implementation QJNetWorking +@implementation HtyoNetWorking + (AFHTTPSessionManager *)sharedManager { static AFHTTPSessionManager *manager; @@ -71,7 +71,7 @@ success:(nullable void (^)(NSURLSessionDataTask * _Nonnull, id _Nullable))success failure:(nullable void (^)(NSURLSessionDataTask * _Nullable, NSError * _Nonnull))failure { - AFHTTPSessionManager *manager = [QJNetWorking sharedManager]; + AFHTTPSessionManager *manager = [HtyoNetWorking sharedManager]; for(NSString * key in headers.allKeys) { NSString * value = headers[key]; @@ -156,7 +156,7 @@ success:(nullable void (^)(NSURLSessionDataTask * _Nonnull, id _Nullable))success failure:(nullable void (^)(NSURLSessionDataTask * _Nullable, NSError * _Nonnull))failure{ - AFHTTPSessionManager *manager = [QJNetWorking sharedManager]; + AFHTTPSessionManager *manager = [HtyoNetWorking sharedManager]; if (authorization && authorization.length)[manager.requestSerializer setValue:authorization forHTTPHeaderField:@"Authorization"];