浏览代码

SwiftMoyaService 整理

南鑫林 6 年之前
父节点
当前提交
f6a380a399
共有 11 个文件被更改,包括 364 次插入324 次删除
  1. 1 1
      RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj
  2. 3 3
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCMS/SwiftMoyaNetWorkServiceCMS.swift
  3. 5 7
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceConfig/SwiftMoyaNetWorkServiceConfig.swift
  4. 27 8
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceOrder/SwiftMoyaNetWorkServiceOrder.swift
  5. 2 2
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServicePay/SwiftMoyaNetWorkServicePay.swift
  6. 27 24
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceProduct/SwiftMoyaNetWorkServiceProduct.swift
  7. 1 1
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceSMS/SwiftMoyaNetWorkServiceSMS.swift
  8. 1 1
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceShop/SwiftMoyaNetWorkServiceShop.swift
  9. 63 51
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift
  10. 2 2
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift
  11. 232 224
      RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkManager.swift

+ 1 - 1
RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -1380,8 +1380,8 @@
 			isa = PBXGroup;
 			children = (
 				A72A7384223396CB00B21995 /* ApiMacro.swift */,
-				A72A7382223396CB00B21995 /* SwiftMoyaNetWorkManager.swift */,
 				A7A17E5E22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift */,
+				A72A7382223396CB00B21995 /* SwiftMoyaNetWorkManager.swift */,
 				A70DD11F2294CA2700C802FD /* SwiftRXMoyaReamlObjectSwiftJsonNetWorkManager.swift */,
 			);
 			path = SwiftMoyaNetWorkManager;

+ 3 - 3
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCMS/SwiftMoyaNetWorkServiceCMS.swift

@@ -37,7 +37,7 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
         let baiduToCityModel = BaiduToCityFactory.shared.query(bjcityId: loacationModel!.cityCode)
         parameters.updateValue(baiduToCityModel.areaCode, forKey: "city_id")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.requestArray(CMSTemplateModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetTemplateName(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestArrayObject(CMSTemplateModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetTemplateName(parameters: parameters))) {
             (cmsTemplateModels) in
             SwiftProgressHUD.shared().hide()
             completion(cmsTemplateModels)
@@ -54,7 +54,7 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
         let baiduToCityModel = BaiduToCityFactory.shared.query(bjcityId: loacationModel!.cityCode)
         parameters.updateValue(baiduToCityModel.areaCode, forKey: "city_id")
         parameters.updateValue(type, forKey: "type")
-        SwiftMoyaNetWorkManager.shared.request(CMSModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetPreview(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestObject(CMSModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetPreview(parameters: parameters))) {
             (cmsModel) in
             SwiftProgressHUD.shared().hide()
             completion(cmsModel)
@@ -68,7 +68,7 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(subjectId, forKey: "subject_id")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.requestArray(ProductSearchModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetProductList(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestArrayObject(ProductSearchModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetProductList(parameters: parameters))) {
             (productSearchModels) in
             SwiftProgressHUD.shared().hide()
             completion(productSearchModels)

+ 5 - 7
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceConfig/SwiftMoyaNetWorkServiceConfig.swift

@@ -29,7 +29,7 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
         let parameters = Dictionary<String,Any>()
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(ConfigModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configConfig(parameters: parameters))) {(configModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(ConfigModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configConfig(parameters: parameters))) {(configModel) in
             SwiftProgressHUD.shared().hide()
             completion(configModel)
         }
@@ -52,7 +52,7 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
         parameters.updateValue(page, forKey: "page")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(SelfMentionAddressListModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configPickupNodeIndex(parameters: parameters))) {(selfMentionAddressListModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(SelfMentionAddressListModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configPickupNodeIndex(parameters: parameters))) {(selfMentionAddressListModel) in
             SwiftProgressHUD.shared().hide()
             completion(selfMentionAddressListModel)
         }
@@ -72,7 +72,7 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
         parameters.updateValue(page, forKey: "page")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(OpenCityListModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configCityManagementIndex(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestObject(OpenCityListModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configCityManagementIndex(parameters: parameters))) {
             (selfMentionAddressListModel) in
             SwiftProgressHUD.shared().hide()
             completion(selfMentionAddressListModel)
@@ -97,10 +97,8 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             multipartData.append(formData)
         }
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadSingleImg(parameters: parameters, dataArray: multipartData))) { (data) in
+        SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadSingleImg(parameters: parameters, dataArray: multipartData))) { (data) in
             SwiftProgressHUD.shared().hide()
-            let rootModel = data as! RootModel
-            print(rootModel)
         }
     }
     
@@ -122,7 +120,7 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             multipartData.append(formData)
         }
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.requestArray(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadMultiImg(parameters: parameters, dataArray: multipartData))) { (imgUrlArr) in
+        SwiftMoyaNetWorkManager.shared.requestAnyArray(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadMultiImg(parameters: parameters, dataArray: multipartData))) { (imgUrlArr) in
             SwiftProgressHUD.shared().hide()
             completion(imgUrlArr)
         }

+ 27 - 8
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceOrder/SwiftMoyaNetWorkServiceOrder.swift

@@ -67,7 +67,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
         parameters.updateValue(jsonStr, forKey: "detail")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(OrderCreateBackModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderCreate(parameters: parameters))) { (orderCreateBackModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(OrderCreateBackModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderCreate(parameters: parameters))) { (orderCreateBackModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderCreateBackModel)
         }
@@ -81,13 +81,32 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
     ///   - completion: 回调
     func orderPurchaseOrderListApi(page:Int = 1,status:Int = -1,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
-        
         if status != -1 {
             parameters.updateValue(status, forKey: "search_status")
         }
+        
+//        if status == -1 {
+//            parameters.updateValue("", forKey: "search_status")
+//        }
+//        if status == 0 {
+//            parameters.updateValue("dfk", forKey: "search_status")
+//        }
+//        if status == 1 {
+//            parameters.updateValue("dfh", forKey: "search_status")
+//        }
+//        if status == 2 {
+//            parameters.updateValue("dsh", forKey: "search_status")
+//        }
+//        if status == 3 {
+//            parameters.updateValue("dpj", forKey: "search_status")
+//        }
+//        if status == 4 {
+//            parameters.updateValue("tk", forKey: "search_status")
+//        }
+
         parameters.updateValue(page, forKey: "page")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(OrderListModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseOrderList(parameters: parameters))) { (orderListModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(OrderListModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseOrderList(parameters: parameters))) { (orderListModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderListModel)
         }
@@ -104,7 +123,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(purchaseNo, forKey: "purchase_no")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(OrderModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseDetail(parameters: parameters))) { (orderModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(OrderModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseDetail(parameters: parameters))) { (orderModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderModel)
         }
@@ -120,7 +139,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(refundNo, forKey: "refund_no")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(OrderRefundDetailModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseRefundDetail(parameters: parameters))) { (orderModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(OrderRefundDetailModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseRefundDetail(parameters: parameters))) { (orderModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderModel)
         }
@@ -146,7 +165,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
         parameters.updateValue(detail, forKey: "detail")
         parameters.updateValue(imgs, forKey: "imgs")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(OrderApplyRefundModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseRefund(parameters: parameters))) { (orderApplyRefundModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(OrderApplyRefundModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseRefund(parameters: parameters))) { (orderApplyRefundModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderApplyRefundModel)
         }
@@ -162,7 +181,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(purchaseId, forKey: "purchase_id")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseConfirm(parameters: parameters))) { (data) in
+        SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseConfirm(parameters: parameters))) { (data) in
             SwiftProgressHUD.shared().hide()
             completion("")
         }
