处理冲突

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeViewController.swift

@@ -7,9 +7,12 @@
 //
 
 import Foundation
+import RxSwift
 
 class YHHomeViewController: YHBaseViewController {
     //C 对应的 VM
+    let disposeBag = DisposeBag()
+
     lazy var homeReqVM : YHHomePageViewModel = {
         return YHHomePageViewModel()
     }()
@@ -23,6 +26,7 @@ class YHHomeViewController: YHBaseViewController {
         
         //2.网络请求
         requestData()
+        bind()
     }
     
     
@@ -38,6 +42,12 @@ class YHHomeViewController: YHBaseViewController {
         self.homeReqVM.getHomeConfig()
     }
     
+    private func bind() {
+        homeReqVM.subject.subscribe(onNext: { model in
+            
+        }).disposed(by: disposeBag)
+    }
+    
     private func initView()->Void {
         navigationItem.title = "首页"
         view.backgroundColor =  UIColor(hex:0xE9E9E9)

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHHomeModel.swift

@@ -30,7 +30,7 @@ struct YHHomeMode1 : SmartCodable {
     var title : String?
     var created_at : String?
     var updated_at : String?
-    var deleted_at : String?
+//    var deleted_at : String?
     var content:[YHHomeMode0]?
 }
 
@@ -46,5 +46,5 @@ struct YHHomeMode0 : SmartCodable {
     var display_type : String?
     var created_at : String?
     var updated_at : String?
-    var deleted_at : String?
+//    var deleted_at : String?
 }

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -7,11 +7,12 @@
 //
 
 import UIKit
+import RxSwift
 
 class YHHomePageViewModel {
     //数据源
     var configModel:YHHomeCofigMode?
-    
+    let subject = PublishSubject<YHHomeCofigMode>()
 }
 
 //接口
@@ -25,8 +26,8 @@ extension YHHomePageViewModel {
                 print("error....底层解析出错了...")
                 return
             }
+            self.subject.onNext(YHHomeCofigMode())
             print("model 是 ==>",model)
-            print(model)
         } failBlock: { err in
             print(err)
         }

galaxy/galaxy/Classes/Tools/NetWork/NetBaseModel.swift

@@ -14,10 +14,6 @@ struct NetBaseModel: SmartCodable {
     var code : Int = -1
     var msg : String = ""
     var other : SmartAny?
-    
-    
-//    var test: TestModel = TestModel()
-//    var testArr:[TestModel] = []
 }
 
 struct TestModel: SmartCodable {

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -102,21 +102,23 @@ class YHNetRequest: NSObject {
         AF.sessionConfiguration.requestCachePolicy = .reloadIgnoringCacheData
         AF.sessionConfiguration.timeoutIntervalForRequest = 30
         httpRequest = AF.request(self.url!,method: self.requestType,parameters: self.params,encoding: URLEncoding(destination: .queryString),headers: requestHeaders,interceptor: nil,requestModifier: nil)
-        _ = httpRequest?.id
+//        _ = httpRequest?.id
         
-                httpRequest?.responseString(completionHandler: { string in
-        #if DEBUG
-                    print("\n网络请求已返回 string=\(string)")
-        #endif
-                    self.completeHandle(string: string)
-                })
+        httpRequest?.responseString(completionHandler: { string in
+#if DEBUG
+            print("\n网络请求已返回 string=\(string)")
+#endif
+            self.completeHandle(string: string)
+        })
         
-//        
-//        httpRequest?.responseJSON(completionHandler: { json in
-//#if DEBUG
-//            print("\n网络请求已返回 string=\(json)")
-//#endif
-//        })
+        //
+        //        httpRequest?.responseJSON(completionHandler: { json in
+        //#if DEBUG
+        //            print("\n网络请求已返回 string=\(json)")
+        //#endif
+        //        })
+        
+    
         return httpRequest
     }
     /// 请求response完成处理
@@ -153,18 +155,8 @@ class YHNetRequest: NSObject {
         
         if statusCode == 200 {
             guard let suclock = self.success else { return }
-            
-            //            guard JSONSerialization.isValidJSONObject(serverDict) == true else {
-            //                let dittt = self.handleJsonObjectNullValue(serverDict)
-            //                suclock(dittt as! [String : Any],statusCode)
-            //                return
-            //            }
-            //            suclock(serverDict,statusCode)
-            
-//            let dittt = self.handleJsonObjectNullValue(serverDict)
-//            suclock(dittt as! [String : Any],statusCode)
-            
-            suclock(serverDict,statusCode)
+            let dittt = self.handleJsonObjectNullValue(serverDict)
+            suclock(dittt as? [String : Any] ?? ["": ""], statusCode)
         } else {
             let errorModel = YHNetErrorModel.init()
             errorModel.responseErrorType = .failType