处理冲突

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

@@ -25,8 +25,9 @@ class YHHomeViewController: YHBaseViewController {
         initView()
         
         //2.网络请求
-        requestData()
         bind()
+        requestData()
+        
     }
     
     
@@ -43,9 +44,11 @@ class YHHomeViewController: YHBaseViewController {
     }
     
     private func bind() {
-        homeReqVM.subject.observe(on: MainScheduler.instance).subscribe(onNext: { model in
+        homeReqVM.subject.subscribe(onNext: { model in
+            print("网络请求获取的数据是====>")
+            print(model)
             
-        }).disposed(by: disposeBag)
+        }).disposed(by: DisposeBag())
     }
     
     private func initView()->Void {

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

@@ -9,13 +9,6 @@
 import UIKit
 import SmartCodable
 
-//struct YHHomeModel : SmartCodable {
-//    var test : String = ""
-//    
-//}
-
-
-
 struct YHHomeCofigMode : SmartCodable {
     var is_show_new_gift_bag_window : Int = -1
     var is_show_new_gift_bag_entrance : Int = -1
@@ -30,7 +23,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 +39,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(首页)/Server/YHHomeNetWorkServer.swift

@@ -15,7 +15,7 @@ class YHHomeNetWorkServer {
         return Single<[String: Any]>.create { single in
             YHNetRequest.getRequest(url: url) { json, code in
                 //1. json字符串 转 对象
-                guard let model = NetBaseModel.deserialize(dict: json) else {
+                guard NetBaseModel.deserialize(dict: json) != nil else {
                     print("error....底层解析出错了...")
                     return single(.failure(YHError.net))
                 }

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

@@ -14,6 +14,7 @@ class YHHomePageViewModel {
     let disposeBag = DisposeBag()
     //数据源
     var configModel:YHHomeCofigMode?
+    
     let subject = PublishSubject<YHHomeCofigMode>()
 }
 
@@ -37,10 +38,10 @@ extension YHHomePageViewModel {
     
     func getRxHomeConfig() {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Common.homeConfigApi
-        service.getRequest(strUrl).subscribe { jsno in
+        service.getRequest(strUrl).subscribe { json in
             self.subject.onNext(YHHomeCofigMode())
         } onFailure: { error in
             
-        }.disposed(by: disposeBag)
+        }.disposed(by: DisposeBag())
     }
 }

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

@@ -156,7 +156,7 @@ class YHNetRequest: NSObject {
         if statusCode == 200 {
             guard let suclock = self.success else { return }
             let dittt = self.handleJsonObjectNullValue(serverDict)
-            suclock(dittt as? [String : Any] ?? ["": ""], statusCode)
+            suclock(dittt as? [String : Any] ?? [:], statusCode)
         } else {
             let errorModel = YHNetErrorModel.init()
             errorModel.responseErrorType = .failType
@@ -170,7 +170,7 @@ class YHNetRequest: NSObject {
     }
     
     
-    
+    //处理对象为空的情况
     func handleJsonObjectNullValue(_ jsonObject: Any) -> Any {
         if let jsonArray = jsonObject as? Array<Any> {
             let noNullArray: [Any] = jsonArray.map { value in