取消加载loading

RainbowPlanet/RainbowPlanet/Manager/AppStoreManager/AppStoreManager.swift

@@ -48,7 +48,7 @@ class AppStoreManager: NSObject {
                     
                 })
             }else {
-                SwiftProgressHUD.shared().showWait("加载AppStore失败")
+                SwiftProgressHUD.shared().showText("加载AppStore失败")
             }
         }
     }

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -67,7 +67,6 @@ class CommunityFollowViewController: UIViewController {
         }
         tableView.addFooterWithWithHeader(withAutomaticallyRefresh: false) {
             [weak self] (page) in
-            SwiftProgressHUD.shared().showWait()
             self?.communityFollowFeedApi(page: page)
         }
         
@@ -175,7 +174,6 @@ extension CommunityFollowViewController {
     ///
     /// - Parameter page: <#page description#>
     func loadData(page:Int) {
-        SwiftProgressHUD.shared().showWait()
         
         //获取系统存在的全局队列
         let queue = DispatchQueue.global(qos: .default)
@@ -198,7 +196,6 @@ extension CommunityFollowViewController {
             let cmsMemberListModel = cmsMemberListModel as? CMSMemberListModel
             self?.cmsMemberModels = (cmsMemberListModel?.list)!
             self?.tableView.reloadData()
-            SwiftProgressHUD.shared().hide()
         }
     }
     
@@ -219,7 +216,6 @@ extension CommunityFollowViewController {
                     self?.tableView.tableHeaderView = self?.followTableHeaderView
                 }
                 self?.tableView.reloadData()
-                SwiftProgressHUD.shared().hide()
                 if  self?.communityFollowDataModels.count ?? 0 >= communityFollowFeedModel?.pagination?.total ?? 0 {
                     self?.tableView.endFooterNoMoreData()
                 }

RainbowPlanet/RainbowPlanet/Modules/SearchModule/SearchProduct/ViewController/SearchProductListViewController.swift

@@ -66,7 +66,6 @@ class SearchProductListViewController: UIViewController {
 extension SearchProductListViewController {
     /// 搜索商品
     func productSearchApi(page:Int = 1) {
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkServiceProduct.shared().productListApi(page:page ,keyword: self.keyWord) {
             [weak self] (productSearchListModel) -> (Void) in
             let productSearchListModel = productSearchListModel as? ProductSearchListModel
@@ -84,7 +83,6 @@ extension SearchProductListViewController {
             }else {
                 self?.tableView.endFooterNoMoreData()
             }
-            SwiftProgressHUD.shared().hide()
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Category/ViewController/CategoryViewController.swift

@@ -141,7 +141,6 @@ class CategoryViewController: BaseViewController {
     func productSearchApi(page:Int = 1) {
         let categoryModel = categoryModelArray[leftIndexPath.row]
 
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkServiceProduct.shared().productListApi(page:page ,categoryId:categoryModel.id ?? 0) {
             [weak self] (productSearchListModel) -> (Void) in
             let productSearchListModel = productSearchListModel as? ProductSearchListModel
@@ -159,7 +158,6 @@ class CategoryViewController: BaseViewController {
             }else {
                 self?.categoryView.rightTableView.endFooterNoMoreData()
             }
-            SwiftProgressHUD.shared().hide()
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ProductAllComment/ViewController/ProductAllCommentViewController.swift

@@ -59,7 +59,6 @@ class ProductAllCommentViewController: BaseViewController {
     /// - Parameter page: 分页
     func productCommentListApi(page:Int = 1) {
        
-       SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkServiceProduct.shared().productCommentListApi(page:page,productId: productId ) {
             [weak self] (productCommentListModel) -> (Void) in
             let productCommentListModel = productCommentListModel as? ProductCommentListModel
@@ -73,7 +72,6 @@ class ProductAllCommentViewController: BaseViewController {
             }else {
                 self?.productAllCommentView.tableView.endFooterNoMoreData()
             }
-            SwiftProgressHUD.shared().hide()
         }
     }
 }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Shop/ViewController/ShopViewController.swift

@@ -105,7 +105,6 @@ class ShopViewController: BaseViewController {
     /// 获取商家商品列表
     private func productListApi(page:Int) {
         
-        SwiftProgressHUD.shared().showWait()
 
         SwiftMoyaNetWorkServiceProduct.shared().productListApi(page: page, shopId: shopId ?? 0,desc: self.shopSectionHeaderModel.state, fieldOrder: fieldOrder) {
             [weak self] (productListModel) -> (Void) in
@@ -123,7 +122,6 @@ class ShopViewController: BaseViewController {
             }else {
                 self?.shopView.tableView.endFooterNoMoreData()
             }
-            SwiftProgressHUD.shared().hide()
         }
     }
     

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCMS/SwiftMoyaNetWorkServiceCMS.swift

@@ -34,10 +34,8 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
         let loacationModel = LocationModel.shared().object()
         let baiduToCityModel = BaiduToCityFactory.shared.query(bjcityId: loacationModel!.cityCode)
         parameters.updateValue(baiduToCityModel.areaCode, forKey: "city_id")
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared.requestArrayObject(CMSTemplateModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetTemplateName(parameters: parameters))) {
             (cmsTemplateModels) in
-            SwiftProgressHUD.shared().hide()
             completion(cmsTemplateModels)
         }
     }
@@ -47,14 +45,12 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
     /// - Parameter completion: 完成
     func cmsTemplateSetPreviewApi(type:Int,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
-        SwiftProgressHUD.shared().showWait()
         let loacationModel = LocationModel.shared().object()
         let baiduToCityModel = BaiduToCityFactory.shared.query(bjcityId: loacationModel!.cityCode)
         parameters.updateValue(baiduToCityModel.areaCode, forKey: "city_id")
         parameters.updateValue(type, forKey: "type")
         SwiftMoyaNetWorkManager.shared.requestObject(CMSModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetPreview(parameters: parameters))) {
             (cmsModel) in
-            SwiftProgressHUD.shared().hide()
             completion(cmsModel)
         }
     }
@@ -65,10 +61,8 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
     func cmsTemplateSetProductListApi(subjectId:String = "",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(subjectId, forKey: "subject_id")
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared.requestArrayObject(ProductSearchModel.self,target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetProductList(parameters: parameters))) {
             (productSearchModels) in
-            SwiftProgressHUD.shared().hide()
             completion(productSearchModels)
         }
     }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCommunity/SwiftMoyaNetWorkServiceCommunity.swift

@@ -34,9 +34,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(isSuggest, forKey: "is_suggest")
         parameters.updateValue(page, forKey: "page")
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityTopicCategoryModel.self,target: MultiTarget(SwiftMoyaServiceCommunityApi.communityTopicCategory(parameters: parameters))) { (communityTopicCategoryModel) in
-            SwiftProgressHUD.shared().hide()
             completion(communityTopicCategoryModel)
         }
     }
@@ -50,9 +48,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     func communityMemberFollowTopicApi(topicGroupIds:String = "",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(topicGroupIds, forKey: "topic_group_ids")
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceCommunityApi.communityMemberFollowTopic(parameters: parameters))) { (data) in
-            SwiftProgressHUD.shared().hide()
             completion("")
         }
     }
@@ -68,9 +64,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         parameters.updateValue(type.rawValue, forKey: "type")
         parameters.updateValue(uid, forKey: "uid")
         parameters.updateValue(page, forKey: "page")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityPostMyModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityPostMy(parameters: parameters))) { (communityPostMyModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityPostMyModel)
         }
     }