@@ -178,7 +197,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(patchNum, forKey: "patch_num")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseClose(parameters: parameters))) { (data) in
+        SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseClose(parameters: parameters))) { (data) in
             SwiftProgressHUD.shared().showText("取消成功")
             completion("")
         }

+ 2 - 2
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServicePay/SwiftMoyaNetWorkServicePay.swift

@@ -33,7 +33,7 @@ public class SwiftMoyaNetWorkServicePay: NSObject {
         parameters.updateValue(paraMdl.money ?? 0, forKey: "money")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.requestValue(target: MultiTarget(SwiftMoyaServicePayApi.alipay(parameters: parameters))) { (orderString) in
+        SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServicePayApi.alipay(parameters: parameters))) { (orderString) in
             SwiftProgressHUD.shared().hide()
             completion(orderString as Any)
         }
@@ -49,7 +49,7 @@ public class SwiftMoyaNetWorkServicePay: NSObject {
         parameters.updateValue(paraMdl.money ?? 0, forKey: "money")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(WeChatpayOrderModel.self, target: MultiTarget(SwiftMoyaServicePayApi.weixinpay(parameters: parameters))) { (weChatpayOrderModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(WeChatpayOrderModel.self, target: MultiTarget(SwiftMoyaServicePayApi.weixinpay(parameters: parameters))) { (weChatpayOrderModel) in
             let weChatpayOrderModel = weChatpayOrderModel as! WeChatpayOrderModel
             completion(weChatpayOrderModel)
             SwiftProgressHUD.shared().hide()

+ 27 - 24
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceProduct/SwiftMoyaNetWorkServiceProduct.swift

@@ -69,7 +69,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         }
 
         SwiftMoyaNetWorkManager.shared
-            .request(ProductSearchListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productSearch(parameters: parameters))) {(productSearchListModel) in
+            .requestObject(ProductSearchListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productSearch(parameters: parameters))) {(productSearchListModel) in
             completion(productSearchListModel)
         }
     }
@@ -87,7 +87,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         
         SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared
-            .request(CategoryListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCategory(parameters: parameters))) {(categoryListModel) in
+            .requestObject(CategoryListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCategory(parameters: parameters))) {(categoryListModel) in
                 SwiftProgressHUD.shared().hide()
                 completion(categoryListModel)
         }
@@ -102,7 +102,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
     func productHomeProductApi(ids:String = "",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(ids, forKey: "ids")
-        SwiftMoyaNetWorkManager.shared.requestArray(ProductModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productHomeProduct(parameters: parameters))) { (productModels) in
+        SwiftMoyaNetWorkManager.shared.requestArrayObject(ProductModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productHomeProduct(parameters: parameters))) { (productModels) in
             completion(productModels)
         }
         SwiftMoyaNetWorkManager.shared.falseCallback = {
@@ -120,7 +120,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(ProductDetailModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productDetail(parameters: parameters))) { (productDetailModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(ProductDetailModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productDetail(parameters: parameters))) { (productDetailModel) in
             SwiftProgressHUD.shared().hide()
             completion(productDetailModel)
         }
@@ -144,7 +144,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(deliver_type ?? "0", forKey: "deliver_type")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(ProductSearchListModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productHotSale(parameters: parameters))) { (productSearchListModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(ProductSearchListModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productHotSale(parameters: parameters))) { (productSearchListModel) in
             SwiftProgressHUD.shared().hide()
             completion(productSearchListModel)
         }
@@ -160,7 +160,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(productId, forKey: "product_id")
         parameters.updateValue(page, forKey: "page")
-        SwiftMoyaNetWorkManager.shared.request(ProductCommentListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCommentList(parameters: parameters))) { (productCommentListModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(ProductCommentListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCommentList(parameters: parameters))) { (productCommentListModel) in
             completion(productCommentListModel)
         }
     }
