首页布局微调

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -213,6 +213,7 @@
 		A7824B082271F53A00ABA381 /* EditSetDefaultTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7824B072271F53A00ABA381 /* EditSetDefaultTableViewCell.swift */; };
 		A79057022276C9770037F823 /* SetPasswordModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79057012276C9770037F823 /* SetPasswordModel.swift */; };
 		A79057062276EA3D0037F823 /* OpenCityListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A79057052276EA3D0037F823 /* OpenCityListModel.swift */; };
+		A7A17E5F22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A17E5E22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift */; };
 		A7A98DFD227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A98DFC227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift */; };
 		A7A98DFF227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A98DFE227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift */; };
 		A7A98E02227E8900005306E9 /* ProductSearchListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7A98E01227E8900005306E9 /* ProductSearchListModel.swift */; };
@@ -613,6 +614,7 @@
 		A7824B072271F53A00ABA381 /* EditSetDefaultTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSetDefaultTableViewCell.swift; sourceTree = "<group>"; };
 		A79057012276C9770037F823 /* SetPasswordModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetPasswordModel.swift; sourceTree = "<group>"; };
 		A79057052276EA3D0037F823 /* OpenCityListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OpenCityListModel.swift; sourceTree = "<group>"; };
+		A7A17E5E22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkManagerTools.swift; sourceTree = "<group>"; };
 		A7A59A7722363CCB00417FA4 /* RainbowPlanet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RainbowPlanet.entitlements; sourceTree = "<group>"; };
 		A7A98DFC227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaServiceProductApi.swift; sourceTree = "<group>"; };
 		A7A98DFE227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkServiceProduct.swift; sourceTree = "<group>"; };
@@ -1380,6 +1382,7 @@
 			children = (
 				A72A7384223396CB00B21995 /* ApiMacro.swift */,
 				A72A7382223396CB00B21995 /* SwiftMoyaNetWorkManager.swift */,
+				A7A17E5E22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift */,
 				A70DD11F2294CA2700C802FD /* SwiftRXMoyaReamlObjectSwiftJsonNetWorkManager.swift */,
 			);
 			path = SwiftMoyaNetWorkManager;
@@ -3542,6 +3545,7 @@
 				A70B2C732289019200B2449F /* ProductDetailSkuView.swift in Sources */,
 				A70B2C4322883B4E00B2449F /* ProductDetailShopTableViewCell.swift in Sources */,
 				A70B2C102286A3BC00B2449F /* ProductDetailModel.swift in Sources */,
+				A7A17E5F22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift in Sources */,
 				A72A72A922321DE000B21995 /* NumberKeyboard.swift in Sources */,
 				A70B2C272286C5D600B2449F /* ProductDetailFSPagerViewCell.swift in Sources */,
 				A7FF1585228C847300A85748 /* OrderDetailContactAddressTableViewCell.swift in Sources */,

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/ProductCollectionReusableView/ProductFloorCenterHeaderCollectionReusableView.swift

