阿里一键登录修复

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -294,6 +294,8 @@
 		A7824B042271F10300ABA381 /* EditSelfMentionContactsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7824B032271F10300ABA381 /* EditSelfMentionContactsView.swift */; };
 		A7824B062271F25400ABA381 /* EditAddressTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7824B052271F25400ABA381 /* EditAddressTableViewCell.swift */; };
 		A7824B082271F53A00ABA381 /* EditSetDefaultTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7824B072271F53A00ABA381 /* EditSetDefaultTableViewCell.swift */; };
+		A784F29D234C370F00E49140 /* PhotoAlbumUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = A784F29C234C370F00E49140 /* PhotoAlbumUtil.swift */; };
+		A784F2A5234C86EC00E49140 /* ATAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A784F2A4234C86EC00E49140 /* ATAuthSDK.framework */; };
 		A78A5F7622FAA03800DD1764 /* share_iSpt.gif in Resources */ = {isa = PBXBuildFile; fileRef = A78A5F7522FAA03800DD1764 /* share_iSpt.gif */; };
 		A78A5F7822FAC7F000DD1764 /* SetGenderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A78A5F7722FAC7F000DD1764 /* SetGenderModel.swift */; };
 		A78CEE0A22E0864100C512A4 /* BaseLottieAnimateContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A78CEE0922E0864100C512A4 /* BaseLottieAnimateContentView.swift */; };
@@ -453,8 +455,6 @@
 		A7F577CD22FECD7C00E2D757 /* AliyunVodupToyoPublishManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F577CC22FECD7C00E2D757 /* AliyunVodupToyoPublishManager.swift */; };
 		A7F577D122FECE8700E2D757 /* AliyunVodUpToYoPublishModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F577D022FECE8700E2D757 /* AliyunVodUpToYoPublishModel.swift */; };
 		A7F577D722FED3A100E2D757 /* PathManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F577D622FED3A100E2D757 /* PathManager.swift */; };
-		A7F89400233E246B00A16253 /* ATAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7F893FF233E246B00A16253 /* ATAuthSDK.framework */; };
-		A7F89402233E252500A16253 /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A7F89401233E252500A16253 /* ATAuthSDK.bundle */; };
 		A7FF1577228C824300A85748 /* OrderModule.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A7FF1576228C824300A85748 /* OrderModule.xcassets */; };
 		A7FF1598228D092A00A85748 /* OrderListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF1597228D092A00A85748 /* OrderListModel.swift */; };
 		A7FF159C228D9E3D00A85748 /* OrderRefundDetailModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF159B228D9E3C00A85748 /* OrderRefundDetailModel.swift */; };