@@ -182,7 +182,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(deliver_type ?? "0", forKey: "deliver_type")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(ProductCartListData.self, target: MultiTarget(SwiftMoyaServiceProductApi.productCartList(parameters: parameters))) { (productCartListData) in
+        SwiftMoyaNetWorkManager.shared.requestObject(ProductCartListData.self, target: MultiTarget(SwiftMoyaServiceProductApi.productCartList(parameters: parameters))) { (productCartListData) in
             SwiftProgressHUD.shared().hide()
             completion(productCartListData)
         }
@@ -219,7 +219,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(deliver_type ?? 0, forKey: "deliver_type")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(CartAmountModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (cartAmountModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(CartAmountModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (cartAmountModel) in
             SwiftProgressHUD.shared().hide()
             completion(cartAmountModel)
         }
@@ -257,7 +257,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(deliver_type ?? 0, forKey: "deliver_type")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(CartAmountModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (cartAmountModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(CartAmountModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (cartAmountModel) in
             SwiftProgressHUD.shared().hide()
             completion(cartAmountModel)
         }
@@ -294,7 +294,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(deliver_type ?? 0, forKey: "deliver_type")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(CartAmountModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (cartAmountModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(CartAmountModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (cartAmountModel) in
             SwiftProgressHUD.shared().hide()
             completion(cartAmountModel)
         }
@@ -312,10 +312,11 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(id, forKey: "id")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceProductApi.productCartDelete(parameters: parameters))) { (rootModel) in
-            let rootModel = rootModel as! RootModel
-            SwiftProgressHUD.shared().showText(rootModel.msg!)
-            completion("")
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceProductApi.productCartDelete(parameters: parameters))) { (rootModel) in
+            SwiftProgressHUD.shared().showText(rootModel.msg ?? "信息有误!!!")
+            if rootModel.code  == 0 {
+                completion("")
+            }
         }
     }
     
@@ -332,7 +333,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(type, forKey: "type")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(CartAmountModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productCartAmount(parameters: parameters))) { (cartAmountModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(CartAmountModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productCartAmount(parameters: parameters))) { (cartAmountModel) in
             SwiftProgressHUD.shared().hide()
             completion(cartAmountModel)
         }
@@ -357,10 +358,11 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(deliver_type ?? "0", forKey: "deliver_type")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceProductApi.productCartIsSel(parameters: parameters))) { (rootModel) in
-            let rootModel = rootModel as! RootModel
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceProductApi.productCartIsSel(parameters: parameters))) { (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
-            completion("")
+            if rootModel.code == 0 {
+                completion("")
+            }
         }
     }
     
@@ -382,10 +384,11 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(deliver_type ?? "2", forKey: "deliver_type")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceProductApi.productCartAllSel(parameters: parameters))) { (rootModel) in
-            let rootModel = rootModel as! RootModel
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceProductApi.productCartAllSel(parameters: parameters))) { (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
-            completion("")
+            if rootModel.code == 0 {
+                completion("")
+            }
         }
     }
     
@@ -397,7 +400,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
     func productRefundReasonApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(ProductRefundReasonModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productRefundReason(parameters: parameters))) { (refundReasonModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(ProductRefundReasonModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productRefundReason(parameters: parameters))) { (refundReasonModel) in
             SwiftProgressHUD.shared().hide()
             completion(refundReasonModel)
         }
@@ -439,7 +442,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(jsonStr, forKey: "content")
                 
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.requestArray(target: MultiTarget(SwiftMoyaServiceProductApi.productAddComment(parameters: parameters))) { (dataArr) in
+        SwiftMoyaNetWorkManager.shared.requestAnyArray(target: MultiTarget(SwiftMoyaServiceProductApi.productAddComment(parameters: parameters))) { (dataArr) in
             SwiftProgressHUD.shared().hide()
             completion(dataArr)
         }
@@ -460,7 +463,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         // 本地获取deliver_type
         let deliver_type = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
         parameters.updateValue(deliver_type ?? "2", forKey: "deliver_type")
-        SwiftMoyaNetWorkManager.shared.request(ProductCartCountModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productGetCartCount(parameters: parameters))) { (productCartCountModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(ProductCartCountModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productGetCartCount(parameters: parameters))) { (productCartCountModel) in
             completion(productCartCountModel)
         }
     }

+ 1 - 1
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceSMS/SwiftMoyaNetWorkServiceSMS.swift

@@ -39,7 +39,7 @@ class SwiftMoyaNetWorkServiceSMS: NSObject {
         parameters.updateValue(AppInfo.ipAddress, forKey: "ip")
 
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceSMSApi.smsSend(parameters: parameters))) { (UserModel) in
+        SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceSMSApi.smsSend(parameters: parameters))) { (data) in
             SwiftProgressHUD.shared().hide()
             completion("")
         }

+ 1 - 1
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceShop/SwiftMoyaNetWorkServiceShop.swift

@@ -31,7 +31,7 @@ class SwiftMoyaNetWorkServiceShop: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(shopId, forKey: "id")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(ShopModel.self,target: MultiTarget(SwiftMoyaServiceShopApi.shopView(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestObject(ShopModel.self,target: MultiTarget(SwiftMoyaServiceShopApi.shopView(parameters: parameters))) {
             (shopModel) in
             SwiftProgressHUD.shared().hide()
             completion(shopModel)

+ 63 - 51
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -42,7 +42,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         parameters.updateValue(username, forKey: "username")
         parameters.updateValue(gender, forKey: "gender")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userWeiXinRegister(parameters: parameters))) { (userModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userWeiXinRegister(parameters: parameters))) { (userModel) in
             UserModel.shared().setModel(model: userModel as! UserModel)
             SwiftProgressHUD.shared().hide()
             completion(UserModel.shared().getModel() as Any)
@@ -63,7 +63,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(mobile, forKey: "mobile")
             parameters.updateValue(sms_code, forKey: "sms_code")
             SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared.request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMobileRegister(parameters: parameters))) { (userModel) in
+            SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMobileRegister(parameters: parameters))) { (userModel) in
                 UserModel.shared().setModel(model: userModel as! UserModel)
                 SwiftProgressHUD.shared().hide()
                 completion("")
@@ -86,7 +86,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(mobile, forKey: "mobile")
             parameters.updateValue(password, forKey: "password")
             SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared.request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMobileLogin(parameters: parameters))) { (userModel) in
+            SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMobileLogin(parameters: parameters))) { (userModel) in
                 UserModel.shared().setModel(model: userModel as! UserModel)
                 SwiftProgressHUD.shared().hide()
                 completion("")
@@ -102,7 +102,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userRefreshApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userRefresh(parameters: parameters))) { (userModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userRefresh(parameters: parameters))) { (userModel) in
             UserModel.shared().setModel(model: userModel as! UserModel)
             SwiftProgressHUD.shared().hide()
             completion("")
@@ -117,7 +117,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userLogoutApi() {
         let parameters = Dictionary<String,Any>()
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userLogout(parameters: parameters))) { (data) in
+        SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceUserApi.userLogout(parameters: parameters))) { (data) in
             kAppDelegate.setLoginController()
             SwiftProgressHUD.shared().hide()
         }