@@ -88,9 +84,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         parameters.updateValue(categoryId, forKey: "category_id")
         parameters.updateValue(name, forKey: "name")
         parameters.updateValue(page, forKey: "page")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityTopicsModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityTopics(parameters: parameters))) { (communityTopicsModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityTopicsModel)
         }
     }
@@ -107,9 +103,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         parameters.updateValue(keyword, forKey: "keyword")
         parameters.updateValue(topicIds, forKey: "topic_ids")
         parameters.updateValue(page, forKey: "page")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityPostsModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityPosts(parameters: parameters))) { (communityPostsModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityPostsModel)
         }
     }
@@ -138,9 +134,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         parameters.updateValue(content, forKey: "content")
         parameters.updateValue(location, forKey: "location")
         parameters.updateValue(imgs, forKey: "imgs")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityPublishModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityPublish(parameters: parameters))) { (CommunityPublishModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(CommunityPublishModel)
         }
     }
@@ -153,7 +149,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     func communityDeleteApi(postId:Int, completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(postId, forKey: "id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceCommunityApi.communityDelete(parameters: parameters))) { (data) in
             SwiftProgressHUD.shared().showText("删除成功")
             NotificationCenter.default.post(name: NSNotification.Name("communityDeletePostApi"), object: postId)
@@ -174,9 +170,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         parameters.updateValue(title, forKey: "title")
         parameters.updateValue(filename, forKey: "filename")
         parameters.updateValue(cover_url, forKey: "cover_url")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityVideoAuthModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityVideoUploadAuth(parameters: parameters))) { (communityVideoAuthModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityVideoAuthModel)
         }
     }