@@ -978,6 +978,8 @@
 		A7824B032271F10300ABA381 /* EditSelfMentionContactsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSelfMentionContactsView.swift; sourceTree = "<group>"; };
 		A7824B052271F25400ABA381 /* EditAddressTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditAddressTableViewCell.swift; sourceTree = "<group>"; };
 		A7824B072271F53A00ABA381 /* EditSetDefaultTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditSetDefaultTableViewCell.swift; sourceTree = "<group>"; };
+		A784F29C234C370F00E49140 /* PhotoAlbumUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhotoAlbumUtil.swift; sourceTree = "<group>"; };
+		A784F2A4234C86EC00E49140 /* ATAuthSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ATAuthSDK.framework; sourceTree = "<group>"; };
 		A78A5F7522FAA03800DD1764 /* share_iSpt.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = share_iSpt.gif; sourceTree = "<group>"; };
 		A78A5F7722FAC7F000DD1764 /* SetGenderModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SetGenderModel.swift; sourceTree = "<group>"; };
 		A78CEE0922E0864100C512A4 /* BaseLottieAnimateContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseLottieAnimateContentView.swift; sourceTree = "<group>"; };
@@ -1141,8 +1143,6 @@
 		A7F577CC22FECD7C00E2D757 /* AliyunVodupToyoPublishManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AliyunVodupToyoPublishManager.swift; sourceTree = "<group>"; };
 		A7F577D022FECE8700E2D757 /* AliyunVodUpToYoPublishModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AliyunVodUpToYoPublishModel.swift; sourceTree = "<group>"; };
 		A7F577D622FED3A100E2D757 /* PathManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PathManager.swift; sourceTree = "<group>"; };
-		A7F893FF233E246B00A16253 /* ATAuthSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ATAuthSDK.framework; path = "../../../../../../../Downloads/号码认证及一键登录iOS SDK v2.6.8_demo工程代码/Release/ATAuthSDK.framework"; sourceTree = "<group>"; };
-		A7F89401233E252500A16253 /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ATAuthSDK.bundle; sourceTree = "<group>"; };
 		A7FF1576228C824300A85748 /* OrderModule.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = OrderModule.xcassets; sourceTree = "<group>"; };
 		A7FF1597228D092A00A85748 /* OrderListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderListModel.swift; sourceTree = "<group>"; };
 		A7FF159B228D9E3C00A85748 /* OrderRefundDetailModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OrderRefundDetailModel.swift; sourceTree = "<group>"; };
@@ -1391,7 +1391,7 @@
 				A741449B232F24F40062FB6F /* CoreTelephony.framework in Frameworks */,
 				A7414493232F24ED0062FB6F /* QuartzCore.framework in Frameworks */,
 				A7414499232F24F30062FB6F /* CoreText.framework in Frameworks */,
-				A7F89400233E246B00A16253 /* ATAuthSDK.framework in Frameworks */,
+				A784F2A5234C86EC00E49140 /* ATAuthSDK.framework in Frameworks */,
 				A741448F232F24EA0062FB6F /* UIKit.framework in Frameworks */,
 				A7414497232F24F10062FB6F /* Foundation.framework in Frameworks */,
 				A741448C232F24E80062FB6F /* UserNotifications.framework in Frameworks */,
@@ -1959,7 +1959,7 @@
 		A72A725322321A6900B21995 /* Lib */ = {
 			isa = PBXGroup;
 			children = (
-				A763BE6F22F1B3D3000CE594 /* ATAuthSDK */,
+				A784F2A4234C86EC00E49140 /* ATAuthSDK.framework */,
 			);
 			path = Lib;
 			sourceTree = "<group>";
@@ -2534,15 +2534,6 @@
 			path = LoginNow;
 			sourceTree = "<group>";
 		};