@@ -142,7 +142,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(openId, forKey: "open_id")
             
             SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared.request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindMobile(parameters: parameters))) { (userModel) in
+            SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindMobile(parameters: parameters))) { (userModel) in
                 UserModel.shared().setModel(model: userModel as! UserModel)
                 SwiftProgressHUD.shared().hide()
                 completion("")
@@ -166,10 +166,15 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             SwiftProgressHUD.shared().showText("暂时不可以解绑,请先绑定手机号")
         }else {
             SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userIsBindWeixin(parameters: parameters))) {
+            SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userIsBindWeixin(parameters: parameters))) {
                 [weak self] (rootModel) in
                 SwiftProgressHUD.shared().hide()
-                self?.userUnbindWeixinApi(completion: completion)
+                if rootModel.code == 0 {
+                    SwiftProgressHUD.shared().hide()
+                    self?.userUnbindWeixinApi(completion: completion)
+                } else {
+                    SwiftProgressHUD.shared().showText(rootModel.msg!)
+                }
             }
         }
         
@@ -188,14 +193,16 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         parameters.updateValue(umLoginModel.open_id, forKey: "open_id")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userIsBindWeixin(parameters: parameters)),isCustomAlert: true) {
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userIsBindWeixin(parameters: parameters))) {
             [weak self] (rootModel) in
-            let rootModel = rootModel as! RootModel
-            SwiftProgressHUD.shared().hide()
             if rootModel.code == 0 {
+                SwiftProgressHUD.shared().hide()
+
                 self?.userBindWeixinApi(mobile: UserModel.shared().getModel()?.mobile ?? "", umLoginModel: umLoginModel, completion: completion)
 
             }else if rootModel.code == 1 {
+                SwiftProgressHUD.shared().hide()
+
                 AlertSheetView.alert(title: rootModel.msg ?? "此微信号被其他账号绑定,是否要将此微信号绑定至本账号,并解绑另一起账号?", cancelTitle: "取消", sureTitle: "确认", cancelBlock: { (popupView, index, string) in
                     
                 }, confirmBlock: { (popupView, index, string) in
@@ -207,6 +214,8 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
 
                     })
                 })
+            }else {
+                SwiftProgressHUD.shared().showText(rootModel.msg ?? "信息有误")
             }
         }
     }
@@ -230,7 +239,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(umLoginModel.gender, forKey: "gender")
             
             SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared.request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindWeixin(parameters: parameters))) { (userModel) in
+            SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindWeixin(parameters: parameters))) { (userModel) in
                 UserModel.shared().setModel(model: userModel as! UserModel)
                 SwiftProgressHUD.shared().hide()
                 completion("")
@@ -253,7 +262,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         parameters.updateValue(userModel!.openId! as Any, forKey: "open_id")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userUnbindWeixin(parameters: parameters))) {(userModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userUnbindWeixin(parameters: parameters))) {(userModel) in
             UserModel.shared().setModel(model: userModel as! UserModel)
             SwiftProgressHUD.shared().hide()
             completion("")
@@ -277,8 +286,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(password_confirmation, forKey: "password_confirmation")
             
             SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userSetPassword(parameters: parameters))) {(rootModel) in
-                let rootModel = rootModel as! RootModel
+            SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userSetPassword(parameters: parameters))) {(rootModel) in
                 SwiftProgressHUD.shared().showText(rootModel.msg!)
                 if rootModel.code == 0 {
                     let userModel = UserModel.shared().getModel()
@@ -305,7 +313,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         parameters.updateValue(baiduToCityModel.areaCode, forKey: "city_id")
         parameters.updateValue(type, forKey: "type")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(AddressManagerListModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userSelfAddressList(parameters: parameters))) {(addressManagerListModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(AddressManagerListModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userSelfAddressList(parameters: parameters))) {(addressManagerListModel) in
             SwiftProgressHUD.shared().hide()
             completion(addressManagerListModel)
         }
@@ -343,10 +351,11 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(expressAddresModel.address ?? "", forKey: "address")
             
             SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddExpressAddress(parameters: parameters))) {(rootModel) in
-                let rootModel = rootModel as! RootModel
+            SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userAddExpressAddress(parameters: parameters))) {(rootModel) in
                 SwiftProgressHUD.shared().showText(rootModel.msg!)
-                completion("")
+                if rootModel.code == 0 {
+                    completion("")
+                }
             }
         }
         
@@ -362,11 +371,12 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddressIsDefault(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userAddressIsDefault(parameters: parameters))) {
             (rootModel) in
-            let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
-            completion("")
+            if rootModel.code == 0 {
+                completion("")
+            }
         }
     }
     
@@ -379,11 +389,12 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddressDelete(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userAddressDelete(parameters: parameters))) {
             (rootModel) in
-            let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
-            completion("")
+            if rootModel.code == 0 {
+                completion("")
+            }
         }
     }
     
@@ -394,7 +405,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userExpreesContactsListApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(ContactListModel.self, target: MultiTarget(SwiftMoyaServiceUserApi.userExpreesContactsList(parameters: parameters))) { (contactListModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(ContactListModel.self, target: MultiTarget(SwiftMoyaServiceUserApi.userExpreesContactsList(parameters: parameters))) { (contactListModel) in
             SwiftProgressHUD.shared().hide()
             completion(contactListModel)
         }
@@ -407,7 +418,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userDefaultExpressApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(ExpressAddresModel.self, target: MultiTarget(SwiftMoyaServiceUserApi.userDefaultExpress(parameters: parameters))) { (expressAddrModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(ExpressAddresModel.self, target: MultiTarget(SwiftMoyaServiceUserApi.userDefaultExpress(parameters: parameters))) { (expressAddrModel) in
             SwiftProgressHUD.shared().hide()
             completion(expressAddrModel as Any)
         }
@@ -420,11 +431,8 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userDefaultContactApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userDefaultContact(parameters: parameters))) {(rootModel) in
+        SwiftMoyaNetWorkManager.shared.requestObject(SelfMentionContactsModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userDefaultContact(parameters: parameters))) {(contactMdl) in
             SwiftProgressHUD.shared().hide()
-            let rootModel = rootModel as! RootModel
-            
-            let contactMdl = SelfMentionContactsModel(JSONString: rootModel.data ?? "")
             completion(contactMdl as Any)
         }
     }
@@ -450,11 +458,12 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 parameters.updateValue(mobile, forKey: "mobile")
                 parameters.updateValue(name, forKey: "name")
                 SwiftProgressHUD.shared().showWait()
-                SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userSaveExpreesContacts(parameters: parameters))) {
+                SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userSaveExpreesContacts(parameters: parameters))) {
                     (rootModel) in
-                    let rootModel = rootModel as! RootModel
                     SwiftProgressHUD.shared().showText(rootModel.msg!)
-                    completion("")
+                    if rootModel.code == 0 {
+                        completion("")
+                    }
                 }
             }
         }        
