添加mj刷新

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -10,6 +10,7 @@
 		0A110C4CD931995B8E8BF7C5 /* Pods_RainbowPlanet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D469F6C3768252BCB7001EDD /* Pods_RainbowPlanet.framework */; };
 		A70EBBC022561179000AD74F /* Extension+UITableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A70EBBBF22561179000AD74F /* Extension+UITableView.swift */; };
 		A71D2A602265673A00A55D16 /* RegisterLoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A71D2A5F2265673A00A55D16 /* RegisterLoginView.swift */; };
+		A71D2A6522657D5900A55D16 /* UIScrollView+MJRefreshEX.m in Sources */ = {isa = PBXBuildFile; fileRef = A71D2A6322657D5900A55D16 /* UIScrollView+MJRefreshEX.m */; };
 		A72843FC224DB6B800F82F30 /* SwiftMoyaServiceUserApi.swift in Sources */ = {isa = PBXBuildFile; fileRef = A72843FB224DB6B800F82F30 /* SwiftMoyaServiceUserApi.swift */; };
 		A7284401224DBB7700F82F30 /* SwiftMoyaNetWorkServiceUser.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7284400224DBB7700F82F30 /* SwiftMoyaNetWorkServiceUser.swift */; };
 		A7284404224DBFBD00F82F30 /* LoginModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7284403224DBFBD00F82F30 /* LoginModel.swift */; };
