网络请求优化/数据解析处理

首页图标修改

iOSFirst/Assets.xcassets/ic_person.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "toux.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "toux@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "toux@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOSFirst/Assets.xcassets/ic_pwd.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "密码 (1).png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "密码 (1)@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "密码 (1)@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOSFirst/Assets.xcassets/ic_setting.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "筛选.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "筛选@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "筛选@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

iOSFirst/login/LoginView.swift

@@ -17,13 +17,14 @@ struct LoginView: View {
     @State private var isPresent:Bool = false
     @State private var checked:Bool = true
     @State private var inputPasswordMessage:String = ""
+    @Environment(\.presentationMode) var presentationMode;
+
     
     var body: some View {
-        
         VStack(alignment:.leading,spacing: 0) {
             HStack{
                 Spacer()
-                Image(systemName: "globe")
+                Image("ic_setting")
                     .imageScale(.large)
                     .foregroundColor(.accentColor)
                 Text("设置").font(.system(size: 14))
@@ -55,7 +56,7 @@ struct LoginView: View {
             
             VStack(alignment: .leading, spacing: 400) {
                 HStack(alignment: .center, spacing: 15) {
-                    Image(systemName: "globe")
+                    Image("ic_person")
                         .imageScale(.large)
                         .foregroundColor(.accentColor)
                     
@@ -72,7 +73,7 @@ struct LoginView: View {
             Divider()
             VStack(alignment: .leading, spacing: 400) {
                 HStack(alignment: .center, spacing: 15) {
-                    Image(systemName: "globe")
+                    Image("ic_pwd")
                         .imageScale(.large)
                         .foregroundColor(.accentColor)
                     
@@ -86,7 +87,7 @@ struct LoginView: View {
                 }
                 
             }.frame(height: 80)
-            Divider().padding(.bottom,40)
+            Divider().padding(.bottom,20)
             
             
             VStack(alignment: .trailing, spacing: 400) {
@@ -102,6 +103,7 @@ struct LoginView: View {
                             .font(.system(size: 15))
                         Spacer()
                     }
+                    Spacer().frame(height: 15)
                     Button(action: {
                         if(inputAccountMessage.isEmpty){
                             SUIToast.show(messageItem: .init(
@@ -117,10 +119,18 @@ struct LoginView: View {
                             ))
                         }else {
                             viewModel.loginUser(username: inputAccountMessage, password: inputPasswordMessage)
-                            isPresent=true
+                            if (!viewModel.userResponse.hasObservers){
+                                viewModel.userResponse.subscribe { event in
+                                    isPresent=true
+                                    print("接收到的token值\(String(describing: event.element?.token_value))")
+                                    // 这里需要返回首页，登陆成功后销毁本页面
+                                    self.presentationMode.wrappedValue.dismiss()
+                                }
+                                
+                            }
                         }
                         
-                    }) {
+                    }){
                         Text("登录")
                             .font(.system(size: 17))
                             .bold()

iOSFirst/login/LoginViewModel.swift

@@ -10,36 +10,27 @@ import Moya
 import RxSwift
 import RxCocoa
 import RxRelay
+import SwiftyJSON
+import HandyJSON
 
 
 class LoginViewModel  {
     
-    private let service:MoyaProvider<AccountService>
     private var bag = DisposeBag()
     var userResponse = PublishSubject<LoginUserInfo>()
     
-    init(service:MoyaProvider<AccountService> = accountProvider) {
-        self.service = service
-        
-    }
     
     
     func loginUser(username:String,password:String) {
-        service.rx.request(.login(username, password,false)).subscribe { [weak self] event in
-            switch event {
-            case let .success(response):
-                do {
-                    let response = try response.mapString()
-                    log.info( response )
-                    
-                } catch let error {
-                    log.error(error.localizedDescription)
-                }
-            case .failure(let error):
-                log.error(error.localizedDescription)
+        NetworkManaer
+            .request(AccountService.login(username, password, false)) {[weak self] json in
+                //            self?.mTextView.text = String(describing: JSON(json))
+                self?.userResponse.onNext(json)
+
+            } failure: {code, msg in
+                log.info("code : \(code!)")
+                log.info("message : \(msg)")
             }
-        }.disposed(by: bag)
-        
     }
     
 }

iOSFirst/network/BaseResponse.swift

@@ -0,0 +1,23 @@
+//
+//  BaseResponse.swift
+//  iOSFirst
+//
+//  Created by 孙宇峰 on 2023/2/24.
+//
+
+import Foundation
+import HandyJSON
+ struct  BaseResponse<T:HandyJSON>: HandyJSON{
+    
+    
+    //用户表
+    var code:Int?
+    
+    //姓名
+    var msg:String?
+    
+    //登录帐号
+    var  data:T?
+
+
+}

iOSFirst/network/NetworkManager.swift

@@ -8,14 +8,16 @@
 import Foundation
 import Moya
 import Alamofire
+import HandyJSON
+import RxSwift
 import SwiftyJSON
 
 /// 超时时长
 private var requestTimeOut:Double = 30
 ///endpointClosure
-private let myEndpointClosure = { (target: AccountService) -> Endpoint in
-///这里的endpointClosure和网上其他实现有些不太一样。
-///主要是为了解决URL带有？无法请求正确的链接地址的bug
+public let myEndpointClosure = { (target: TargetType) -> Endpoint in
+    ///这里的endpointClosure和网上其他实现有些不太一样。
+    ///主要是为了解决URL带有？无法请求正确的链接地址的bug
     let url = target.baseURL.absoluteString + target.path
     var endpoint = Endpoint(
         url: url,
@@ -31,7 +33,7 @@ private let myEndpointClosure = { (target: AccountService) -> Endpoint in
     }
 }
 
-private let requestClosure = { (endpoint: Endpoint, done: MoyaProvider.RequestResultClosure) in
+public let requestClosure = { (endpoint: Endpoint, done: MoyaProvider.RequestResultClosure) in
     do {
         var request = try endpoint.urlRequest()
         //设置请求时长
@@ -42,43 +44,19 @@ private let requestClosure = { (endpoint: Endpoint, done: MoyaProvider.RequestRe
         }else{
             log.info("\(request.url!)"+"\(String(describing: request.httpMethod))")
         }
+        if let header = request.allHTTPHeaderFields {
+            log.info("请求头内容\(header)")
+        }
         done(.success(request))
     } catch {
         done(.failure(MoyaError.underlying(error, nil)))
     }
 }
 
-/*   设置ssl
-let policies: [String: ServerTrustPolicy] = [
-    "example.com": .pinPublicKeys(
-        publicKeys: ServerTrustPolicy.publicKeysInBundle(),
-        validateCertificateChain: true,
-        validateHost: true
-    )
-]
-*/
-
-// 用Moya默认的Manager还是Alamofire的Manager看实际需求。HTTPS就要手动实现Manager了
-//private public func defaultAlamofireManager() -> Manager {
-//
-//    let configuration = URLSessionConfiguration.default
-//
-//    configuration.httpAdditionalHeaders = Alamofire.SessionManager.defaultHTTPHeaders
-//
-//    let policies: [String: ServerTrustPolicy] = [
-//        "ap.grtstar.cn": .disableEvaluation
-//    ]
-//    let manager = Alamofire.SessionManager(configuration: configuration,serverTrustPolicyManager: ServerTrustPolicyManager(policies: policies))
-//
-//    manager.startRequestsImmediately = false
-//
-//    return manager
-//}
-
 
 /// NetworkActivityPlugin插件用来监听网络请求
-private let networkPlugin = NetworkActivityPlugin.init { (changeType, targetType) in
-
+public let networkPlugin = NetworkActivityPlugin.init { (changeType, targetType) in
+    
     log.info("networkPlugin \(changeType)")
     //targetType 是当前请求的基本信息
     switch(changeType){
@@ -90,7 +68,104 @@ private let networkPlugin = NetworkActivityPlugin.init { (changeType, targetType
     }
 }
 
+
 // https://github.com/Moya/Moya/blob/master/docs/Providers.md  参数使用说明
 //stubClosure   用来延时发送网络请求
 
+final class TdwMoyaPlugin: PluginType {
+    
+    public func prepare(_ request: URLRequest, target: TargetType) -> URLRequest {
+        var request = request
+        request.addValue("token值", forHTTPHeaderField: "token名字")
+        return request
+    }
+}
+
+
+
 let accountProvider = MoyaProvider<AccountService>(endpointClosure: myEndpointClosure, requestClosure: requestClosure, plugins: [networkPlugin], trackInflights: false)
+
+public class NetworkManaer{
+    
+    
+    /// 使用Moya的请求封装
+    ///
+    /// - Parameters:
+    ///   - target: 请求API，TargetType里的枚举值
+    ///   - success: 成功的回调
+    ///   - error: 连接服务器成功但是数据获取失败
+    ///   - failure: 连接服务器失败
+    public class func request<T: TargetType,U: HandyJSON>(_ target: T, success: @escaping((U) -> Void), failure: ((Int?, String) ->Void)?) {
+        let provider = MoyaProvider<T>(
+            endpointClosure: myEndpointClosure,
+            requestClosure: requestClosure,
+            plugins: [networkPlugin],
+            trackInflights: false
+            //            networkLoggerPlugin
+        )
+        
+        provider.request(target) { result in
+            switch result {
+            case let .success(response):
+                //                let json = try? response.mapString()
+                //                let responseObject = try? response.mapJSON()
+                //                JhLog( responseObject ?? "" );
+                do {
+                    // *********** 这里可以统一处理错误码，弹出提示信息 ***********
+                    let resObject = try? response.mapJSON()
+                    let responseObject = JSON(resObject ?? "")
+                    let code = responseObject["code"].intValue
+                    let msg = String(describing: responseObject["msg"])
+                    switch (code) {
+                    case 0 :
+                        let dictionary=responseObject["obj"].dictionaryObject
+                        let responseData=U.deserialize(from: dictionary)
+                        log.info(responseData?.toJSONString())
+                        // 数据返回正确
+                        success(responseData!)
+                    case 2:
+                        // 请重新登录
+                        failure!(code,msg)
+                        alertLogin(msg)
+                    default:
+                        // 其他错误
+                        failureHandle(failure: failure, stateCode: code, message: msg)
+                    }
+                }
+            case let .failure(error):
+                let statusCode = error.response?.statusCode ?? 1000
+                let message = "请求出错，错误码：" + String(statusCode)
+                log.error(message)
+                failureHandle(failure: failure, stateCode: statusCode, message: error.errorDescription ?? message)
+            }
+        }
+        
+        // 错误处理 - 弹出错误信息
+        func failureHandle(failure: ((Int?, String) ->Void)? , stateCode: Int?, message: String) {
+//            Alert.show(type: .error, text: message)
+            //弹出错误信息
+            failure?(stateCode ,message)
+        }
+        
+        // 登录弹窗 - 弹出是否需要登录的窗口
+        func alertLogin(_ title: String?) {
+            // TODO: 跳转到登录页的操作：
+        }
+        
+    }
+    
+    // MARK: - 打印日志
+    //    static let networkLoggerPlugin = NetworkLoggerPlugin(verbose: true, cURL: true, requestDataFormatter: { data -> String in
+    //        return String(data: data, encoding: .utf8) ?? ""
+    //    }) { data -> (Data) in
+    //        do {
+    //            let dataAsJSON = try JSONSerialization.jsonObject(with: data)
+    //            let prettyData =  try JSONSerialization.data(withJSONObject: dataAsJSON, options: .prettyPrinted)
+    //            return prettyData
+    //        } catch {
+    //            return data
+    //        }
+    //    }
+}
+
+