@@ -470,11 +479,12 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userDelExpreesContacts(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userDelExpreesContacts(parameters: parameters))) {
             (rootModel) in
-            let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
-            completion("")
+            if rootModel.code == 0 {
+                completion("")
+            }
         }
     }
     
@@ -488,11 +498,12 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userSetExpreesContactsDefault(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userSetExpreesContactsDefault(parameters: parameters))) {
             (rootModel) in
-            let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
-            completion("")
+            if rootModel.code == 0 {
+                completion("")
+            }
         }
     }
     
@@ -510,11 +521,12 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         parameters.updateValue(pickupNodeId, forKey: "pickup_node_id")
         parameters.updateValue(address, forKey: "address")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddSelfAddress(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userAddSelfAddress(parameters: parameters))) {
             (rootModel) in
-            let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
-            completion("")
+            if rootModel.code == 0 {
+                completion("")
+            }
         }
     }
     
@@ -528,16 +540,16 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(deliveryMethodType, forKey: "deliver_type")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userSetDeliverType(parameters: parameters))) {
+        SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userSetDeliverType(parameters: parameters))) {
             (rootModel) in
-            let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
-            
-            // 设置成功更新本地存储数据
-            let model = DeliveryMethodTypeModel.shared().getModel()
-            model?.deliveryMethodType = deliveryMethodType
-            DeliveryMethodTypeModel.shared().setModel(model: model!)
-            completion("")
+            if rootModel.code == 0 {
+                // 设置成功更新本地存储数据
+                let model = DeliveryMethodTypeModel.shared().getModel()
+                model?.deliveryMethodType = deliveryMethodType
+                DeliveryMethodTypeModel.shared().setModel(model: model!)
+                completion("")
+            }
         }
     }
 

+ 2 - 2
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -9,14 +9,14 @@
 import Foundation
 
 let kDevelopSever = false