@@ -187,10 +183,10 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     ///   - completion: 回调
     func communityImageUploadAuth(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
-        SwiftProgressHUD.shared().showWait()
+        
         
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityImageAuthModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityImageUploadAuth(parameters: parameters))) { (CommunityImageAuthModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(CommunityImageAuthModel)
         }
     }
@@ -204,9 +200,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
         parameters.updateValue(page, forKey: "page")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityVideoListModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityVideoList(parameters: parameters))) { (communityVideoListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityVideoListModel)
         }
     }
@@ -226,7 +222,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         parameters.updateValue(username, forKey: "username")
         parameters.updateValue(url, forKey: "url")
         parameters.updateValue(uid, forKey: "uid")
-        SwiftProgressHUD.shared().showWait()
+        
         
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceCommunityApi.communityUploadMusic(parameters: parameters))) { (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -247,7 +243,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         parameters.updateValue(page, forKey: "page")
         
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityRecommendMusicListModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityRecMusicList(parameters: parameters))) { (communityRecommendMusicListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityRecommendMusicListModel)
         }
     }
@@ -262,7 +258,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         let parameters = Dictionary<String,Any>()
         
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityMusicCategoryListModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityGetMusicCategory(parameters: parameters))) { (communityMusicCategoryListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityMusicCategoryListModel)
         }
     }
@@ -280,7 +276,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         parameters.updateValue(page, forKey: "page")
         
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityRecommendMusicListModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityCateMusicList(parameters: parameters))) { (communityMusicListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityMusicListModel)
         }
     }
@@ -295,7 +291,7 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(page, forKey: "page")
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityFollowFeedModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityFollowFeed(parameters: parameters))) {  (communityFollowFeedModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityFollowFeedModel)
         }
     }
@@ -310,9 +306,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     func communityPostSuggestApi(page:Int = 1,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(page, forKey: "page")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityRecommendFeedModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityPostSuggest(parameters: parameters))) {  (communityRecommendFeedModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityRecommendFeedModel)
         }
     }
@@ -326,9 +322,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     func communityTopicDetailApi(id:Int,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityTopicDetailModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityTopicDetail(parameters: parameters))) {  (communityTopicDetailModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityTopicDetailModel)
         }
     }
@@ -344,9 +340,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(page, forKey: "page")
         parameters.updateValue(id, forKey: "id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityRecommendFeedModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityPostTopic(parameters: parameters))) {  (communityRecommendFeedModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityRecommendFeedModel)
         }
     }
@@ -362,9 +358,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(page, forKey: "page")
         parameters.updateValue(name, forKey: "name")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityMemberFollowTopicListModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityMemberFollowTopicList(parameters: parameters))) {  (communityMemberFollowTopicListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityMemberFollowTopicListModel)
         }
     }
@@ -378,9 +374,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     func communityMemberFollowTopicFollowApi(topicId:Int,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(topicId, forKey: "topic_id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceCommunityApi.communityMemberFollowTopicFollow(parameters: parameters))) {  (data) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(data)
         }
     }
@@ -394,9 +390,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     func communityMemberFollowTopicCancelFollowApi(topicId:Int,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(topicId, forKey: "topic_id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceCommunityApi.communityMemberFollowTopicCancelFollow(parameters: parameters))) {  (data) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(data)
         }
     }
@@ -411,9 +407,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     func communityPostDetailApi(id:Int,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityPostDetailModel.self,target: MultiTarget(SwiftMoyaServiceCommunityApi.communityPostDetail(parameters: parameters))) {  (communityPostDetailModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityPostDetailModel)
         }
     }