@@ -44,8 +44,8 @@ class ProductFloorCenterHeaderCollectionReusableView: UICollectionReusableView {
     private func setupLayouts() {
         bgView.snp.makeConstraints { (make) in
             make.top.bottom.equalToSuperview()
-            make.left.right.equalToSuperview()
-
+            make.left.equalTo(14 * kScaleWidth)
+            make.right.equalTo(-14 * kScaleWidth)
         }
         floorTitleView.snp.makeConstraints { (make) in
             make.top.equalToSuperview()

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/ProductCollectionReusableView/ProductFloorFullLeftHeaderCollectionReusableView.swift

@@ -42,16 +42,14 @@ class ProductFloorFullLeftHeaderCollectionReusableView: UICollectionReusableView
     
     private func setupLayouts() {
         bgView.snp.makeConstraints { (make) in
-            make.top.bottom.equalToSuperview()
-            make.left.equalTo(14 * kScaleWidth)
-            make.right.equalTo(-14 * kScaleWidth)
+            make.edges.equalToSuperview()
         }
 
         floorTitleView.snp.makeConstraints { (make) in
             make.top.equalToSuperview()
             make.height.equalTo(50)
-            make.left.equalTo(14 * kScaleWidth)
-            make.right.equalTo(-14 * kScaleWidth)
+            make.left.equalToSuperview().offset(14 * kScaleWidth)
+            make.right.equalToSuperview().offset(-14 * kScaleWidth)
         }
         floorBannerView.snp.makeConstraints { (make) in
             make.top.equalTo(50)
@@ -97,16 +95,16 @@ class ProductFloorFullLeftHeaderCollectionReusableView: UICollectionReusableView
             
             floorBannerView.snp.makeConstraints { (make) in
                 make.top.equalTo(0)
-                make.right.equalTo(0)
-                make.left.equalTo(0)
+                make.left.equalToSuperview().offset(14 * kScaleWidth)
+                make.right.equalToSuperview().offset(-14 * kScaleWidth)
                 make.height.equalTo(90 * kScaleWidth)
             }
         } else if  cmsRuleModel?.rule?.title != "" && cmsRuleModel?.rule?.url == ""{
             floorTitleView.snp.remakeConstraints { (make) in
                 make.top.equalToSuperview()
                 make.height.equalTo(50)
-                make.right.equalTo(0)
-                make.left.equalTo(0)
+                make.left.equalToSuperview().offset(14 * kScaleWidth)
+                make.right.equalToSuperview().offset(-14 * kScaleWidth)
             }
             floorBannerView.snp.makeConstraints { (make) in
                 make.top.equalTo(0)
@@ -131,14 +129,14 @@ class ProductFloorFullLeftHeaderCollectionReusableView: UICollectionReusableView
             floorTitleView.snp.remakeConstraints { (make) in
                 make.top.equalToSuperview()
                 make.height.equalTo(50)
-                make.right.equalTo(0)
-                make.left.equalTo(0)
+                make.left.equalToSuperview().offset(14 * kScaleWidth)
+                make.right.equalToSuperview().offset(-14 * kScaleWidth)
             }
             
             floorBannerView.snp.remakeConstraints { (make) in
                 make.top.equalTo(50)
-                make.right.equalTo(0)
-                make.left.equalTo(0)
+                make.left.equalToSuperview().offset(14 * kScaleWidth)
+                make.right.equalToSuperview().offset(-14 * kScaleWidth)
                 make.height.equalTo(90 * kScaleWidth)
             }
         }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductView/ProductCollectionReusableView/ProductFloorLeftHeaderCollectionReusableView.swift

@@ -54,7 +54,7 @@ class ProductFloorLeftHeaderCollectionReusableView: UICollectionReusableView {
         }
         floorBannerView.snp.makeConstraints { (make) in
             make.top.equalTo(50)
-            make.right.equalTo(5 * kScaleWidth)
+            make.right.equalTo(-5 * kScaleWidth)
             make.left.equalTo(5 * kScaleWidth)
             make.height.equalTo(90 * kScaleWidth)
         }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/ShoppingMallFloor/Floor/ShoppingMallFloorTableViewCell.swift

@@ -324,18 +324,18 @@ extension ShoppingMallFloorTableViewCell: UICollectionViewDelegateFlowLayout,UIC
             return CGSize(width:347 * kScaleWidth, height: 73 + (kScaleWidth * 90))
         case 2: //  2:左右滑动
             if cmsRuleModel?.rule?.title == "" {
-                return CGSize(width:347 * kScaleWidth, height:kScaleWidth * 90)
+                return CGSize(width:375 * kScaleWidth, height:kScaleWidth * 90)
             }
             
             if cmsRuleModel?.rule?.url == ""{
-                return CGSize(width:347 * kScaleWidth, height:50)
+                return CGSize(width:375 * kScaleWidth, height:50)
             }
             
             if cmsRuleModel?.rule?.title == "" && cmsRuleModel?.rule?.url == "" {
                 return CGSize(width:0, height:0)
             }
             
-            return CGSize(width:347 * kScaleWidth, height: 50 + kScaleWidth * 90)
+            return CGSize(width:375 * kScaleWidth, height: 50 + kScaleWidth * 90)
         default:
             return CGSize(width:0, height: 0)
         }

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.requestArray(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.request(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.requestArray(ProductSearchModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetProductList(parameters: parameters))) {
             (productSearchModels) in
             SwiftProgressHUD.shared().hide()
             completion(productSearchModels)

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.request(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.request(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.request(OpenCityListModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configCityManagementIndex(parameters: parameters))) {
             (selfMentionAddressListModel) in
             SwiftProgressHUD.shared().hide()
             completion(selfMentionAddressListModel)
@@ -97,7 +97,7 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             multipartData.append(formData)
         }
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadSingleImg(parameters: parameters, dataArray: multipartData))) { (data) in
+        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadSingleImg(parameters: parameters, dataArray: multipartData))) { (data) in
             SwiftProgressHUD.shared().hide()
             let rootModel = data as! RootModel
             print(rootModel)
@@ -122,7 +122,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.requestArray(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadMultiImg(parameters: parameters, dataArray: multipartData))) { (imgUrlArr) in
             SwiftProgressHUD.shared().hide()
             completion(imgUrlArr)
         }

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.request(OrderCreateBackModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderCreate(parameters: parameters))) { (orderCreateBackModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderCreateBackModel)
         }
@@ -89,7 +89,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
         }
         parameters.updateValue(page, forKey: "page")
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(OrderListModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseOrderList(parameters: parameters))) { (orderListModel) in
+        SwiftMoyaNetWorkManager.shared.request(OrderListModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseOrderList(parameters: parameters))) { (orderListModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderListModel)
         }
@@ -106,7 +106,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.request(OrderModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseDetail(parameters: parameters))) { (orderModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderModel)
         }