-		A763BE6F22F1B3D3000CE594 /* ATAuthSDK */ = {
-			isa = PBXGroup;
-			children = (
-				A7F89401233E252500A16253 /* ATAuthSDK.bundle */,
-				A7F893FF233E246B00A16253 /* ATAuthSDK.framework */,
-			);
-			path = ATAuthSDK;
-			sourceTree = "<group>";
-		};
 		A763BE7A22F28376000CE594 /* Video */ = {
 			isa = PBXGroup;
 			children = (
@@ -3022,6 +3013,7 @@
 		A77F2CBC2232022A001BD3F6 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
+				A784F29B234C36D300E49140 /* PhotoAlbumUtil */,
 				A768939F233A0BB000819EC3 /* WSDrawCircleProgress */,
 				A77BB4512329EADA00DCAE32 /* Permission */,
 				A7811CC82323A6D300C2D8DE /* YPDouYinLikeAnimation */,
@@ -3258,6 +3250,14 @@
 			path = View;
 			sourceTree = "<group>";
 		};
+		A784F29B234C36D300E49140 /* PhotoAlbumUtil */ = {
+			isa = PBXGroup;
+			children = (
+				A784F29C234C370F00E49140 /* PhotoAlbumUtil.swift */,
+			);
+			path = PhotoAlbumUtil;
+			sourceTree = "<group>";
+		};
 		A78A5F7422FAA01F00DD1764 /* Gif */ = {
 			isa = PBXGroup;
 			children = (
@@ -5443,7 +5443,6 @@
 				BD108C9A22A60C3300837DAB /* HGImage.xcassets in Resources */,
 				A7F3069922E1C72D00DC7917 /* json_Image_1.png in Resources */,
 				A76068ED22E4A2B4008DF18F /* verywell.json in Resources */,
-				A7F89402233E252500A16253 /* ATAuthSDK.bundle in Resources */,
 				BD24FABB22B509CF00C7AA3B /* PublishModule.xcassets in Resources */,
 				A76893A7233A656A00819EC3 /* RongCloudIMModule.xcassets in Resources */,
 			);
@@ -5895,6 +5894,7 @@
 				A739121A229F75F50033177E /* JXPagingMainTableView.swift in Sources */,
 				A7C2566F22CB7A0C00420828 /* CommunityPostDetailModel.swift in Sources */,
 				A7CC7524227190FB003C4F38 /* AccountSecurityView.swift in Sources */,
+				A784F29D234C370F00E49140 /* PhotoAlbumUtil.swift in Sources */,
 				A7931E1422AF9E4000297D0A /* TopicSelectionCollectionViewCell.swift in Sources */,
 				BD0FAA4922C4663100DDFB37 /* AlivcEditItemModel.m in Sources */,
 				BD1DC6CB228D157000B89C57 /* OrderCreateBackModel.swift in Sources */,

RainbowPlanet/RainbowPlanet/Lib/ATAuthSDK/ATAuthSDK.framework/Headers/TXCommonHandler.h

@@ -87,6 +87,11 @@
 
 - (void)getLoginTokenWithController:(UIViewController *_Nonnull)vc model:(TXCustomModel *_Nullable)model timeout:(NSTimeInterval )timeout complete:(void (^_Nullable)(NSDictionary * _Nonnull resultDic))complete;
 
+/**
+ *  手动隐藏获取登录Token之后的等待动画，默认为自动隐藏，当设置 TXCustomModel 实例 autoHideLoginLoading = NO 时, 需要调用该方法手动隐藏
+ */
+- (void)hideLoginLoading;
+
 /**
  注销授权页，只有在客户自定义的按钮事件中调用！！
  

RainbowPlanet/RainbowPlanet/Lib/ATAuthSDK.framework/Headers/TXCommonUtils.h

@@ -0,0 +1,106 @@
+//
+//  TXCommonUtils.h
+//  authsdk
+//
+//  Created by yangli on 12/03/2018.
+
+#import <Foundation/Foundation.h>
+
+#define TX_Auth_Result_Success      @"6666"
+#define TX_Auth_Result_TimeOut      @"5555"
+#define TX_Auth_Result_Fail         @"4444"
+#define TX_Auth_Result_No_SIM_Card  @"1111"
+#define TX_Auth_Result_No_Network   @"2222"
+#define TX_Auth_Result_Other_Err    @"3333"
+#define TX_Auth_Result_Param_Err    @"3344"
+#define TX_Auth_Result_Demotion     @"4445"
+#define TX_Auth_Result_Limited      @"4446"
+
+#define TX_Login_AuthPage_Show_Success      @"6665" // 授权页成功唤起事件
+#define TX_Login_Return_Action              @"6667" // 点击了返回按钮
+#define TX_Login_SSO_Action                 @"6668" // 点击了登录按钮(并成功获取了token)
+#define TX_Login_Change_Action              @"6669" // 点击了切换按钮
+#define TX_Login_Protocol_Action            @"6670" // 点击了协议按钮
+#define TX_Login_ClickLoginBtn_Action       @"6671" // 点击了登录按钮事件
+
+typedef enum : NSInteger {
+    TX_Top_Request_Environment_Online,   // 0
+    TX_Top_Request_Environment_PreLine,
+    TX_Top_Request_Environment_Daily
+} TX_Top_Request_Environment;
+
+@interface TXCommonUtils : NSObject
+
+/**
+ 判断当前设备蜂窝数据网络是否开启，即3G/4G
+ @return 结果
+ */
++ (BOOL)checkDeviceCellularDataEnable;
+
+/**
+判断当前上网卡运营商是否是中国联通
+@return 结果
+*/
++ (BOOL)isChinaUnicom;
+
+/**
+判断当前上网卡运营商是否是中国移动
+@return 结果
+*/
++ (BOOL)isChinaMobile;
+
+/**
+判断当前上网卡运营商是否是中国电信
+@return 结果
+*/
++ (BOOL)isChinaTelecom;
+
+/**
+获取当前上网卡网络名称
+@return 结果
+*/
++ (NSString *)getCurrentMobileNetworkName;
+
+/**
+获取当前上网卡运营商名称，比如中国移动
+@return 结果
+*/
++ (NSString *)getCurrentCarrierName;
+
+/**
+获取当前上网卡网络类型，比如WiFi，4G
+@return 结果
+*/
++ (NSString *)getNetworktype;
+
+/**
+判断当前设备是否有SIM卡
+@return 结果
+*/
++ (BOOL)simSupportedIsOK;
+
+/**
+ 判断wwan是否开着（通过p0网卡判断，无wifi或有wifi情况下都能检测到）
+ @return 结果
+ */
++ (BOOL)isWWANOpen;
+
+/**
+ 判断wwan是否开着（仅无wifi情况下）
+ @return 结果
+ */
++ (BOOL)reachableViaWWAN;
+
+/**
+ 获取设备当前网络私网IP地址
+  @return 结果
+ */
++ (NSString *)getMobilePrivateIPAddress:(BOOL)preferIPv4;
+
+/**
+ SDK的服务端环境设置，注意：此接口只在Debug模式下生效
+  @return 结果
+ */
++ (void)setSDKServerEnvironment:(TX_Top_Request_Environment )env;
+
+@end

RainbowPlanet/RainbowPlanet/Lib/ATAuthSDK/ATAuthSDK.framework/Headers/TXCustomModel.h

@@ -22,6 +22,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) UIColor *navColor; // 导航栏主题色
 @property (nonatomic, copy) NSAttributedString *navTitle; // 导航栏标题，内容、字体、大小、颜色
 @property (nonatomic, strong) UIImage *navBackImage; // 导航栏返回图片
+/** 是否隐藏授权页导航栏返回按钮，默认不隐藏 */
+@property (nonatomic, assign) BOOL hideNavBackItem;
 @property (nonatomic, strong) UIBarButtonItem *navMoreControl; // 导航栏右侧自定义控件，UIBarButtonItem
 
 // logo图片
@@ -38,23 +40,37 @@ NS_ASSUME_NONNULL_BEGIN
 
 // 号码
 @property (nonatomic, strong) UIColor *numberColor;
-@property (nonatomic, assign) CGFloat numberSize;
+@property (nonatomic, strong) UIFont *numberFont;
 @property (nonatomic, assign) CGFloat numberTopOffetY; // number相对导航栏底部的Y轴距离
+@property (nonatomic, assign) CGFloat numberOffetX; // number相对屏幕中线的X轴偏移距离，大于0则右移，小于0则左移
 
 // 登录
-@property (nonatomic, strong) NSString *loginBtnTitle;  // loginBtn标题
-@property (nonatomic, strong) UIColor *loginBtnTitleColor;  // loginBtn文本颜色
-@property (nonatomic,strong) NSArray *loginBtnBgImgs; //loginBtn背景图片组，高度45.0pt，@[激活状态的图片,失效状态的图片,高亮状态的图片]
+@property (nonatomic, strong) NSAttributedString *loginBtnText;
+@property (nonatomic,strong) NSArray *loginBtnBgImgs; //loginBtn背景图片组，高度默认50.0pt，@[激活状态的图片,失效状态的图片,高亮状态的图片]
 @property (nonatomic, assign) CGFloat loginBtnTopOffetY; // loginBtn相对导航栏底部的Y轴距离
+@property (nonatomic, assign) CGFloat loginBtnHeight; // loginBtn高度，必须大于40.0pt
+@property (nonatomic, assign) CGFloat loginBtnLRPadding; // 按钮左右屏幕边距，按钮的宽度必须大于屏幕的一半
+/**
+ *  是否自动隐藏点击登录按钮之后授权页的转圈的 loading, 默认为 Yes，在获取登录Token成功后自动隐藏
+ *  如果设置为 NO，需要自己手动调用 [[TXCommonHandler sharedInstance] hideLoginLoading] 隐藏
+ */
+@property (nonatomic, assign) BOOL autoHideLoginLoading;
 
 // 协议
 @property (nonatomic, copy) NSArray *checkBoxImages; // checkBox图片组，[uncheckedImg,checkedImg]
 @property (nonatomic, assign) BOOL checkBoxIsChecked; // checkBox是否勾选，默认YES
+@property (nonatomic, assign) BOOL checkBoxIsHidden; // checkBox是否隐藏，默认NO
+@property (nonatomic, assign) CGFloat checkBoxWH; // checkBox大小，高宽一样，必须大于12.0pt
+
 @property (nonatomic, copy) NSArray *privacyOne; // 协议1，[协议名称,协议Url]
 @property (nonatomic, copy) NSArray *privacyTwo; // 协议2，[协议名称,协议Url]
-@property (nonatomic, copy) NSArray *privacyColors; // 协议内容颜色，[非点击文案颜色,协议颜色]
-@property (nonatomic, assign) CGFloat privacyBottomOffetY; // 协议相对全屏底部的Y轴距离！！！与其他有区别
-
+@property (nonatomic, copy) NSArray *privacyColors; // 协议内容颜色，[非点击文案颜色,点击文案颜色]
+@property (nonatomic, assign) CGFloat privacyBottomOffetY; // 协议相对屏幕底部的Y轴距离！！！与其他有区别
+@property (nonatomic, assign) NSTextAlignment privacyAlignment; // 协议文案支持居中、居左设置，默认居左
+@property (nonatomic, copy) NSString *privacyPreText; // 协议整体文案，前缀部分文案
+@property (nonatomic, copy) NSString *privacySufText; // 协议整体文案，后缀部分文案
+@property (nonatomic, strong) UIFont *privacyFont; // 协议文案字体大小
+@property (nonatomic, assign) CGFloat privacyLRPadding; // 协议整体（包括checkBox）的左右屏幕边距，当协议整体宽度小于（屏幕宽度-2*左右边距）且居中模式，则左右边距设置无效
 
 // 切换到其他方式
 @property (nonatomic, copy) NSAttributedString *changeBtnTitle; // changeBtn标题，内容、字体、大小、颜色

RainbowPlanet/RainbowPlanet/Lib/ATAuthSDK/ATAuthSDK.framework/Headers/TXCommonUtils.h

@@ -1,53 +0,0 @@
-//
-//  TXCommonUtils.h
-//  authsdk
-//
-//  Created by yangli on 12/03/2018.
-
-#import <Foundation/Foundation.h>
-
-#define TX_Auth_Result_Success      @"6666"
-#define TX_Auth_Result_TimeOut      @"5555"
-#define TX_Auth_Result_Fail         @"4444"
-#define TX_Auth_Result_No_SIM_Card  @"1111"
-#define TX_Auth_Result_No_Network   @"2222"
-#define TX_Auth_Result_Other_Err    @"3333"
-#define TX_Auth_Result_Param_Err    @"3344"
-
-#define TX_Login_Return_Action      @"6667" // 点击了返回按钮
-#define TX_Login_SSO_Action         @"6668" // 点击了登录按钮并成功获取了token
-#define TX_Login_Change_Action      @"6669" // 点击了切换按钮
-
-@interface TXCommonUtils : NSObject
-
-+ (BOOL)isChinaUnicom;
-
-+ (BOOL)isChinaMobile;
-
-+ (BOOL)isChinaTelecom;
-
-+ (NSString *)getCurrentMobileNetworkName;
-
-+ (NSString *)getCurrentCarrierName;
-
-+ (NSString *)getNetworktype;
-+ (BOOL)simSupportedIsOK;
-
-/**
- 判断wwan是否开着（通过p0网卡判断，无wifi或有wifi情况下都能检测到）
- @return 结果
- */
-+ (BOOL)isWWANOpen;
-
-/**
- 判断wwan是否开着（仅无wifi情况下）
- @return 结果
- */
-+ (BOOL)reachableViaWWAN;
-
-/**
- 获取设备当前网络私网IP地址
- */
-+ (NSString *)getMobilePrivateIPAddress:(BOOL)preferIPv4;
-
-@end

RainbowPlanet/RainbowPlanet/Lib/ATAuthSDK/ATAuthSDK.framework/PrivateHeaders/TXSecurityUtils.h

@@ -1,21 +0,0 @@
-//
-//  TXSecurityUtils.h
-//  ATAuthSDK
-//
-//  Created by yangli on 2018/12/6.
-//
-
-#import <Foundation/Foundation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface TXSecurityUtils : NSObject
-
-+ (NSString *)encryptAES:(NSString *)content key:(NSString *)key;
-+ (NSString *)decryptAES:(NSString *)content key:(NSString *)key;
-
-+ (NSString *)encryptMD5:(NSString *)content;
-
-@end
-
-NS_ASSUME_NONNULL_END

RainbowPlanet/RainbowPlanet/Macro/FontMacro.swift

@@ -58,6 +58,7 @@ let kRegularFont17 = UIFont(name: "PingFang-SC-Regular", size: 17)
 let kRegularFont18 = UIFont(name: "PingFang-SC-Regular", size: 18)
 let kRegularFont19 = UIFont(name: "PingFang-SC-Regular", size: 19)
 let kRegularFont22 = UIFont(name: "PingFang-SC-Regular", size: 22)
+let kRegularFont36 = UIFont(name: "PingFang-SC-Regular", size: 36)
 
 
 let kScaleBoldFont10 = UIFont.boldSystemFont(ofSize: kScaleValue(value: 10))

RainbowPlanet/RainbowPlanet/Manager/ATAuthSDKManager/ATAuthSDKManager.swift

@@ -16,6 +16,7 @@ class ATAuthSDKManager: NSObject {
     class func oneBuiltLogin(vc:UIViewController?) {
         
         TXCommonHandler.sharedInstance().checkAsyncGatewayVerifyEnable(nil) {[weak vc] (enable) in
+            NXLLog(TXCommonHandler.sharedInstance().getVersion())
             DispatchQueue.main.async {
                 [weak vc] in
                 if !enable {//先获取authortoken并认证
@@ -27,10 +28,10 @@ class ATAuthSDKManager: NSObject {
 
                 /// navigationbara
                 modelNew.navColor = kffffffColor
-                modelNew.navBackImage = kImage(name: "navbar_back_black")!
+                modelNew.navBackImage = kImage(name: "navbar_back_white")!
                 
                 //Moblie
-                modelNew.numberSize = 36
+                modelNew.numberFont = kRegularFont36!
                 modelNew.numberColor = UIColor.black
                 modelNew.numberTopOffetY = 120 * kScaleWidth
                 
@@ -61,8 +62,8 @@ class ATAuthSDKManager: NSObject {
                 let disableImage = UIImage.image(with: kThemeColor, size: CGSize(width: 295, height: 48.0), isRoundedCorner: true)
                 let lightedImage = UIImage.image(with: kThemeColor, size: CGSize(width: 295, height: 48.0), isRoundedCorner: true)
                 modelNew.loginBtnBgImgs = [normalImage as Any,disableImage as Any,lightedImage as Any]
-                modelNew.loginBtnTitle = "一键登录"
-                modelNew.loginBtnTitleColor = UIColor.white
+//                modelNew.loginBtnTitle = "一键登录"
+//                modelNew.loginBtnTitleColor = UIColor.white
                 modelNew.loginBtnTopOffetY =  245 * kScaleWidth
                 
                 TXCommonHandler.sharedInstance().getLoginToken(with: vc!, model: modelNew, timeout: 10, complete: { [weak vc] (resultDic) in

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

@@ -189,9 +189,9 @@ class RegisterLoginViewController: BaseViewController {
         oneBuiltLoginButton.setBackgroundImage(UIImage.imageWithColor(color: kffffffColor), for: UIControl.State.normal)
         oneBuiltLoginButton.layer.cornerRadius = 24
         oneBuiltLoginButton.layer.masksToBounds = true
-        if #available(iOS 13.0, *) {
-            oneBuiltLoginButton.isHidden = true
-        }
+//        if #available(iOS 13.0, *) {
+//            oneBuiltLoginButton.isHidden = true
+//        }
         return oneBuiltLoginButton
     }()
     

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

@@ -15,8 +15,8 @@ let kBetaSever = false
 let kProductSever = false
 
 /// H5Service
-let kH5PersonalService = true
-let kH5DevelopSever = false
+let kH5PersonalService = false
+let kH5DevelopSever = true
 let kH5BetaSever = false
 let kH5ProductSever = false
 

RainbowPlanet/RainbowPlanet/Tools/PhotoAlbumUtil/PhotoAlbumUtil.swift

@@ -0,0 +1,86 @@
+//
+//  PhotoAlbumUtil.swift
+//  RainbowPlanet
+//
+//  Created by 南鑫林 on 2019/10/8.
+//  Copyright © 2019 RainbowPlanet. All rights reserved.
+//
+
+import Photos
+
+//操作结果枚举
+enum PhotoAlbumUtilResult {
+    case success, error, denied
+}
+
+//相册操作工具类
+class PhotoAlbumUtil: NSObject {
+    
+    //判断是否授权
+    class func isAuthorized() -> Bool {
+        return PHPhotoLibrary.authorizationStatus() == .authorized ||
+            PHPhotoLibrary.authorizationStatus() == .notDetermined
+    }
+    
+    //保存图片到相册
+    class func saveImageInAlbum(image: UIImage, albumName: String = "",
+                                completion: ((_ result: PhotoAlbumUtilResult) -> ())?) {
+        
+        //权限验证
+        if !isAuthorized() {
+            completion?(.denied)
+            return
+        }
+        var assetAlbum: PHAssetCollection?
+        
+        //如果指定的相册名称为空，则保存到相机胶卷。（否则保存到指定相册）
+        if albumName.isEmpty {
+            let list = PHAssetCollection
+                .fetchAssetCollections(with: .smartAlbum, subtype: .smartAlbumUserLibrary,
+                                       options: nil)
+            assetAlbum = list[0]
+        } else {
+            //看保存的指定相册是否存在
+            let list = PHAssetCollection
+                .fetchAssetCollections(with: .album, subtype: .any, options: nil)
+            list.enumerateObjects({ (album, index, stop) in
+                let assetCollection = album
+                if albumName == assetCollection.localizedTitle {
+                    assetAlbum = assetCollection
+                    stop.initialize(to: true)
+                }
+            })
+            //不存在的话则创建该相册
+            if assetAlbum == nil {
+                PHPhotoLibrary.shared().performChanges({
+                    PHAssetCollectionChangeRequest
+                        .creationRequestForAssetCollection(withTitle: albumName)
+                }, completionHandler: { (isSuccess, error) in
+                    self.saveImageInAlbum(image: image, albumName: albumName,
+                                          completion: completion)
+                })
+                return
+            }
+        }
+        
+        //保存图片
+        PHPhotoLibrary.shared().performChanges({
+            //添加的相机胶卷
+            let result = PHAssetChangeRequest.creationRequestForAsset(from: image)
+            //是否要添加到相簿
+            if !albumName.isEmpty {
+                let assetPlaceholder = result.placeholderForCreatedAsset
+                let albumChangeRequset = PHAssetCollectionChangeRequest(for:
+                    assetAlbum!)
+                albumChangeRequset!.addAssets([assetPlaceholder!]  as NSArray)
+            }
+        }) { (isSuccess: Bool, error: Error?) in
+            if isSuccess {
+                completion?(.success)
+            } else{
+                print(error!.localizedDescription)
+                completion?(.error)
+            }
+        }
+    }
+}