@@ -431,9 +427,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         parameters.updateValue(postId, forKey: "post_id")
         parameters.updateValue(page, forKey: "page")
         parameters.updateValue(10, forKey: "per_page")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityPostCommentsModel.self,target: MultiTarget(SwiftMoyaServiceCommunityApi.communityPostComments(parameters: parameters))) {  (communityPostCommentsModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityPostCommentsModel)
         }
     }
@@ -449,9 +445,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(postId, forKey: "id")
         parameters.updateValue(page, forKey: "page")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityPostReplysModel.self,target: MultiTarget(SwiftMoyaServiceCommunityApi.communityPostReply(parameters: parameters))) {  (communityPostReplysModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityPostReplysModel)
         }
     }
@@ -466,9 +462,9 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     func communityPostCommentApi(communityCustomCommnetModel:CommunityCustomCommnetModel,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters = communityCustomCommnetModel.toJSON()
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityPostCommentIdModel.self,target: MultiTarget(SwiftMoyaServiceCommunityApi.communityPostComment(parameters: parameters))) {  (communityPostCommentIdModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(communityPostCommentIdModel)
         }
     }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceConfig/SwiftMoyaNetWorkServiceConfig.swift

@@ -27,9 +27,9 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
     /// - Parameter completion: 回调
     func configApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
-//        SwiftProgressHUD.shared().showWait()
+//
         SwiftMoyaNetWorkManager.shared.requestObject(ConfigModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configConfig(parameters: parameters))) {(configModel) in
-//            SwiftProgressHUD.shared().hide()
+//
             ConfigModel.shared.saveObject(configModel: configModel as! ConfigModel)
             completion(configModel)
         }
@@ -51,9 +51,9 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
         parameters.updateValue(latitude ?? "", forKey: "latitude")
         parameters.updateValue(page, forKey: "page")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(SelfMentionAddressListModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configPickupNodeIndex(parameters: parameters))) {(selfMentionAddressListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(selfMentionAddressListModel)
         }
     }
@@ -71,10 +71,10 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
         parameters.updateValue(baiduToCityModel.areaCode, forKey: "city_id")
         parameters.updateValue(page, forKey: "page")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(OpenCityListModel.self,target: MultiTarget(SwiftMoyaServiceConfigApi.configCityManagementIndex(parameters: parameters))) {
             (selfMentionAddressListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(selfMentionAddressListModel)
         }
     }
@@ -96,10 +96,10 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
 
             multipartData.append(formData)
         }
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(ImageUrlModel.self, target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadSingleImg(parameters: parameters, dataArray: multipartData))) { (imageUrlModel) in
             let imageUrlModel = imageUrlModel as! ImageUrlModel
-            SwiftProgressHUD.shared().hide()
+            
             completion(imageUrlModel.url as Any)
         }
     }
@@ -144,9 +144,9 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
             
             multipartData.append(formData)
         }
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestAnyArray(target: MultiTarget(SwiftMoyaServiceConfigApi.configUploadMultiImg(parameters: parameters, dataArray: multipartData))) { (imgUrlArr) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(imgUrlArr)
         }
     }
@@ -154,9 +154,9 @@ class SwiftMoyaNetWorkServiceConfig: NSObject {
     // MARK: 邀请海报
     func configPosterInviteApi(completion: @escaping apiCallBack) {
         let  parameters = Dictionary<String,Any>()
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceConfigApi.configPosterInvite(parameters: parameters))) { (data) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(data)
         }
     }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceOrder/SwiftMoyaNetWorkServiceOrder.swift

@@ -66,9 +66,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
         let jsonStr = JSON(detailDicArr).description
         parameters.updateValue(jsonStr, forKey: "detail")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(OrderCreateBackModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderCreate(parameters: parameters))) { (orderCreateBackModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(orderCreateBackModel)
         }
     }