@@ -150,6 +151,8 @@
 		88DF1EFD2E202DA7C627E8A7 /* Pods_RainbowPlanetUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RainbowPlanetUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A70EBBBF22561179000AD74F /* Extension+UITableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Extension+UITableView.swift"; sourceTree = "<group>"; };
 		A71D2A5F2265673A00A55D16 /* RegisterLoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RegisterLoginView.swift; sourceTree = "<group>"; };
+		A71D2A6322657D5900A55D16 /* UIScrollView+MJRefreshEX.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+MJRefreshEX.m"; sourceTree = "<group>"; };
+		A71D2A6422657D5900A55D16 /* UIScrollView+MJRefreshEX.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+MJRefreshEX.h"; sourceTree = "<group>"; };
 		A72843FB224DB6B800F82F30 /* SwiftMoyaServiceUserApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaServiceUserApi.swift; sourceTree = "<group>"; };
 		A7284400224DBB7700F82F30 /* SwiftMoyaNetWorkServiceUser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkServiceUser.swift; sourceTree = "<group>"; };
 		A7284403224DBFBD00F82F30 /* LoginModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoginModel.swift; sourceTree = "<group>"; };
@@ -351,6 +354,16 @@
 			path = SwiftMoyaServiceApi;
 			sourceTree = "<group>";
 		};
+		A71D2A6222657D5900A55D16 /* MJRefreshEX */ = {
+			isa = PBXGroup;
+			children = (
+				A71D2A6422657D5900A55D16 /* UIScrollView+MJRefreshEX.h */,
+				A71D2A6322657D5900A55D16 /* UIScrollView+MJRefreshEX.m */,
+			);
+			name = MJRefreshEX;
+			path = "../../../../../信用付/信用付用户版swift/CreaditPayment/CreaditPayment/Tools/MJRefreshEX";
+			sourceTree = "<group>";
+		};
 		A72843FD224DB79400F82F30 /* SwiftMoyaServiceUser */ = {
 			isa = PBXGroup;
 			children = (
@@ -490,7 +503,7 @@
 			path = Manager;
 			sourceTree = "<group>";
 		};
-		A72A725922321C5E00B21995 /* Define */ = {
+		A72A725922321C5E00B21995 /* Macro */ = {
 			isa = PBXGroup;
 			children = (
 				A72A72CA22321E2600B21995 /* Common.swift */,
@@ -503,7 +516,7 @@
 				A72A72CE22321E2700B21995 /* ThirdPartyMacro.swift */,
 				A72A726022321D3400B21995 /* RainbowPlanet-Bridging-Header.h */,
 			);
-			path = Define;
+			path = Macro;
 			sourceTree = "<group>";
 		};
 		A72A726122321DBD00B21995 /* MapManager */ = {
@@ -884,7 +897,7 @@
 				A77F2C8F2231FC65001BD3F6 /* Base */,
 				A77F2CA22232010F001BD3F6 /* Modules */,
 				A72A725422321B9400B21995 /* Manager */,
-				A72A725922321C5E00B21995 /* Define */,
+				A72A725922321C5E00B21995 /* Macro */,
 				A77F2CBC2232022A001BD3F6 /* Tools */,
 				A72A725322321A6900B21995 /* Lib */,
 				A72A7252223219BD00B21995 /* Service */,
@@ -1096,6 +1109,7 @@
 		A77F2CBC2232022A001BD3F6 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				A71D2A6222657D5900A55D16 /* MJRefreshEX */,
 				A7284A6E22543B07000BAEC4 /* Refreshable */,
 				A72A727322321DDE00B21995 /* Log */,
 				A72A727D22321DDF00B21995 /* AppInfo */,
@@ -1481,6 +1495,7 @@
 				A7A97FDD2238FBAD0070F84D /* VerticalSectionHeaderView.swift in Sources */,
 				A7778CB32244D73400C7C47A /* RegisterLoginViewController.swift in Sources */,
 				A7A97FDB2238FBAD0070F84D /* VerticalListCellModel.swift in Sources */,
+				A71D2A6522657D5900A55D16 /* UIScrollView+MJRefreshEX.m in Sources */,
 				A738D205225AF90D00EEE860 /* WeChatpayOrderModel.swift in Sources */,
 				A72A72BD22321DE000B21995 /* Extension+UIColor.swift in Sources */,
 				A77F2CC822320627001BD3F6 /* WRCustomNavigationBar.swift in Sources */,
@@ -1782,7 +1797,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.chxq.rainbowplanet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "RainbowPlanet/Define/RainbowPlanet-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "RainbowPlanet/Macro/RainbowPlanet-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -1903,7 +1918,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.chxq.rainbowplanet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_OBJC_BRIDGING_HEADER = "RainbowPlanet/Define/RainbowPlanet-Bridging-Header.h";
+				SWIFT_OBJC_BRIDGING_HEADER = "RainbowPlanet/Macro/RainbowPlanet-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};

RainbowPlanet/RainbowPlanet/Define/CacheMacro.swift

@@ -9,9 +9,3 @@
 import Foundation
 
 
-/// 百度定位
-let kLocationModelCache = "LocationModel"
-
-/// 百度定位
-let kAMapLocationModelCache = "AMapLocationModel"
-

RainbowPlanet/RainbowPlanet/Define/RainbowPlanet-Bridging-Header.h

@@ -13,12 +13,12 @@
 #import <MBProgressHUD/MBProgressHUD.h>
 //支付宝支付
 #import <AlipaySDK/AlipaySDK.h>
-
-#import <JXCategoryView/JXCategoryView.h>
-
 //微信支付
 #import "WXApi.h"
 
+#import "UIScrollView+MJRefreshEX.h"
+
+#import <JXCategoryView/JXCategoryView.h>
 
 //空白页面占位图
 #import <LYEmptyView/LYEmptyViewHeader.h>

RainbowPlanet/RainbowPlanet/Manager/MapManager/AMapManager/AMapLocationModel.swift

@@ -8,6 +8,9 @@
 
 import UIKit
 
+/// 高德定位
+let kAMapLocationModelCache = "AMapLocationModel"
+
 class AMapLocationModel: NSObject,NSCoding {
 
     private static let _sharedInstance = AMapLocationModel()

RainbowPlanet/RainbowPlanet/Manager/MapManager/BaiduMapManager/LocationModel.swift

@@ -8,6 +8,9 @@
 
 import UIKit
 
+/// 百度定位
+let kLocationModelCache = "LocationModel"
+
 class LocationModel: NSObject,NSCoding {
 
     private static let _sharedInstance = LocationModel()

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/RegisterLogin/ViewController/RegisterLoginViewController.swift

@@ -31,6 +31,7 @@ class RegisterLoginViewController: BaseViewController {
 
     private lazy var registerLoginView: RegisterLoginView = {
         let registerLoginView = RegisterLoginView()
+        // 微信注册登录
         registerLoginView.weiXinLoginBlock = { [weak self] in
             UMManager.shared().loginGetUserInfo(platformType: UMSocialPlatformType.wechatSession) { (loginModel) -> (Void) in
                 SwiftMoyaNetWorkServiceUser.shared().userWeiXinRegisterApi(open_id: loginModel.open_id, union_id: loginModel.union_id, avatar: loginModel.avatar, username: loginModel.username, gender: loginModel.gender, completion: { (data) -> (Void) in