提交添加网家家请求库

liushiyu
1 parent 97eab73a
Showing 8 changed files with 172 additions and 113 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseViewController.swift
metaCode/Classes/Common/Network/API.swift
metaCode/Classes/Common/Network/Network.swift
metaCode/Classes/Config/CNLiveConfigMacro.swift
metaCode/Classes/Other/AppDelegate.swift
metaCode/Classes/Other/ViewController.swift
 # Uncomment the next line to define a global platform for your project
 # platform :ios, '9.0'
+source 'https://mirrors.tuna.tsinghua.edu.cn/git/CocoaPods/Specs.git'
+#source 'https://github.com/CocoaPods/Specs.git'
+#source 'https://cdn.cocoapods.org'
+
+source 'http://bj.gitlab.cnlive.com/ios-team/CNLiveRepos.git'
+source 'http://bj.gitlab.cnlive.com/DSIOSTeam/DSSpecRepos.git'
 target 'metaCode' do
   # Comment the next line if you don't want to use dynamic frameworks
   use_frameworks!
-  pod 'Alamofire'
-  pod 'Moya'
-  pod 'SwiftyJSON'
-  pod 'YYCategories'
+#  pod 'Alamofire'
+#  pod 'Moya'
+#  pod 'SwiftyJSON'
+#  pod 'YYCategories'
+#  pod 'CryptoSwift'
   # Pods for metaCode
+  
+  pod 'AFNetworking'
+  #基础请求组件库
+  pod 'CNLiveRequestBastKit'
   target 'metaCodeTests' do
     inherit! :search_paths
@@ -12,8 +12,7 @@
 		796398932A260C0100D045EB /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963988C2A260C0100D045EB /* ViewController.swift */; };
 		796398942A260C0100D045EB /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963988D2A260C0100D045EB /* AppDelegate.swift */; };
 		7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */; };
-		79A68C4A2A26E6CE00DC3B43 /* Network.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79A68C492A26E6CE00DC3B43 /* Network.swift */; };
-		79A68C4C2A26EA6000DC3B43 /* API.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79A68C4B2A26EA6000DC3B43 /* API.swift */; };
+		79A68C542A27307900DC3B43 /* CNLiveConfigMacro.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79A68C532A27307900DC3B43 /* CNLiveConfigMacro.swift */; };
 		818163C32A25CFCC00579C86 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 818163C12A25CFCC00579C86 /* Main.storyboard */; };
 		818163C52A25CFCF00579C86 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 818163C42A25CFCF00579C86 /* Assets.xcassets */; };
 		818163C82A25CFCF00579C86 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 818163C62A25CFCF00579C86 /* LaunchScreen.storyboard */; };