@@ -102,9 +102,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
         }
 
         parameters.updateValue(page, forKey: "page")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(OrderListModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseOrderList(parameters: parameters))) { (orderListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(orderListModel)
         }
 
@@ -119,9 +119,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
     func orderPurchaseDetailApi(purchaseNo:String = "",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(purchaseNo, forKey: "purchase_no")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(OrderModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseDetail(parameters: parameters))) { (orderModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(orderModel)
         }
     }
@@ -135,9 +135,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
     func orderPurchaseRefundDetailApi(refundNo:String = "",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(refundNo, forKey: "refund_no")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(OrderRefundDetailModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseRefundDetail(parameters: parameters))) { (orderModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(orderModel)
         }
     }
@@ -161,9 +161,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
         parameters.updateValue(refund_remark, forKey: "refund_remark")
         parameters.updateValue(detail, forKey: "detail")
         parameters.updateValue(imgs, forKey: "imgs")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(OrderApplyRefundModel.self,target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseRefund(parameters: parameters))) { (orderApplyRefundModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(orderApplyRefundModel)
         }
     }
@@ -177,9 +177,9 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
     func orderPurchaseConfirmApi(purchaseId:Int = 0,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(purchaseId, forKey: "purchase_id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseConfirm(parameters: parameters))) { (data) in
-            SwiftProgressHUD.shared().hide()
+            
             completion("")
         }
     }
@@ -193,7 +193,7 @@ class SwiftMoyaNetWorkServiceOrder: NSObject {
     func orderPurchaseCloseApi(patchNum:String = "",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(patchNum, forKey: "patch_num")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceOrderApi.orderPurchaseClose(parameters: parameters))) { (data) in
             SwiftProgressHUD.shared().showText("取消成功")
             completion("")

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServicePay/SwiftMoyaNetWorkServicePay.swift

@@ -32,9 +32,7 @@ public class SwiftMoyaNetWorkServicePay: NSObject {
         parameters.updateValue(paraMdl.patchNum ?? 0, forKey: "patch_num")
         parameters.updateValue(paraMdl.money ?? 0, forKey: "money")
         
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServicePayApi.alipay(parameters: parameters))) { (orderString) in
-            SwiftProgressHUD.shared().hide()
             completion(orderString as Any)
         }
     }
@@ -48,11 +46,9 @@ public class SwiftMoyaNetWorkServicePay: NSObject {
         parameters.updateValue(paraMdl.patchNum ?? 0, forKey: "patch_num")
         parameters.updateValue(paraMdl.money ?? 0, forKey: "money")
         
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared.requestObject(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

@@ -85,10 +85,10 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(parentId, forKey: "parent_id")
         parameters.updateValue(page, forKey: "page")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared
             .requestObject(CategoryListModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCategory(parameters: parameters))) {(categoryListModel) in
-                SwiftProgressHUD.shared().hide()
+                
                 completion(categoryListModel)
         }
     }
@@ -119,9 +119,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
     func productDetailApi(id:Int = 0,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(ProductDetailModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productDetail(parameters: parameters))) { (productDetailModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(productDetailModel)
         }
     }
@@ -143,9 +143,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         let deliver_type = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
         parameters.updateValue(deliver_type ?? "0", forKey: "deliver_type")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(ProductSearchListModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productHotSale(parameters: parameters))) { (productSearchListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(productSearchListModel)
         }
     }
@@ -181,9 +181,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         let deliver_type = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
         parameters.updateValue(deliver_type ?? "0", forKey: "deliver_type")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(ProductCartListData.self, target: MultiTarget(SwiftMoyaServiceProductApi.productCartList(parameters: parameters))) { (productCartListData) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(productCartListData)
         }
     }
@@ -218,9 +218,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         let deliver_type = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
         parameters.updateValue(deliver_type ?? 0, forKey: "deliver_type")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CartAmountModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (cartAmountModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(cartAmountModel)
         }
     }
@@ -256,9 +256,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         let deliver_type = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
         parameters.updateValue(deliver_type ?? 0, forKey: "deliver_type")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CartAmountModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (cartAmountModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(cartAmountModel)
         }
     }
@@ -293,9 +293,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         let deliver_type = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
         parameters.updateValue(deliver_type ?? 0, forKey: "deliver_type")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CartAmountModel.self,target: MultiTarget(SwiftMoyaServiceProductApi.productCartAdd(parameters: parameters))) { (cartAmountModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(cartAmountModel)
         }
     }