-let kTestSever = true
+let kBetaSever = true
 let kProductSever = false
 
 // MARK: - 数据服务器
 public func kApiDataPrefix() -> String {
     if kDevelopSever /** 接口前缀-开发服务器*/ {
         return "https://api.dev.caihongxingqiu.com"
-    } else if kTestSever /** 接口前缀-测试服务器*/{
+    } else if kBetaSever /** 接口前缀-测试服务器*/{
         return "https://api.dev.caihongxingqiu.com/beta"
     }else if kProductSever /** 接口前缀-生产服务器*/ {
         return ""

+ 232 - 224
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkManager.swift

@@ -16,34 +16,65 @@ import RxCocoa
 import Result
 
 public class SwiftMoyaNetWorkManager: NSObject {
-
-    private let disposeBag = DisposeBag()
     
+    /// 释放内存
+    private let disposeBag = DisposeBag()
+    /// 单例
     static let shared : SwiftMoyaNetWorkManager = SwiftMoyaNetWorkManager()
-
-    /// 成功回调 对象
-    typealias successCallback = (_ data: Any) -> Void
-    /// 成功回调带泛型 数组
-    typealias successCallArrayback = (_ data: [Any]) -> Void
-    
+    /// 成功回调带泛型 RootModel
+    typealias successCallRootModelBack = (_ T: RootModel) -> Void
+    /// 成功回调带泛型 任意值
+    typealias successCallAnyBack = (_ data: Any) -> Void
+    /// 成功回调带泛型 任意数组
+    typealias successCallAnyArrayback = (_ data: [Any]) -> Void
     /// 成功回调带泛型 对象
-    typealias successCallTBack = (_ T: BaseMappable) -> Void
-    /// 成功回调带泛型 数组
-    typealias successCallArrayTback = (_ T: [BaseMappable]) -> Void
-
+    typealias successCallObjectBack = (_ T: BaseMappable) -> Void
+    /// 成功回调带泛型 对象数组
+    typealias successCallArrayObjectback = (_ T: [BaseMappable]) -> Void
+    /// 失败回调
     typealias falseCallback = () -> Void
     var falseCallback : falseCallback?
+}
 
+extension SwiftMoyaNetWorkManager {
+    // MARK: 取消所有请求
+    /// 取消所有请求
+    func cancelAllRequest() {
+        provider.manager.session.getTasksWithCompletionHandler { dataTasks, uploadTasks, downloadTasks in
+            dataTasks.forEach { $0.cancel() }
+            uploadTasks.forEach { $0.cancel() }
+            downloadTasks.forEach { $0.cancel() }
+        }
+    }
+    
+    // MARK: 取消指定请求
+    /// 取消指定请求
+    ///
+    /// - Parameter url: 指定的网络请求地址
+    func cancelDesignationRequest(url:String) {
+        provider.manager.session.getTasksWithCompletionHandler {
+            (sessionDataTask, uploadData, downloadData) in
+            sessionDataTask.forEach {
+                //只取消指定url的请求
+                if ($0.originalRequest?.url?.absoluteString == url) {
+                    $0.cancel()
+                }
+            }
+        }
+    }
+    
+}
+
+extension SwiftMoyaNetWorkManager {
+    
     // MARK: 泛型网络请求返回对象
     /// 泛型网络请求返回对象
     /// 网络请求
     ///
     /// - Parameters:
-    ///   - type: 模型
     ///   - target: 请求地址加参数
-    ///   - isCache: 是否缓存
     ///   - completion: 回调
-    func request<T: BaseMappable>(_ type: T.Type ,target: MultiTarget,isCustomAlert:Bool = false,completion: @escaping successCallTBack) -> Void {
+    func requestRootModel(target: MultiTarget,completion: @escaping successCallRootModelBack) -> Void {
         //判断是否链接网络
         if !isNetworkConnect{
             if let falseCallback = self.falseCallback  {
@@ -52,14 +83,14 @@ public class SwiftMoyaNetWorkManager: NSObject {
             return
         }
         
-
+        
         provider.rx
             .request(target)
-            .map(T.self)
+            .mapRootModel()
             .subscribeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
             .observeOn(MainScheduler.instance)
             .subscribe(onSuccess: { [weak self] element in
-
+                
                 guard let element = element else {
                     if let falseCallback = self?.falseCallback  {
                         falseCallback()
@@ -76,15 +107,16 @@ public class SwiftMoyaNetWorkManager: NSObject {
             }
             .disposed(by: disposeBag)
     }
-    // MARK: 泛型网络请求返回数组对象
-    /// 泛型网络请求返回数组对象
+    
+
+    // MARK: 泛型网络请求返回任意值
+    /// 泛型网络请求返回任意值
+    /// 网络请求
     ///
     /// - Parameters:
-    ///   - type: 模型
     ///   - target: 请求地址加参数
-    ///   - isCache: 是否缓存
     ///   - completion: 回调
-    func requestArray<T: BaseMappable>(_ type: T.Type ,target: MultiTarget,isCustomAlert:Bool = false,completion: @escaping successCallArrayTback) -> Void {
+    func requestAny(target: MultiTarget,completion: @escaping successCallAnyBack) -> Void {
         //判断是否链接网络
         if !isNetworkConnect{
             if let falseCallback = self.falseCallback  {
@@ -92,14 +124,15 @@ public class SwiftMoyaNetWorkManager: NSObject {
             }
             return
         }
-        
+
+
         provider.rx
             .request(target)
-            .mapArray(T.self)
+            .mapAnyValue()
             .subscribeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
             .observeOn(MainScheduler.instance)
             .subscribe(onSuccess: { [weak self] element in
-                
+
                 guard let element = element else {
                     if let falseCallback = self?.falseCallback  {
                         falseCallback()
@@ -116,14 +149,15 @@ public class SwiftMoyaNetWorkManager: NSObject {
             }
             .disposed(by: disposeBag)
     }
-
-    // MARK: 网络请求返回RootModel
-    /// 网络请求返回RootModel
+    
+    // MARK: 泛型网络请求返回任意值数组
+    /// 泛型网络请求返回返回任意值数组
+    /// 网络请求
     ///
     /// - Parameters:
     ///   - target: 请求地址加参数
-    ///   - completion: 请求成功回调
-    func request(target: MultiTarget,isCustomAlert:Bool = false,completion: @escaping successCallback) -> Void {
+    ///   - completion: 回调
+    func requestAnyArray(target: MultiTarget,completion: @escaping successCallAnyArrayback) -> Void {
         //判断是否链接网络
         if !isNetworkConnect{
             if let falseCallback = self.falseCallback  {
@@ -131,30 +165,41 @@ public class SwiftMoyaNetWorkManager: NSObject {
             }
             return
         }
-
+        
+        
         provider.rx
             .request(target)
+            .mapAnyArray()
             .subscribeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
             .observeOn(MainScheduler.instance)
-            .subscribe(onSuccess: { [weak self] response in
-                self?.getResponseStatusCode(response: response, completion: completion)
+            .subscribe(onSuccess: { [weak self] element in
+                
+                guard let element = element else {
+                    if let falseCallback = self?.falseCallback  {
+                        falseCallback()
+                    }
+                    return
+                }
+                completion(element)
             }) {
                 [weak self] (error) in
-                SwiftProgressHUD.shared().showText(error.localizedDescription)
                 if let falseCallback = self?.falseCallback  {
                     falseCallback()
                 }
+                SwiftProgressHUD.shared().showError("网络链接失败,请检查网络")
             }
             .disposed(by: disposeBag)
     }
-    
-    // MARK: 网络请求返回Value
-    /// 网络请求返回Value
+
+    // MARK: 泛型网络请求返回对象
+    /// 泛型网络请求返回对象
+    /// 网络请求
     ///
     /// - Parameters:
+    ///   - type: 模型
     ///   - target: 请求地址加参数
-    ///   - completion: 请求成功回调
-    func requestValue(target: MultiTarget,completion: @escaping successCallback) -> Void {
+    ///   - completion: 回调
+    func requestObject<T: BaseMappable>(_ type: T.Type ,target: MultiTarget,completion: @escaping successCallObjectBack) -> Void {
         //判断是否链接网络
         if !isNetworkConnect{
             if let falseCallback = self.falseCallback  {
@@ -162,30 +207,39 @@ public class SwiftMoyaNetWorkManager: NSObject {
             }
             return
         }
-        
+
+
         provider.rx
             .request(target)
+            .mapObject(T.self)
             .subscribeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
             .observeOn(MainScheduler.instance)
-            .subscribe(onSuccess: { [weak self] response in
-                self?.getResponseValueStatusCode(response: response, completion: completion)
+            .subscribe(onSuccess: { [weak self] element in
+
+                guard let element = element else {
+                    if let falseCallback = self?.falseCallback  {
+                        falseCallback()
+                    }
+                    return
+                }
+                completion(element)
             }) {
                 [weak self] (error) in
-                SwiftProgressHUD.shared().showText(error.localizedDescription)
                 if let falseCallback = self?.falseCallback  {
                     falseCallback()
                 }
+                SwiftProgressHUD.shared().showError("网络链接失败,请检查网络")
             }
             .disposed(by: disposeBag)
     }
-    
-    // MARK: 网络请求返回数组
-    /// 网络请求返回数组
+    // MARK: 泛型网络请求返回数组对象
+    /// 泛型网络请求返回数组对象
     ///
     /// - Parameters:
+    ///   - type: 模型
     ///   - target: 请求地址加参数
-    ///   - completion: 请求成功回调
-    func requestArray(target: MultiTarget,completion: @escaping successCallArrayback) -> Void {
+    ///   - completion: 回调
+    func requestArrayObject<T: BaseMappable>(_ type: T.Type ,target: MultiTarget,completion: @escaping successCallArrayObjectback) -> Void {
         //判断是否链接网络
         if !isNetworkConnect{
             if let falseCallback = self.falseCallback  {
@@ -193,212 +247,166 @@ public class SwiftMoyaNetWorkManager: NSObject {
             }
             return
         }
-        
+
         provider.rx
             .request(target)
+            .mapArrayObject(T.self)
             .subscribeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
             .observeOn(MainScheduler.instance)
-            .subscribe(onSuccess: { [weak self] response in
-                
-                self?.getResponseArrayStatusCode(response: response, completion: completion)
+            .subscribe(onSuccess: { [weak self] element in
+
+                guard let element = element else {
+                    if let falseCallback = self?.falseCallback  {
+                        falseCallback()
+                    }
+                    return
+                }
+                completion(element)
             }) {
                 [weak self] (error) in
-                SwiftProgressHUD.shared().showText(error.localizedDescription)
                 if let falseCallback = self?.falseCallback  {
                     falseCallback()
                 }
+                SwiftProgressHUD.shared().showError("网络链接失败,请检查网络")
             }
             .disposed(by: disposeBag)
     }
-
-    // MARK: 取消所有请求
-    /// 取消所有请求
-    func cancelAllRequest() {
-        provider.manager.session.getTasksWithCompletionHandler { dataTasks, uploadTasks, downloadTasks in
-            dataTasks.forEach { $0.cancel() }
-            uploadTasks.forEach { $0.cancel() }
-            downloadTasks.forEach { $0.cancel() }
-        }
-    }
-
-    // MARK: 取消指定请求
-    /// 取消指定请求
-    ///
-    /// - Parameter url: 指定的网络请求地址
-    func cancelDesignationRequest(url:String) {
-        provider.manager.session.getTasksWithCompletionHandler {
-            (sessionDataTask, uploadData, downloadData) in
-            sessionDataTask.forEach {
-                //只取消指定url的请求
-                if ($0.originalRequest?.url?.absoluteString == url) {
-                    $0.cancel()
-                }
-            }
-        }
-    }
-    
 }
-// MARK: - StatusCode
-extension SwiftMoyaNetWorkManager {
-    // MARK: 返回RootModel
-    /// 获取状态码返回RootModel
-    ///
-    /// - Parameters:
-    ///   - response: 响应结果
-    ///   - completion: 回调
-    private func getResponseStatusCode(response:Response, completion: @escaping successCallback) -> Void {
-        let json = try? JSON(response.mapJSON())
-        if response.statusCode == 200 {
-            let url = String(describing: response.request!.url!)
-            NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\njson=\n\(json!.description)")
-            
-            let json = JSON(parseJSON: json!.description)
-            let rootModel = RootModel(JSONString: json.description)
-            let data = JSON(json["data"]).description
-            rootModel?.data = data
-            if rootModel!.code == 0 {
-                completion(rootModel as Any)
-            }else if rootModel!.code  == 1 {
-                SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!", textAlignment: .left)
 
-                if let falseCallback = self.falseCallback  {
-                    falseCallback()
+// MARK: - 泛型
+extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Response {
+    
+    // MARK: 泛型返回RootModel
+    func mapRootModel() -> Single<RootModel?> {
+        return flatMap { response -> Single<RootModel?> in
+            do {
+                let json = try JSON(response.mapJSON())
+                if response.statusCode == 200 {
+                    NXLLog("\nurl=\(String(describing: response.request!.url!))\nstatusCode=\(response.statusCode)\njson=\n\(json.description)");
+                    
+                    let json = JSON(parseJSON: json.description)
+                    let rootModel = RootModel(JSONString: json.description)
+                    let data = JSON(json["data"]).description
+                    rootModel?.data = data
+                    return Single<RootModel?>.just(rootModel)
+                }else if response.statusCode == 401 {
+                    let url = String(describing: response.request!.url!)
+                    NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\njson=\n\(json.description)")
+                    let infoModel = InfoModel(JSONString: json.description)
+                    SwiftProgressHUD.shared().showText(infoModel!.message ?? "登录过期,请重新登录")
+                    kAppDelegate.setLoginController()
+                    return Single<RootModel?>.just(nil)
+                }else {
+                    let url = String(describing: response.request!.url!)
+                    NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)");
+                    SwiftProgressHUD.shared().showText(response.description)
+                    
+                    return Single<RootModel?>.just(nil)
                 }
                 
-            }else {
-                SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!")
-                if let falseCallback = self.falseCallback  {
-                    falseCallback()
-                }
-            }
-        }else if response.statusCode == 401 {
-            let url = String(describing: response.request!.url!)
-            NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\njson=\n\(json!.description)")
-            let infoModel = InfoModel(JSONString: json?.description ?? "")
-            kAppDelegate.setLoginController()
-            SwiftProgressHUD.shared().showText(infoModel!.message ?? "登录过期,请重新登录")
-            
-            if let falseCallback = self.falseCallback  {
-                falseCallback()
-            }
-        } else {
-            let url = String(describing: response.request!.url!)
-            NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)");
-            
-            if let falseCallback = self.falseCallback  {
-                falseCallback()
+            } catch {
+                let url = String(describing: response.request!.url!)
+                NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)")
+                SwiftProgressHUD.shared().showText(response.description)
+                return Single<RootModel?>.just(nil)
             }
         }
     }
     
-    // MARK: 返回Vaule
-    /// 获取状态码返回Vaule
-    ///
-    /// - Parameters:
-    ///   - response: 响应结果
-    ///   - completion: 回调
-    private func getResponseValueStatusCode(response:Response, completion: @escaping successCallback) -> Void {
-        let json = try? JSON(response.mapJSON())
-        if response.statusCode == 200 {
-            let url = String(describing: response.request!.url!)
-            NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\njson=\n\(json!.description)")
-            let json = JSON(parseJSON: json!.description)
-            let rootModel = RootModel(JSONString: json.description)
-            let data = JSON(json["data"]).description
-            rootModel?.data = data
-            if rootModel!.code == 0 {
-                completion(rootModel?.data as Any)
-            }else if rootModel!.code  == 1 {
-                SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!", textAlignment: .left)
-
-                if let falseCallback = self.falseCallback  {
-                    falseCallback()
+    // MARK: 泛型返回任意类型
+    func mapAnyValue() -> Single<Any?> {
+        return flatMap { response -> Single<Any?> in
+            do {
+                let json = try JSON(response.mapJSON())
+                if response.statusCode == 200 {
+                    NXLLog("\nurl=\(String(describing: response.request!.url!))\nstatusCode=\(response.statusCode)\njson=\n\(json.description)");
+                    
+                    let json = JSON(parseJSON: json.description)
+                    let rootModel = RootModel(JSONString: json.description)
+                    let data = JSON(json["data"]).description
+                    rootModel?.data = data
+                    if rootModel!.code  == 0 {
+                        return Single<Any?>.just(rootModel?.data as Any)
+                    }else if rootModel!.code  == 1 {
+                        SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!")
+                        return Single<Any?>.just(nil)
+                    }else {
+                        SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!")
+                        return Single<Any?>.just(nil)
+                    }
+                }else if response.statusCode == 401 {
+                    let url = String(describing: response.request!.url!)
+                    NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\njson=\n\(json.description)")
+                    let infoModel = InfoModel(JSONString: json.description)
+                    SwiftProgressHUD.shared().showText(infoModel!.message ?? "登录过期,请重新登录")
+                    kAppDelegate.setLoginController()
+                    return Single<Any?>.just(nil)
+                }else {
+                    let url = String(describing: response.request!.url!)
+                    NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)");
+                    SwiftProgressHUD.shared().showText(response.description)
+                    
+                    return Single<Any?>.just(nil)
                 }
                 
-            }else {
-                SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!")
-                if let falseCallback = self.falseCallback  {
-                    falseCallback()
-                }
-            }
-        }else if response.statusCode == 401 {
-            let url = String(describing: response.request!.url!)
-            NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\njson=\n\(json!.description)")
-            let infoModel = InfoModel(JSONString: json?.description ?? "")
-            kAppDelegate.setLoginController()
-            SwiftProgressHUD.shared().showText(infoModel!.message ?? "登录过期,请重新登录")
-            
-            if let falseCallback = self.falseCallback  {
-                falseCallback()
-            }
-        } else {
-            let url = String(describing: response.request!.url!)
-            NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)");
-            SwiftProgressHUD.shared().showText(response.description)
-            
-            if let falseCallback = self.falseCallback  {
-                falseCallback()
+            } catch {
+                let url = String(describing: response.request!.url!)
+                NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)")
+                SwiftProgressHUD.shared().showText(response.description)
+                return Single<Any?>.just(nil)
             }
         }
     }
     
-    // MARK: 返回数组
-    /// 获取状态码返回数组
-    ///
-    /// - Parameters:
-    ///   - response: 响应结果 数组
-    ///   - completion: 回调
-    private func getResponseArrayStatusCode(response:Response, completion: @escaping successCallArrayback) -> Void {
-        let json = try? JSON(response.mapJSON())
-        if response.statusCode == 200 {
-            let url = String(describing: response.request!.url!)
-            NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\njson=\n\(json!.description)")
-            let json = JSON(parseJSON: json!.description)
-            let rootModel = RootModel(JSONString: json.description)
-            let data = JSON(json["data"]).description
-            rootModel?.data = data
-            if rootModel!.code == 0 {
-                let array = JSON(parseJSON: rootModel?.data ?? "").arrayObject ?? Array<Any>()
-                completion(array)
-            }else if rootModel!.code  == 1 {
-                SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!", textAlignment: .left)
-                if let falseCallback = self.falseCallback  {
-                    falseCallback()
+    // MARK: 泛型返回任意数组不是对象
+    func mapAnyArray() -> Single<[Any]?> {
+        return flatMap { response -> Single<[Any]?> in
+            do {
+                let json = try JSON(response.mapJSON())
+                if response.statusCode == 200 {
+                    NXLLog("\nurl=\(String(describing: response.request!.url!))\nstatusCode=\(response.statusCode)\njson=\n\(json.description)");
+                    
+                    let json = JSON(parseJSON: json.description)
+                    let rootModel = RootModel(JSONString: json.description)
+                    let data = JSON(json["data"]).description
+                    rootModel?.data = data
+                    if rootModel!.code  == 0 {
+                        
+                        let anys = JSON(parseJSON: rootModel?.data ?? "").arrayObject ?? Array<Any>()
+                        return Single<[Any]?>.just(anys)
+                    }else if rootModel!.code  == 1 {
+                        SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!")
+                        return Single<[Any]?>.just(nil)
+                    }else {
+                        SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!")
+                        return Single<[Any]?>.just(nil)
+                    }
+                }else if response.statusCode == 401 {
+                    let url = String(describing: response.request!.url!)
+                    NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\njson=\n\(json.description)")
+                    let infoModel = InfoModel(JSONString: json.description)
+                    SwiftProgressHUD.shared().showText(infoModel!.message ?? "登录过期,请重新登录")
+                    kAppDelegate.setLoginController()
+                    return Single<[Any]?>.just(nil)
+                }else {
+                    let url = String(describing: response.request!.url!)
+                    NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)");
+                    SwiftProgressHUD.shared().showText(response.description)
+                    
+                    return Single<[Any]?>.just(nil)
                 }
                 
-            }else {
-                SwiftProgressHUD.shared().showText(rootModel!.msg ?? "信息有误!!!")
-                if let falseCallback = self.falseCallback  {
-                    falseCallback()
-                }
-            }
-        }else if response.statusCode == 401 {
-            let url = String(describing: response.request!.url!)
-            NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\njson=\n\(json!.description)")
-            let infoModel = InfoModel(JSONString: json?.description ?? "")
-            kAppDelegate.setLoginController()
-            SwiftProgressHUD.shared().showText(infoModel!.message ?? "登录过期,请重新登录")
-            
-            if let falseCallback = self.falseCallback  {
-                falseCallback()
-            }
-        } else {
-            let url = String(describing: response.request!.url!)
-            NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)");
-            SwiftProgressHUD.shared().showText(response.description)
-            
-            if let falseCallback = self.falseCallback  {
-                falseCallback()
+            } catch {
+                let url = String(describing: response.request!.url!)
+                NXLLog("\nurl=\(url)\nstatusCode=\(response.statusCode)\nerror=\n\(response.description)")
+                SwiftProgressHUD.shared().showText(response.description)
+                return Single<[Any]?>.just(nil)
             }
         }
     }
-}
-
-
-// MARK: - 泛型
-extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Response {
+    
     // MARK: 泛型返回对象
-    func map<T: BaseMappable>(_ type: T.Type) -> Single<T?> {
+    func mapObject<T: BaseMappable>(_ type: T.Type) -> Single<T?> {
         return flatMap { response -> Single<T?> in
             do {
                 let json = try JSON(response.mapJSON())
@@ -445,7 +453,7 @@ extension PrimitiveSequence where TraitType == SingleTrait, ElementType == Respo
     }
     
     // MARK: 泛型返回对象数组
-    func mapArray<T: BaseMappable>(_ type: T.Type) -> Single<[T]?> {
+    func mapArrayObject<T: BaseMappable>(_ type: T.Type) -> Single<[T]?> {
         return flatMap { response -> Single<[T]?> in
             do {
                 let json = try JSON(response.mapJSON())