@@ -50,9 +49,8 @@
 		7963988C2A260C0100D045EB /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
 		7963988D2A260C0100D045EB /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		7963989C2A260E6200D045EB /* CNLiveBaseViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CNLiveBaseViewController.swift; sourceTree = "<group>"; };
-		79A68C492A26E6CE00DC3B43 /* Network.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Network.swift; sourceTree = "<group>"; };
-		79A68C4B2A26EA6000DC3B43 /* API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = API.swift; sourceTree = "<group>"; };
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
+		79A68C532A27307900DC3B43 /* CNLiveConfigMacro.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveConfigMacro.swift; sourceTree = "<group>"; };
 		818163B82A25CFCC00579C86 /* metaCode.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = metaCode.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		818163C22A25CFCC00579C86 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
 		818163C42A25CFCF00579C86 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -154,7 +152,6 @@
 		796398912A260C0100D045EB /* Common */ = {
 			isa = PBXGroup;
 			children = (
-				7963989E2A260E7600D045EB /* Network */,
 				7963989B2A260E6200D045EB /* Base */,
 			);
 			path = Common;
@@ -163,6 +160,7 @@
 		796398922A260C0100D045EB /* Config */ = {
 			isa = PBXGroup;
 			children = (
+				79A68C532A27307900DC3B43 /* CNLiveConfigMacro.swift */,
 			);
 			path = Config;
 			sourceTree = "<group>";
@@ -185,15 +183,6 @@
 			path = Base;
 			sourceTree = "<group>";
 		};
-		7963989E2A260E7600D045EB /* Network */ = {
-			isa = PBXGroup;
-			children = (
-				79A68C492A26E6CE00DC3B43 /* Network.swift */,
-				79A68C4B2A26EA6000DC3B43 /* API.swift */,
-			);
-			path = Network;
-			sourceTree = "<group>";
-		};
 		818163AF2A25CFCC00579C86 = {
 			isa = PBXGroup;
 			children = (
@@ -456,6 +445,7 @@
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-metaCode/Pods-metaCode-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -493,9 +483,8 @@
 			files = (
 				796398942A260C0100D045EB /* AppDelegate.swift in Sources */,
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
-				79A68C4A2A26E6CE00DC3B43 /* Network.swift in Sources */,
+				79A68C542A27307900DC3B43 /* CNLiveConfigMacro.swift in Sources */,
 				796398932A260C0100D045EB /* ViewController.swift in Sources */,
-				79A68C4C2A26EA6000DC3B43 /* API.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -672,10 +661,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.0;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = metaCode/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "元码";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -687,7 +677,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode.debug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -702,10 +692,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 1.0;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = metaCode/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = "元码";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen.storyboard;
 				INFOPLIST_KEY_UIMainStoryboardFile = Main;
@@ -717,7 +708,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode.debug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
@@ -8,5 +8,46 @@
 import UIKit
 import Foundation
-
+class CNLiveBaseViewController: UIViewController {
+    
+    deinit {
+        log("主界面已销毁")
+    }
+    
+    override func viewDidLoad() {
+        self.view.backgroundColor = .white
+        
+        configIOS11()
+        configIOS15()
+    }
+    
+    
+    
+    // MARK: - iOS 适配
+    
+    func configIOS11() {
+        /// 适配 iOS 11.0 ,iOS11以后，控制器的automaticallyAdjustsScrollViewInsets已经废弃，所以默认就会是YES
+        /// iOS 11新增：adjustContentInset 和 contentInsetAdjustmentBehavior 来处理滚动区域
+        if #available(iOS 11.0, *) {
+            UITableView.appearance().estimatedRowHeight = 0
+            UITableView.appearance().estimatedSectionHeaderHeight = 0
+            UITableView.appearance().estimatedSectionFooterHeight = 0
+            // 防止列表/页面偏移
+            UIScrollView.appearance().contentInsetAdjustmentBehavior = .never
+            UITableView.appearance().contentInsetAdjustmentBehavior = .never
+            UICollectionView.appearance().contentInsetAdjustmentBehavior = .never
+        } else {
+            self.automaticallyAdjustsScrollViewInsets = false
+        }
+    }
+    
+    func configIOS15() {
+        // 适配iOS15，tableView的section设置
+        // iOS15中，tableView会给每一个section的顶部（header以上）再加上一个22像素的高度，形成一个section和section之间的间距
+        // 新增的sectionHeaderTopPadding会使表头新增一段间隙，默认为UITableViewAutomaticDimension
+        if #available(iOS 15.0, *) {
+            UITableView.appearance().sectionHeaderTopPadding = 0
+        }
+    }
+}
-//
-//  API.swift
-//  metaCode
-//
-//  Created by open on 2023/5/31.
-//
-
-import Foundation
-import Moya
-
-let base_URL = "https://api.cnlive.com/open/api2/"
-
-enum API{
-    //登陆api
-     case requestLoginApi
-    //获取验证码api
-     case requestAuthCodeApi
-}
-
-extension API : TargetType {
-
-    //此处是为了区分不同根请求
-    var baseURL: URL {
-        switch self {
-        case .requestLoginApi:
-            return URL.init(string: base_URL)!
-        default:
-            return URL.init(string: base_URL)!
-        }
-    }
-    
-    var path: String {
-        switch self{
-        case .requestLoginApi:
-            return "user/loginInMetaCode"
-        case .requestAuthCodeApi:
-            return "user/sendVerifyCode4server"
-        }
-    }
-    
-    var method: Moya.Method {
-        switch self{
-        default:
-            return.post
-        }
-    }
-    
-    var task: Moya.Task {
-        switch self{
-        default:
-            return .requestPlain
-        }
-    }
-    
-    var headers: [String : String]? {
-        return ["Content-Type":"application/x-www-form-urlencoded"]
-    }
-    
-    
-    
-    
-}
-//
-//  Network.swift
-//  metaCode
-//
-//  Created by open on 2023/5/31.
-//
-
-import Foundation
-import UIKit
-import Alamofire
-import Moya
-import SwiftyJSON
-
-
-class Network: NSObject {
-    //请求成功
-    typealias successCallBack = ((Int,JSON) -> (Void))
-    //请求失败
-    typealias failedCallBack = ((Int,String) -> (Void))
-    //网络错误
-    typealias errorCallBack = (() -> (Void))
-    
-    
-    
-}
-
+//
+//  CNLiveConfigMacro.swift
+//  metaCode
+//
+//  Created by open on 2023/5/31.
+//
+
+import Foundation
+import UIKit
+
+/// App 显示名称
+let kAppDisplayName = Bundle.main.infoDictionary?["CFBundleDisplayName"] ?? ""
+/// App BundleName
+let kAppName = Bundle.main.infoDictionary![kCFBundleNameKey as String] ?? ""
+/// App BundleID
+let kAppBundleID = Bundle.main.bundleIdentifier ?? ""
+/// App 版本号
+let kAppVersion = Bundle.main.infoDictionary!["CFBundleShortVersionString"] ?? ""
+/// App BuildNumber
+let kAppBuildNumber = Bundle.main.object(forInfoDictionaryKey: kCFBundleVersionKey as String) ?? ""
+
+/// App Language en
+let kAPPLanguage = NSLocale.preferredLanguages[0]
+
+
+let kApplication = UIApplication.shared
+let keyWindow = UIApplication.shared.keyWindow
+let appDelegate = UIApplication.shared.delegate
+let userDefaults = UserDefaults.standard
+let notificationCenter = NotificationCenter.default
+
+
+// MARK: - 打印输出
+
+/// 默认打印
+public func log<T>(_ message: T) {
+#if DEBUG
+    print("\(message)")
+#endif
+}
+
+/// 全部打印
+public func aLog<T>(_ message: T, file: String = #file, funcName: String = #function, lineNum: Int = #line) {
+#if DEBUG
+    let fileName = (file as NSString).lastPathComponent
+    print("\n********** JhAllLog-satrt ***********\n\n文件名称:\(fileName)\n方法名称:\(funcName)\n行数:\(lineNum)\n信息:\n\n\(message)\n\n********** JhAllLog-end ***********\n")
+#endif
+}
@@ -6,6 +6,8 @@
 //
 import UIKit
+import CNLiveRequestBastKit
+
 @main
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -20,6 +22,18 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window?.rootViewController = ViewController.init()
         window?.makeKeyAndVisible()
+        
+        let kAppBundleID = Bundle.main.bundleIdentifier ?? ""
+        let uuid : String = UIDevice.current.identifierForVendor?.uuidString.replacingOccurrences(of: "-", with: "") ?? ""
+        let ver : String = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
+        let p : Dictionary = ["platform_id":kAppBundleID,"uuid":uuid,"plat":"i","ver":ver,"appId":"802_li40qhp922","timestamp":String(NSNumber(floatLiteral: Date().timeIntervalSince1970).intValue),"clientPlat":"i","frmId":"ios"]
+        CNLiveNetworking.setupDefaultParam(p)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupSignKey("ae3a7ad3e4b9beb7cfe2078db648ebb89aa249ca2e82ac")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setResponseSerializerType(.JSON)
+        
+        
         return true
     }
@@ -6,6 +6,7 @@
 //
 import UIKit
+import CNLiveRequestBastKit
 class ViewController: UIViewController {
@@ -13,6 +14,47 @@ class ViewController: UIViewController {
         super.viewDidLoad()
         // Do any additional setup after loading the view.
         self.view.backgroundColor = .gray
+        
+        
+        let button = UIButton()
+        button.frame = CGRect(x: 100, y: 100, width: 100, height: 40)
+        button.setTitle("请求吧", for: .normal)
+        button.setTitle("请求吧", for: .highlighted)
+        button.backgroundColor = UIColor.red
+        button.setTitleColor(UIColor.gray, for: .normal)
+        button.addTarget(self, action: #selector(touchButton), for: .touchUpInside)
+        button.sizeToFit()
+        self.view.addSubview(button)
+        
+        let button_sha = UIButton()
+        button_sha.frame = CGRect(x: 100, y: 200, width: 100, height: 40)
+        button_sha.setTitle("验证码", for: .normal)
+        button_sha.setTitle("验证码", for: .highlighted)
+        button_sha.backgroundColor = UIColor.red
+        button_sha.setTitleColor(UIColor.gray, for: .normal)
+        button_sha.addTarget(self, action: #selector(shaButton), for: .touchUpInside)
+        button_sha.sizeToFit()
+        self.view.addSubview(button_sha)
+    }
+    
+    @objc func shaButton() -> Void {
+        let param = ["mobile":"18519714533","countryCode":"86"]
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: "https://api.cnlive.com/open/api2/user/sendVerifyCode4server", param: param, cacheType: .networkOnly) { task, result, error in
+            print("\(String(describing: result))")
+        }
+    }
+    
+    @objc func touchButton() {
+        let param = ["userName":"18519714533","countryCode":"86","verificationCode":"599011","inviterId":"","ver":"1"]
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(true)
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: "https://api.cnlive.com/open/api2/user/loginInMetaCode", param: param, cacheType: .networkOnly) { task, result, error in
+            print("\(String(describing: result))")
+        }
+        
+        
     }