@@ -311,7 +311,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceProductApi.productCartDelete(parameters: parameters))) { (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg ?? "信息有误!!!")
             if rootModel.code  == 0 {
@@ -332,9 +332,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         parameters.updateValue(id, forKey: "id")
         parameters.updateValue(type, forKey: "type")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(CartAmountModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productCartAmount(parameters: parameters))) { (cartAmountModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(cartAmountModel)
         }
     }
@@ -357,7 +357,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         let deliver_type = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
         parameters.updateValue(deliver_type ?? "0", forKey: "deliver_type")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceProductApi.productCartIsSel(parameters: parameters))) { (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
             if rootModel.code == 0 {
@@ -383,7 +383,7 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         let deliver_type = DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType
         parameters.updateValue(deliver_type ?? "2", forKey: "deliver_type")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceProductApi.productCartAllSel(parameters: parameters))) { (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
             if rootModel.code == 0 {
@@ -399,9 +399,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
     ///   - completion: 回调
     func productRefundReasonApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(ProductRefundReasonModel.self, target: MultiTarget(SwiftMoyaServiceProductApi.productRefundReason(parameters: parameters))) { (refundReasonModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(refundReasonModel)
         }
     }
@@ -441,9 +441,9 @@ class SwiftMoyaNetWorkServiceProduct: NSObject {
         let jsonStr = JSON(detailDicArr).description
         parameters.updateValue(jsonStr, forKey: "content")
                 
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestAnyArray(target: MultiTarget(SwiftMoyaServiceProductApi.productAddComment(parameters: parameters))) { (dataArr) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(dataArr)
         }
     }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceSMS/SwiftMoyaNetWorkServiceSMS.swift

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

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceShop/SwiftMoyaNetWorkServiceShop.swift

@@ -30,10 +30,8 @@ class SwiftMoyaNetWorkServiceShop: NSObject {
     func shopViewApi(shopId:Int = 0 ,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(shopId, forKey: "id")
-        SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared.requestObject(ShopModel.self,target: MultiTarget(SwiftMoyaServiceShopApi.shopView(parameters: parameters))) {
             (shopModel) in
-            SwiftProgressHUD.shared().hide()
             completion(shopModel)
         }
     }

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -41,10 +41,10 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         parameters.updateValue(avatar, forKey: "avatar")
         parameters.updateValue(username, forKey: "username")
         parameters.updateValue(gender, forKey: "gender")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userWeiXinRegister(parameters: parameters))) { (userModel) in
             let userModel = userModel as! UserModel
-            SwiftProgressHUD.shared().hide()
+            
             completion(userModel as Any)
         }
     }
@@ -63,10 +63,10 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(mobile, forKey: "mobile")
             parameters.updateValue(sms_code, forKey: "sms_code")
             parameters.updateValue(invitationCode, forKey: "invite_code")
-            SwiftProgressHUD.shared().showWait()
+            
             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,10 +86,10 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             var parameters = Dictionary<String,Any>()
             parameters.updateValue(mobile, forKey: "mobile")
             parameters.updateValue(password, forKey: "password")
-            SwiftProgressHUD.shared().showWait()
+            
             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,10 +102,10 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     ///   - completion: 回调
     func userRefreshApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userRefresh(parameters: parameters))) { (userModel) in
             UserModel.shared().setModel(model: userModel as! UserModel)
-            SwiftProgressHUD.shared().hide()
+            
             completion("")
         }
     }
@@ -142,10 +142,10 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(openId, forKey: "open_id")
             parameters.updateValue(invitationCode, forKey: "invite_code")
             
-            SwiftProgressHUD.shared().showWait()
+            
             SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindMobile(parameters: parameters))) { (userModel) in
                 UserModel.shared().setModel(model: userModel as! UserModel)
-                SwiftProgressHUD.shared().hide()
+                
                 completion("")
             }
         }
@@ -162,16 +162,16 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         parameters.updateValue(umLoginModel.union_id, forKey: "union_id")
         parameters.updateValue(umLoginModel.open_id, forKey: "open_id")
         
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userIsBindWeixin(parameters: parameters))) {
             [weak self] (rootModel) in
             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
                     
@@ -208,10 +208,10 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(umLoginModel.username, forKey: "username")
             parameters.updateValue(umLoginModel.gender, forKey: "gender")
             
-            SwiftProgressHUD.shared().showWait()
+            
             SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userBindWeixin(parameters: parameters))) { (userModel) in
                 UserModel.shared().setModel(model: userModel as! UserModel)
-                SwiftProgressHUD.shared().hide()
+                
                 completion("")
             }
         }