@@ -122,7 +122,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.request(OrderRefundDetailModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseRefundDetail(parameters: parameters))) { (orderModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderModel)
         }
@@ -148,7 +148,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.request(OrderApplyRefundModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseRefund(parameters: parameters))) { (orderApplyRefundModel) in
             SwiftProgressHUD.shared().hide()
             completion(orderApplyRefundModel)
         }
@@ -164,7 +164,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.request(target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseConfirm(parameters: parameters))) { (data) in
             SwiftProgressHUD.shared().hide()
             completion("")
         }
@@ -180,7 +180,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.request(target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseClose(parameters: parameters))) { (data) in
             SwiftProgressHUD.shared().showText("取消成功")
             completion("")
         }

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.requestValue(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.request(WeChatpayOrderModel.self, target: MultiTarget(SwiftMoyaServicePayApi.weixinpay(parameters: parameters))) { (weChatpayOrderModel) in
             let weChatpayOrderModel = weChatpayOrderModel as! WeChatpayOrderModel
             completion(weChatpayOrderModel)
             SwiftProgressHUD.shared().hide()

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceProduct/SwiftMoyaNetWorkServiceProduct.swift

@@ -68,7 +68,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
             parameters.updateValue(categoryId, forKey: "category_id1")
         }
 
-        SwiftMoyaNetWorkManager.shared()
+        SwiftMoyaNetWorkManager.shared
             .request(ProductSearchListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productSearch(parameters: parameters))) {(productSearchListModel) in
             completion(productSearchListModel)
         }
@@ -86,7 +86,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(page, forKey: "page")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared()
+        SwiftMoyaNetWorkManager.shared
             .request(CategoryListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCategory(parameters: parameters))) {(categoryListModel) in
                 SwiftProgressHUD.shared().hide()
                 completion(categoryListModel)
@@ -102,10 +102,10 @@ 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.requestArray(ProductModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productHomeProduct(parameters: parameters))) { (productModels) in
             completion(productModels)
         }