@@ -233,10 +233,10 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         if userModel?.mobile == nil ||  userModel?.mobile == "" {
             SwiftProgressHUD.shared().showText("暂时不可以解绑,请先绑定手机号")
         }else {
-            SwiftProgressHUD.shared().showWait()
+            
             SwiftMoyaNetWorkManager.shared.requestObject(UserModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userUnbindWeixin(parameters: parameters))) {(userModel) in
                 UserModel.shared().setModel(model: userModel as! UserModel)
-                SwiftProgressHUD.shared().hide()
+                
                 completion("")
             }
         }
@@ -258,7 +258,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(password, forKey: "password")
             parameters.updateValue(password_confirmation, forKey: "password_confirmation")
             
-            SwiftProgressHUD.shared().showWait()
+            
             SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userSetPassword(parameters: parameters))) {(rootModel) in
                 SwiftProgressHUD.shared().showText(rootModel.msg!)
                 if rootModel.code == 0 {
@@ -285,9 +285,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         let baiduToCityModel = BaiduToCityFactory.shared.query(bjcityId: loacationModel!.cityCode)
         parameters.updateValue(baiduToCityModel.areaCode, forKey: "city_id")
         parameters.updateValue(type, forKey: "type")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(AddressManagerListModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userSelfAddressList(parameters: parameters))) {(addressManagerListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(addressManagerListModel)
         }
     }
@@ -323,7 +323,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
             parameters.updateValue(expressAddresModel.areaName ?? "", forKey: "area_name")
             parameters.updateValue(expressAddresModel.address ?? "", forKey: "address")
             
-            SwiftProgressHUD.shared().showWait()
+            
             SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userAddExpressAddress(parameters: parameters))) {(rootModel) in
                 SwiftProgressHUD.shared().showText(rootModel.msg!)
                 if rootModel.code == 0 {
@@ -343,7 +343,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userAddressIsDefaultApi(id:Int = 0,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userAddressIsDefault(parameters: parameters))) {
             (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -361,7 +361,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userAddressDeleteApi(id:Int = 0,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userAddressDelete(parameters: parameters))) {
             (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -377,9 +377,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     /// - Parameter completion: 成功回调
     func userExpreesContactsListApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(ContactListModel.self, target: MultiTarget(SwiftMoyaServiceUserApi.userExpreesContactsList(parameters: parameters))) { (contactListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(contactListModel)
         }
     }
@@ -390,9 +390,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     /// - Parameter completion: 成功回调
     func userDefaultExpressApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(ExpressAddresModel.self, target: MultiTarget(SwiftMoyaServiceUserApi.userDefaultExpress(parameters: parameters))) { (expressAddrModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(expressAddrModel as Any)
         }
     }
@@ -403,9 +403,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     /// - Parameter completion: 成功回调
     func userDefaultContactApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(SelfMentionContactsModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userDefaultContact(parameters: parameters))) {(contactMdl) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(contactMdl as Any)
         }
     }
@@ -430,7 +430,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
                 }
                 parameters.updateValue(mobile, forKey: "mobile")
                 parameters.updateValue(name, forKey: "name")
-                SwiftProgressHUD.shared().showWait()
+                
                 SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userSaveExpreesContacts(parameters: parameters))) {
                     (rootModel) in
                     SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -451,7 +451,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userDelExpreesContactsApi(id:Int = 0,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userDelExpreesContacts(parameters: parameters))) {
             (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -470,7 +470,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userSetExpreesContactsDefaultApi(id:Int = 0,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userSetExpreesContactsDefault(parameters: parameters))) {
             (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -493,7 +493,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         parameters.updateValue(cityName, forKey: "city_name")
         parameters.updateValue(pickupNodeId, forKey: "pickup_node_id")
         parameters.updateValue(address, forKey: "address")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userAddSelfAddress(parameters: parameters))) {
             (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -512,7 +512,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userSetDeliverTypeApi(deliveryMethodType:String = "2",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(deliveryMethodType, forKey: "deliver_type")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestRootModel(target: MultiTarget(SwiftMoyaServiceUserApi.userSetDeliverType(parameters: parameters))) {
             (rootModel) in
             SwiftProgressHUD.shared().showText(rootModel.msg!)
@@ -535,13 +535,13 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userGenderApi(gender:Int = 0,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(gender, forKey: "gender")
-//        SwiftProgressHUD.shared().showWait()
+//
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceUserApi.userMemberUpdateGender(parameters: parameters))) { (data) in
             // 设置成功更新本地存储数据
             let model = UserModel.shared().getModel()
             model?.gender = gender
             UserModel.shared().setModel(model: model!)
-//            SwiftProgressHUD.shared().hide()
+//
             completion("")
         }
     }
@@ -553,9 +553,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userMemberDetailApi(uid:Int,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(uid, forKey: "uid")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(UserDetailModel.self, target: MultiTarget(SwiftMoyaServiceUserApi.userMemberDetail(parameters: parameters))) { (userDetailModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(userDetailModel)
         }
     }
@@ -576,9 +576,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         parameters.updateValue(avatar, forKey: "avatar")
         parameters.updateValue(userName, forKey: "username")
         parameters.updateValue(signature, forKey: "signature")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceUserApi.userMemberDetailUpDate(parameters: parameters))) { (data) in
-            SwiftProgressHUD.shared().hide()
+            
             let userModel = UserModel.shared().getModel()
             userModel?.avatarurl = avatar
             userModel?.username = userName
@@ -595,9 +595,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(uid, forKey: "uid")
         parameters.updateValue(page, forKey: "page")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(UserFollowsModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userFollows(parameters: parameters))) { (userFollowsModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(userFollowsModel)
         }
     }
@@ -610,9 +610,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(page, forKey: "page")
         parameters.updateValue(uid, forKey: "uid")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(UserFansModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userFans(parameters: parameters))) { (userFansModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(userFansModel)
         }
     }
@@ -627,7 +627,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(followUid, forKey: "follow_uid")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(FollowStatusModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userFollow(parameters: parameters))) { (followStatusModel) in
             let followStatusModel = followStatusModel as? FollowStatusModel
             followStatusModel?.uid = followUid
@@ -647,7 +647,7 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(followUid, forKey: "follow_uid")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(FollowStatusModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userCancelFollow(parameters: parameters))) { (followStatusModel) in
             let followStatusModel = followStatusModel as? FollowStatusModel
             followStatusModel?.uid = followUid
@@ -663,10 +663,10 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     /// - Parameter completion: 回调
     func userMemberMessageIndexApi(completion: @escaping apiCallBack) {
         let parameters = Dictionary<String,Any>()
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(MessageIndexModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMemberMessageIndex(parameters: parameters))) { (messageIndexModel) in
             MessageIndexModel.shared.saveObject(model: messageIndexModel as! MessageIndexModel)
-            SwiftProgressHUD.shared().hide()
+            
             completion(messageIndexModel)
         }
     }
@@ -682,9 +682,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(messageShowTypes, forKey: "message_show_types")
         parameters.updateValue(page, forKey: "page")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(MessageListModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMemberMessageList(parameters: parameters))) { (messageListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(messageListModel)
         }
     }
@@ -697,9 +697,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userMemberReadMessageApi(messageShowTypes:String,completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(messageShowTypes, forKey: "message_show_types")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestAny(target: MultiTarget(SwiftMoyaServiceUserApi.userMemberReadMessage(parameters: parameters))) { (data) in
-            SwiftProgressHUD.shared().hide()
+            
             completion("")
         }
     }
@@ -712,9 +712,9 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(page, forKey: "page")
         parameters.updateValue(userName, forKey: "username")
-        SwiftProgressHUD.shared().showWait()
+        
         SwiftMoyaNetWorkManager.shared.requestObject(SearchMemberListModel.self,target: MultiTarget(SwiftMoyaServiceUserApi.userMemberSearchMember(parameters: parameters))) { (searchMemberListModel) in
-            SwiftProgressHUD.shared().hide()
+            
             completion(searchMemberListModel)
         }
     }

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

@@ -81,9 +81,6 @@ public let provider = MoyaProvider<MultiTarget>(endpointClosure: myEndpointClosu
 public var isNetworkConnect: Bool {
     get{
         if !AlamofireReachabilityManager.shared.isNetworkConnect() {
-            DispatchQueue.main.async {
-                SwiftProgressHUD.shared().hide()
-            }
             return false
         }else {
             if !kProductSever { //测试跟开发可以抓包