-        SwiftMoyaNetWorkManager.shared().falseCallback = {
+        SwiftMoyaNetWorkManager.shared.falseCallback = {
             completion("")
         }
     }
@@ -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.request(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.request(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.request(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.request(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.request(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.request(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.request(CartAmountModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (cartAmountModel) in
             SwiftProgressHUD.shared().hide()
             completion(cartAmountModel)
         }
@@ -312,7 +312,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(id, forKey: "id")
         
         SwiftProgressHUD.shared().showWait()
-        SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceProductApi.productCartDelete(parameters: parameters))) { (rootModel) in
+        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceProductApi.productCartDelete(parameters: parameters))) { (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
             completion("")
@@ -332,7 +332,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.request(CartAmountModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productCartAmount(parameters: parameters))) { (cartAmountModel) in
             SwiftProgressHUD.shared().hide()
             completion(cartAmountModel)
         }
@@ -357,7 +357,7 @@ 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
+        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceProductApi.productCartIsSel(parameters: parameters))) { (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
             completion("")
@@ -382,7 +382,7 @@ 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
+        SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceProductApi.productCartAllSel(parameters: parameters))) { (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
             completion("")
@@ -397,7 +397,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.request(ProductRefundReasonModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productRefundReason(parameters: parameters))) { (refundReasonModel) in
             SwiftProgressHUD.shared().hide()
             completion(refundReasonModel)
         }
@@ -439,7 +439,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.requestArray(target: MultiTarget(SwiftMoyaServiceProductApi.productAddComment(parameters: parameters))) { (dataArr) in
             SwiftProgressHUD.shared().hide()
             completion(dataArr)
         }
@@ -460,7 +460,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.request(ProductCartCountModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productGetCartCount(parameters: parameters))) { (productCartCountModel) in
             completion(productCartCountModel)
         }
     }

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.request(target: MultiTarget(SwiftMoyaServiceSMSApi.smsSend(parameters: parameters))) { (UserModel) in
             SwiftProgressHUD.shared().hide()
             completion("")
         }

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.request(ShopModel.self,target: MultiTarget(SwiftMoyaServiceShopApi.shopView(parameters: parameters))) {
             (shopModel) in
             SwiftProgressHUD.shared().hide()
             completion(shopModel)

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.request(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.request(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.request(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.request(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.request(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.request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindMobile(parameters: parameters))) { (userModel) in
                 UserModel.shared().setModel(model: userModel as! UserModel)
                 SwiftProgressHUD.shared().hide()
                 completion("")
@@ -166,7 +166,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             SwiftProgressHUD.shared().showText("暂时不可以解绑,请先绑定手机号")
         }else {
             SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceUserApi.userIsBindWeixin(parameters: parameters))) {
+            SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userIsBindWeixin(parameters: parameters))) {
                 [weak self] (rootModel) in
                 SwiftProgressHUD.shared().hide()
                 self?.userUnbindWeixinApi(completion: completion)
@@ -188,7 +188,7 @@ 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.request(target: MultiTarget(SwiftMoyaServiceUserApi.userIsBindWeixin(parameters: parameters)),isCustomAlert: true) {
             [weak self] (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().hide()
@@ -230,7 +230,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.request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindWeixin(parameters: parameters))) { (userModel) in
                 UserModel.shared().setModel(model: userModel as! UserModel)
                 SwiftProgressHUD.shared().hide()
                 completion("")
@@ -253,7 +253,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.request(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userUnbindWeixin(parameters: parameters))) {(userModel) in
             UserModel.shared().setModel(model: userModel as! UserModel)
             SwiftProgressHUD.shared().hide()
             completion("")
@@ -277,7 +277,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
+            SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userSetPassword(parameters: parameters))) {(rootModel) in
                 let rootModel = rootModel as! RootModel
                 SwiftProgressHUD.shared().showText(rootModel.msg!)
                 if rootModel.code == 0 {
@@ -305,7 +305,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.request(AddressManagerListModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userSelfAddressList(parameters: parameters))) {(addressManagerListModel) in
             SwiftProgressHUD.shared().hide()
             completion(addressManagerListModel)
         }
@@ -343,7 +343,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(expressAddresModel.address ?? "", forKey: "address")
             
             SwiftProgressHUD.shared().showWait()
-            SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddExpressAddress(parameters: parameters))) {(rootModel) in
+            SwiftMoyaNetWorkManager.shared.request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddExpressAddress(parameters: parameters))) {(rootModel) in
                 let rootModel = rootModel as! RootModel
                 SwiftProgressHUD.shared().showText(rootModel.msg!)
                 completion("")
@@ -362,7 +362,7 @@ 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.request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddressIsDefault(parameters: parameters))) {
             (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -379,7 +379,7 @@ 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.request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddressDelete(parameters: parameters))) {
             (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -394,7 +394,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.request(ContactListModel.self, target: MultiTarget(SwiftMoyaServiceUserApi.userExpreesContactsList(parameters: parameters))) { (contactListModel) in
             SwiftProgressHUD.shared().hide()
             completion(contactListModel)
         }
@@ -407,7 +407,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.request(ExpressAddresModel.self, target: MultiTarget(SwiftMoyaServiceUserApi.userDefaultExpress(parameters: parameters))) { (expressAddrModel) in
             SwiftProgressHUD.shared().hide()
             completion(expressAddrModel as Any)
         }
@@ -420,7 +420,7 @@ 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.request(target: MultiTarget(SwiftMoyaServiceUserApi.userDefaultContact(parameters: parameters))) {(rootModel) in
             SwiftProgressHUD.shared().hide()
             let rootModel = rootModel as! RootModel
             
@@ -450,7 +450,7 @@ 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.request(target: MultiTarget(SwiftMoyaServiceUserApi.userSaveExpreesContacts(parameters: parameters))) {
                     (rootModel) in
                     let rootModel = rootModel as! RootModel
                     SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -470,7 +470,7 @@ 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.request(target: MultiTarget(SwiftMoyaServiceUserApi.userDelExpreesContacts(parameters: parameters))) {
             (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -488,7 +488,7 @@ 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.request(target: MultiTarget(SwiftMoyaServiceUserApi.userSetExpreesContactsDefault(parameters: parameters))) {
             (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -510,7 +510,7 @@ 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.request(target: MultiTarget(SwiftMoyaServiceUserApi.userAddSelfAddress(parameters: parameters))) {
             (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -528,7 +528,7 @@ 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.request(target: MultiTarget(SwiftMoyaServiceUserApi.userSetDeliverType(parameters: parameters))) {
             (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkManager.swift

@@ -15,96 +15,12 @@ import RxSwift
 import RxCocoa
 import Result
 
-/// 超时时长
-private var requestTimeOut:Double = 20
-
-///网络请求的基本设置,这里可以拿到是具体的哪个网络请求，可以在这里做一些设置
-private let myEndpointClosure = { (target: MultiTarget) -> Endpoint in
-    ///这里把endpoint重新构造一遍主要为了解决网络请求地址里面含有? 时无法解析的bug https://github.com/Moya/Moya/issues/1198
-    let url = target.baseURL.absoluteString + target.path
-    var task = target.task
-    /*
-     👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆
-     如果需要在每个请求中都添加类似token参数的参数请取消注释上面代码
-     */
-    var endpoint = Endpoint(
-        url: url,
-        sampleResponseClosure: { .networkResponse(200, target.sampleData) },
-        method: target.method,
-        task: task,
-        httpHeaderFields: target.headers
-    )    
-    return endpoint
-}
-
-///网络请求的设置
-private let requestClosure = { (endpoint: Endpoint, done: MoyaProvider.RequestResultClosure) in
-    do {
-        var request = try endpoint.urlRequest()
-        //设置请求时长
-        request.timeoutInterval = requestTimeOut
-        // 打印请求参数
-        if let requestData = request.httpBody {
-            let parameter = "\(String(data: request.httpBody!, encoding: String.Encoding.utf8) ?? "")"
-            NXLLog("\n"+"请求地址:"+"\(request.url!)"+"\n"+"请求方式:"+"\(request.httpMethod ?? "")"+"\n"+"请求头部:"+"\(String(describing: request.allHTTPHeaderFields!))"+"\n"+"发送参数:" + String(describing: parameter.removingPercentEncoding!))
-        }else{
-            let urlStr = "\(request.url!)"
-            NXLLog("\n"+"请求地址:"+String(describing: urlStr.removingPercentEncoding!)+"\n"+"请求方式:"+"=\(String(describing: request.httpMethod!))"+"\n"+"请求头部:"+"\(String(describing: request.allHTTPHeaderFields!))")
-        }
-        done(.success(request))
-    } catch {
-        done(.failure(MoyaError.underlying(error, nil)))
-    }
-}
-
-/// NetworkActivityPlugin插件用来监听网络请求，界面上做相应的展示
-///但这里我没怎么用这个。。。 loading的逻辑直接放在网络处理里面了
-private let networkPlugin = NetworkActivityPlugin.init { (changeType, targetType) in
-    print("networkPlugin \(changeType)")
-    //targetType 是当前请求的基本信息
-    switch(changeType){
-    case .began:
-        DispatchQueue.main.async(execute: { () -> Void in
-            UIApplication.shared.isNetworkActivityIndicatorVisible = true
-        })
-    case .ended:
-        DispatchQueue.main.async(execute: { () -> Void in
-            UIApplication.shared.isNetworkActivityIndicatorVisible = false
-        })
-    }
-    
-}
-
-
-private let provider = MoyaProvider<MultiTarget>(endpointClosure: myEndpointClosure, requestClosure: requestClosure, plugins: [networkPlugin], trackInflights: false)
-
-/// 基于Alamofire,网络是否连接，，这个方法不建议放到这个类中,可以放在全局的工具类中判断网络链接情况
-/// 用get方法是因为这样才会在获取isNetworkConnect时实时判断网络链接请求，如有更好的方法可以fork
-private var isNetworkConnect: Bool {
-    get{
-        if !AlamofireReachabilityManager.shared.isNetworkConnect() {
-            SwiftProgressHUD.shared().hide()
-            return false
-        }else {
-            return true
-        }
-    }
-}
-
 public class SwiftMoyaNetWorkManager: NSObject {
 
     private let disposeBag = DisposeBag()
     private var dataBaseName : String = "RainbowPlanet"
-
-
-    private static let _sharedInstance = SwiftMoyaNetWorkManager()
-    private override init() {} // 私有化init方法
-    /// 获取单例
-    ///
-    /// - Returns: SwiftMoyaNetWorkManager对象
-    class func shared() -> SwiftMoyaNetWorkManager {
-        return _sharedInstance
-    }
+    
+    static let shared : SwiftMoyaNetWorkManager = SwiftMoyaNetWorkManager()
 
     /// 成功回调 对象
     typealias successCallback = (_ data: Any) -> Void
@@ -202,53 +118,6 @@ public class SwiftMoyaNetWorkManager: NSObject {
             .disposed(by: disposeBag)
     }
 
-    /// 缓存请求
-    ///
-    /// - Parameters:
-    ///   - target: 请求地址加参数
-    ///   - alwaysFetchCache: 是否总是缓存
-    ///   - cacheType: 缓存类型
-    ///   - completion: 请求成功回调
-//    func cacheRequest<T: BaseMappable>(_ type: T.Type,target: MultiTarget,isCustomAlert:Bool = false,alwaysFetchCache: Bool = false,cacheType: MMCache.CacheKeyType = .default,completion: @escaping successCallback) -> Void {
-//
-//        //判断是否链接网络
-//        if !isNetworkConnect{
-//            SwiftProgressHUD.shared().showError("网络链接失败,请检查网络")
-//            return
-//        }
-
-//        var cacheResponse: Response? = nil
-
-//        if alwaysFetchCache {
-//            cacheResponse = MMCache.shared.fetchResponseCache(target: target)
-//            self.getResponseStatusCode(response: cacheResponse!, isCustomAlert: isCustomAlert, completion: completion)
-//        } else {
-//            if MMCache.shared.isNoRecord(target, cacheType: cacheType) {
-//                MMCache.shared.record(target)
-//                cacheResponse = MMCache.shared.fetchResponseCache(target: target)
-//                self.getResponseStatusCode(response: cacheResponse!, isCustomAlert: isCustomAlert, completion: completion)
-//            }
-//        }
-
-//        provider.rx
-//            .request(target)
-//            .map(T.self)
-//            .subscribeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
-//            .observeOn(MainScheduler.instance)
-//            .subscribe(onSuccess: { [weak self] response in
-//                MMCache.shared.cacheResponse(response as!  Response, target: target)
-//                self?.getResponseStatusCode(response: response as! Response, isCustomAlert: isCustomAlert, completion: completion)
-//            }) {
-//                [weak self] (error) in
-//                if let falseCallback = self?.falseCallback  {
-//                    falseCallback()
-//                }
-//                SwiftProgressHUD.shared().showError("网络链接失败,请检查网络")
-//            }
-//            .disposed(by: disposeBag)
-//
-//    }
-
     // MARK: 网络请求返回RootModel
     /// 网络请求返回RootModel
     ///
@@ -343,53 +212,6 @@ public class SwiftMoyaNetWorkManager: NSObject {
             .disposed(by: disposeBag)
     }
 
-
-    /// 缓存请求
-    ///
-    /// - Parameters:
-    ///   - target: 请求地址加参数
-    ///   - alwaysFetchCache: 是否总是缓存
-    ///   - cacheType: 缓存类型
-    ///   - completion: 请求成功回调
-//    func cacheRequest(target: MultiTarget,isCustomAlert:Bool = false,alwaysFetchCache: Bool = false,cacheType: MMCache.CacheKeyType = .default,completion: @escaping successCallback) -> Void {
-//
-//        //判断是否链接网络
-//        if !isNetworkConnect{
-//            SwiftProgressHUD.shared().showError("网络链接失败,请检查网络")
-//            return
-//        }
-
-//        var cacheResponse: Response? = nil
-
-//        if alwaysFetchCache {
-//            cacheResponse = MMCache.shared.fetchResponseCache(target: target)
-//            self.getResponseStatusCode(response: cacheResponse!, isCustomAlert: isCustomAlert, completion: completion)
-//        } else {
-//            if MMCache.shared.isNoRecord(target, cacheType: cacheType) {
-//                MMCache.shared.record(target)
-//                cacheResponse = MMCache.shared.fetchResponseCache(target: target)
-//                self.getResponseStatusCode(response: cacheResponse!, isCustomAlert: isCustomAlert, completion: completion)
-//            }
-//        }
-
-//        provider.rx
-//            .request(target)
-//            .subscribeOn(ConcurrentDispatchQueueScheduler(qos: .userInitiated))
-//            .observeOn(MainScheduler.instance)
-//            .subscribe(onSuccess: { [weak self] response in
-//                MMCache.shared.cacheResponse(response, target: target)
-//                self?.getResponseStatusCode(response: response, isCustomAlert: isCustomAlert, completion: completion)
-//            }) {
-//                [weak self] (error) in
-//                if let falseCallback = self?.falseCallback  {
-//                    falseCallback()
-//                }
-//                SwiftProgressHUD.shared().showError("网络链接失败,请检查网络")
-//            }
-//            .disposed(by: disposeBag)
-//
-//    }
-
     // MARK: 取消所有请求
     /// 取消所有请求
     func cancelAllRequest() {

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/SwiftMoyaNetWorkManagerTools.swift

@@ -0,0 +1,91 @@
+//
+//  SwiftMoyaNetWorkManagerTools.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/5/31.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import UIKit
+import Alamofire
+import Moya
+import SwiftyJSON
+import ObjectMapper
+import RxSwift
+import RxCocoa
+import Result
+
+/// 超时时长
+public var requestTimeOut:Double = 20
+
+///网络请求的基本设置,这里可以拿到是具体的哪个网络请求，可以在这里做一些设置
+public let myEndpointClosure = { (target: MultiTarget) -> Endpoint in
+    ///这里把endpoint重新构造一遍主要为了解决网络请求地址里面含有? 时无法解析的bug https://github.com/Moya/Moya/issues/1198
+    let url = target.baseURL.absoluteString + target.path
+    var task = target.task
+    /*
+     👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆👆
+     如果需要在每个请求中都添加类似token参数的参数请取消注释上面代码
+     */
+    var endpoint = Endpoint(
+        url: url,
+        sampleResponseClosure: { .networkResponse(200, target.sampleData) },
+        method: target.method,
+        task: task,
+        httpHeaderFields: target.headers
+    )
+    return endpoint
+}
+
+///网络请求的设置
+public let requestClosure = { (endpoint: Endpoint, done: MoyaProvider.RequestResultClosure) in
+    do {
+        var request = try endpoint.urlRequest()
+        //设置请求时长
+        request.timeoutInterval = requestTimeOut
+        // 打印请求参数
+        if let requestData = request.httpBody {
+            let parameter = "\(String(data: request.httpBody!, encoding: String.Encoding.utf8) ?? "")"
+            NXLLog("\n"+"请求地址:"+"\(request.url!)"+"\n"+"请求方式:"+"\(request.httpMethod ?? "")"+"\n"+"请求头部:"+"\(String(describing: request.allHTTPHeaderFields!))"+"\n"+"发送参数:" + String(describing: parameter.removingPercentEncoding!))
+        }else{
+            let urlStr = "\(request.url!)"
+            NXLLog("\n"+"请求地址:"+String(describing: urlStr.removingPercentEncoding!)+"\n"+"请求方式:"+"=\(String(describing: request.httpMethod!))"+"\n"+"请求头部:"+"\(String(describing: request.allHTTPHeaderFields!))")
+        }
+        done(.success(request))
+    } catch {
+        done(.failure(MoyaError.underlying(error, nil)))
+    }
+}
+
+/// NetworkActivityPlugin插件用来监听网络请求，界面上做相应的展示
+///但这里我没怎么用这个。。。 loading的逻辑直接放在网络处理里面了
+public let networkPlugin = NetworkActivityPlugin.init { (changeType, targetType) in
+    print("networkPlugin \(changeType)")
+    //targetType 是当前请求的基本信息
+    switch(changeType){
+    case .began:
+        DispatchQueue.main.async(execute: { () -> Void in
+            UIApplication.shared.isNetworkActivityIndicatorVisible = true
+        })
+    case .ended:
+        DispatchQueue.main.async(execute: { () -> Void in
+            UIApplication.shared.isNetworkActivityIndicatorVisible = false
+        })
+    }
+    
+}
+
+
+public let provider = MoyaProvider<MultiTarget>(endpointClosure: myEndpointClosure, requestClosure: requestClosure, plugins: [networkPlugin], trackInflights: false)
+
+///基于Alamofire,网络是否连接，，这个方法不建议放到这个类中,可以放在全局的工具类中判断网络链接情况
+public var isNetworkConnect: Bool {
+    get{
+        if !AlamofireReachabilityManager.shared.isNetworkConnect() {
+            SwiftProgressHUD.shared().hide()
+            return false
+        }else {
+            return true
+        }
+    }
+}