更换账号完成

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -225,8 +225,6 @@
 		A76390EB2248E27A0067EEE0 /* UserNotifications.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A76390EA2248E27A0067EEE0 /* UserNotifications.framework */; };
 		A763BE6C22F173A0000CE594 /* LoginNowView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A763BE6B22F173A0000CE594 /* LoginNowView.swift */; };
 		A763BE6E22F1953D000CE594 /* CommunityFollowLoginTableHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A763BE6D22F1953D000CE594 /* CommunityFollowLoginTableHeaderView.swift */; };
-		A763BE7722F1B6C7000CE594 /* TYRZResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A763BE7622F1B6C7000CE594 /* TYRZResource.bundle */; };
-		A763BE7922F1B6EB000CE594 /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A763BE7822F1B6EB000CE594 /* ATAuthSDK.bundle */; };
 		A7649B6922977A4300BCE9D1 /* ShopSectionHeaderModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7649B6822977A4300BCE9D1 /* ShopSectionHeaderModel.swift */; };
 		A76B786922CE04940047EC1B /* CommunityRecommendDetailHTMLTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A76B786822CE04940047EC1B /* CommunityRecommendDetailHTMLTableViewCell.swift */; };
 		A770E5DB22CED8C600CBD0A4 /* RouterManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A770E5DA22CED8C600CBD0A4 /* RouterManager.swift */; };
@@ -457,7 +455,9 @@
 		A7F3069422E16A5B00DC7917 /* MineRouterModuleType.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F3069322E16A5B00DC7917 /* MineRouterModuleType.swift */; };
 		A7F3069722E1AE9600DC7917 /* MessageModuleManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7F3069622E1AE9600DC7917 /* MessageModuleManager.swift */; };
 		A7F3069922E1C72D00DC7917 /* json_Image_1.png in Resources */ = {isa = PBXBuildFile; fileRef = A7F3069822E1C72D00DC7917 /* json_Image_1.png */; };
-		A7F577BA22FD491D00E2D757 /* ATAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7F577B922FD491C00E2D757 /* ATAuthSDK.framework */; };
+		A7F577C322FD894F00E2D757 /* ATAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7F577C022FD894F00E2D757 /* ATAuthSDK.framework */; };
+		A7F577C422FD894F00E2D757 /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A7F577C122FD894F00E2D757 /* ATAuthSDK.bundle */; };
+		A7F577C522FD894F00E2D757 /* TYRZResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A7F577C222FD894F00E2D757 /* TYRZResource.bundle */; };
 		A7FF1555228AC27600A85748 /* ProductAllCommentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF1554228AC27600A85748 /* ProductAllCommentView.swift */; };
 		A7FF1557228AC3E800A85748 /* ProductAllCommentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF1556228AC3E800A85748 /* ProductAllCommentViewController.swift */; };
 		A7FF1560228C693D00A85748 /* OrderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7FF155F228C693D00A85748 /* OrderViewController.swift */; };
@@ -941,8 +941,6 @@
 		A76390EA2248E27A0067EEE0 /* UserNotifications.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UserNotifications.framework; path = System/Library/Frameworks/UserNotifications.framework; sourceTree = SDKROOT; };
 		A763BE6B22F173A0000CE594 /* LoginNowView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginNowView.swift; sourceTree = "<group>"; };
 		A763BE6D22F1953D000CE594 /* CommunityFollowLoginTableHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityFollowLoginTableHeaderView.swift; sourceTree = "<group>"; };
-		A763BE7622F1B6C7000CE594 /* TYRZResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TYRZResource.bundle; sourceTree = "<group>"; };
-		A763BE7822F1B6EB000CE594 /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ATAuthSDK.bundle; sourceTree = "<group>"; };
 		A7649B6822977A4300BCE9D1 /* ShopSectionHeaderModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShopSectionHeaderModel.swift; sourceTree = "<group>"; };
 		A76B786822CE04940047EC1B /* CommunityRecommendDetailHTMLTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityRecommendDetailHTMLTableViewCell.swift; sourceTree = "<group>"; };
 		A770E5DA22CED8C600CBD0A4 /* RouterManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouterManager.swift; sourceTree = "<group>"; };
@@ -1027,7 +1025,6 @@
 		A7931E1722AFC1DF00297D0A /* CommunityFollowViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommunityFollowViewController.swift; sourceTree = "<group>"; };
 		A797FDEA22C5AC6A0076DCB3 /* CacheManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CacheManager.swift; sourceTree = "<group>"; };
 		A7A17E5E22A0CEF200B7A77E /* SwiftMoyaNetWorkManagerTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkManagerTools.swift; sourceTree = "<group>"; };
-		A7A59A7722363CCB00417FA4 /* RainbowPlanet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RainbowPlanet.entitlements; sourceTree = "<group>"; };
 		A7A98DFC227E84F4005306E9 /* SwiftMoyaServiceProductApi.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaServiceProductApi.swift; sourceTree = "<group>"; };
 		A7A98DFE227E8501005306E9 /* SwiftMoyaNetWorkServiceProduct.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftMoyaNetWorkServiceProduct.swift; sourceTree = "<group>"; };
 		A7A98E01227E8900005306E9 /* ProductSearchListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductSearchListModel.swift; sourceTree = "<group>"; };
@@ -1185,7 +1182,10 @@
 		A7F3069322E16A5B00DC7917 /* MineRouterModuleType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MineRouterModuleType.swift; sourceTree = "<group>"; };
 		A7F3069622E1AE9600DC7917 /* MessageModuleManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageModuleManager.swift; sourceTree = "<group>"; };
 		A7F3069822E1C72D00DC7917 /* json_Image_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = json_Image_1.png; sourceTree = "<group>"; };
-		A7F577B922FD491C00E2D757 /* ATAuthSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ATAuthSDK.framework; sourceTree = "<group>"; };
+		A7F577BB22FD7A9B00E2D757 /* RainbowPlanet.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = RainbowPlanet.entitlements; sourceTree = "<group>"; };
+		A7F577C022FD894F00E2D757 /* ATAuthSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ATAuthSDK.framework; path = "../../../../../../../Downloads/号码认证及一键登录iOS SDK v2.6.5_demo工程代码/Release/ATAuthSDK.framework"; sourceTree = "<group>"; };
+		A7F577C122FD894F00E2D757 /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = ATAuthSDK.bundle; sourceTree = "<group>"; };
+		A7F577C222FD894F00E2D757 /* TYRZResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TYRZResource.bundle; sourceTree = "<group>"; };
 		A7FF1554228AC27600A85748 /* ProductAllCommentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductAllCommentView.swift; sourceTree = "<group>"; };
 		A7FF1556228AC3E800A85748 /* ProductAllCommentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductAllCommentViewController.swift; sourceTree = "<group>"; };
 		A7FF155F228C693D00A85748 /* OrderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OrderViewController.swift; sourceTree = "<group>"; };
@@ -1494,7 +1494,7 @@
 				A72A72FE22321EE200B21995 /* QuartzCore.framework in Frameworks */,
 				A72A72FC22321ECE00B21995 /* CoreTelephony.framework in Frameworks */,
 				A72A72FA22321EBF00B21995 /* CoreText.framework in Frameworks */,
-				A7F577BA22FD491D00E2D757 /* ATAuthSDK.framework in Frameworks */,
+				A7F577C322FD894F00E2D757 /* ATAuthSDK.framework in Frameworks */,
 				A72A72F822321EB600B21995 /* CoreGraphics.framework in Frameworks */,
 				A72A72F622321EA000B21995 /* UIKit.framework in Frameworks */,
 				A72A72F422321E9A00B21995 /* Foundation.framework in Frameworks */,
@@ -2845,9 +2845,9 @@
 		A763BE6F22F1B3D3000CE594 /* ATAuthSDK */ = {
 			isa = PBXGroup;
 			children = (
-				A7F577B922FD491C00E2D757 /* ATAuthSDK.framework */,
-				A763BE7822F1B6EB000CE594 /* ATAuthSDK.bundle */,
-				A763BE7622F1B6C7000CE594 /* TYRZResource.bundle */,
+				A7F577C022FD894F00E2D757 /* ATAuthSDK.framework */,
+				A7F577C122FD894F00E2D757 /* ATAuthSDK.bundle */,
+				A7F577C222FD894F00E2D757 /* TYRZResource.bundle */,
 			);
 			path = ATAuthSDK;
 			sourceTree = "<group>";
@@ -3366,7 +3366,7 @@
 				A76068E322E47E0E008DF18F /* RegisterLoginModule.xcassets */,
 				A729B5A92266F6FD004AE098 /* Launch Screen.storyboard */,
 				A77F2C6C2231FB4A001BD3F6 /* Info.plist */,
-				A7A59A7722363CCB00417FA4 /* RainbowPlanet.entitlements */,
+				A7F577BB22FD7A9B00E2D757 /* RainbowPlanet.entitlements */,
 			);
 			path = "Supporting Files";
 			sourceTree = "<group>";
@@ -5915,17 +5915,17 @@
 				BDD54A2622C31D60005BBE19 /* watermark.png in Resources */,
 				BD108C9B22A60C3300837DAB /* HGImage.storyboard in Resources */,
 				A7FF1577228C824300A85748 /* OrderModule.xcassets in Resources */,
+				A7F577C422FD894F00E2D757 /* ATAuthSDK.bundle in Resources */,
 				A72E684F22F2BBB30063D967 /* login_video.mp4 in Resources */,
 				BD4B50AC22BC7DEA0073B516 /* FilterResource.bundle in Resources */,
-				A763BE7922F1B6EB000CE594 /* ATAuthSDK.bundle in Resources */,
 				A76068EB22E49BC1008DF18F /* collect.json in Resources */,
 				A7778C9922438F5D00C7C47A /* README.txt in Resources */,
 				BDD54A2922C31D60005BBE19 /* LocalMV.json in Resources */,
 				A7BF202722B3930100396DB3 /* MessageModule.xcassets in Resources */,
-				A763BE7722F1B6C7000CE594 /* TYRZResource.bundle in Resources */,
 				BDD54A2B22C31D78005BBE19 /* filter in Resources */,
 				BD108C9A22A60C3300837DAB /* HGImage.xcassets in Resources */,
 				A7F3069922E1C72D00DC7917 /* json_Image_1.png in Resources */,
+				A7F577C522FD894F00E2D757 /* TYRZResource.bundle in Resources */,
 				A76068ED22E4A2B4008DF18F /* verywell.json in Resources */,
 				A729B5AA2266F6FD004AE098 /* Launch Screen.storyboard in Resources */,
 				BD24FABB22B509CF00C7AA3B /* PublishModule.xcassets in Resources */,
@@ -6806,7 +6806,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = B4UG6NNMLL;
+				DEVELOPMENT_TEAM = C6GA87VLB8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -7033,7 +7033,7 @@
 					"-framework",
 					"\"UserNotifications\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.chxq.rainbowplanet;
+				PRODUCT_BUNDLE_IDENTIFIER = com.uptoyo.uptoyo;
 				PRODUCT_MODULE_NAME = RainbowPlanet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
@@ -7056,7 +7056,7 @@
 				CODE_SIGN_STYLE = Automatic;
 				COPY_PHASE_STRIP = YES;
 				DEFINES_MODULE = YES;
-				DEVELOPMENT_TEAM = B4UG6NNMLL;
+				DEVELOPMENT_TEAM = C6GA87VLB8;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -7284,7 +7284,7 @@
 					"-framework",
 					"\"UserNotifications\"",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.chxq.rainbowplanet;
+				PRODUCT_BUNDLE_IDENTIFIER = com.uptoyo.uptoyo;
 				PRODUCT_MODULE_NAME = RainbowPlanet;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "RainbowPlanet/Macro/RainbowPlanet-Bridging-Header.h";

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

@@ -10,7 +10,10 @@ import UIKit
 import SwiftyJSON
 
 //MARK: - 百度地图
-let kBaiduMapAppKey  = "v7wFjrAQdlaBVC50CjwuRESC3Lu0xkhj"
+
+let kBaiduMapAppKey  = "0FUPvEYPoRij3zm0tY5yLcyPKrrWspLY"
+//彩虹星球
+//let kBaiduMapAppKey  = "v7wFjrAQdlaBVC50CjwuRESC3Lu0xkhj"
 
 public class BaiduMapManager: NSObject {
     

RainbowPlanet/RainbowPlanet/Manager/PayManager/WeChatpayManager/WeChatpayManager.swift

@@ -8,9 +8,6 @@
 
 import UIKit
 
-//MARK: - 微博
-let kWeiboAppKey  = "4123861024"
-let kWeiboAppSecret  = "79d36bfe6b75638ece14d5d852e785c4"
 
 class WeChatpayManager: NSObject {
     private static let _sharedInstance = WeChatpayManager()

RainbowPlanet/RainbowPlanet/Manager/UMManager/UMManager.swift

@@ -10,16 +10,34 @@ import UIKit
 import SwiftyJSON
 
 //MARK: - UMeng
-let kUMengAppKey  = "5c984a7f0cafb2332300000f"
-let kUMengAppSecret  = "lpx7kstlnlrxmimo5gfyzvtscrtguhw8"
+
+let kUMengAppKey  = "5d4d38ce0cafb2131c00041c"
+let kUMengAppSecret  = "mllaspth0pdgnhdm02uvkppby3isxxex"
+//彩虹星球
+//let kUMengAppKey  = "5c984a7f0cafb2332300000f"
+//let kUMengAppSecret  = "lpx7kstlnlrxmimo5gfyzvtscrtguhw8"
 
 //MARK: - QQ跟安卓用同一个
-let kQQAppKey =  "101565722"
-let kQQAppSecret = "dfe6f96762ed0dbc3ad52dc06d0eda9b"
+
+let kQQAppKey =  "101742987"
+let kQQAppSecret = "664edcf45543f1958b46f914c03b3ed0"
+//彩虹星球
+//let kQQAppKey =  "101565722"
+//let kQQAppSecret = "dfe6f96762ed0dbc3ad52dc06d0eda9b"
 
 //MARK: - 微信
-let kWeiXinAppKey  = "wx163e76382d53654b"
-let kWeiXinAppSecret = "1a915228304ea2e45eda9d2af5a64b84"
+let kWeiXinAppKey  = "wx0aed0c936870ad29"
+let kWeiXinAppSecret = "6be875a7f04d19bdaeec4c0858886ac6"
+//彩虹星球
+//let kWeiXinAppKey  = "wx163e76382d53654b"
+//let kWeiXinAppSecret = "1a915228304ea2e45eda9d2af5a64b84"
+
+//MARK: - 微博
+let kWeiboAppKey  = "1960193914"
+let kWeiboAppSecret  = "ad525c2e9eb07bb0bc43f998295cfe51"
+//彩虹星球
+//let kWeiboAppKey  = "4123861024"
+//let kWeiboAppSecret  = "79d36bfe6b75638ece14d5d852e785c4"
 
 
 public enum ShareType {
@@ -61,6 +79,7 @@ public extension UMManager {
         isNXLLog = true
         //设置Key
         UMConfigure.initWithAppkey(kUMengAppKey, channel: "App Store")
+        
 
         //开启Crash收集
         MobClick.setCrashReportEnabled(true)

RainbowPlanet/RainbowPlanet/Modules/RegisterLoginModule/PasswordLogin/ViewController/PasswordLoginViewController.swift

@@ -39,8 +39,6 @@ class PasswordLoginViewController: BaseViewController {
         passwordLoginView.loginBlock = {
             [weak self] (phoneNumber,password) in
             SwiftMoyaNetWorkServiceUser.shared().userMobileLoginApi(mobile: phoneNumber, password: password, completion: {[weak self] (data) -> (Void) in
-                // 设置友盟别名
-                UMManager.shared.addAlias()
                 RegisterLoginManager.registerLoginSuccessApi(vc: self!)
 
             })

RainbowPlanet/RainbowPlanet/Supporting Files/Info.plist

@@ -29,7 +29,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLName</key>
-			<string>weibo</string>
+			<string>weibochxq</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>wb4123861024</string>
@@ -39,7 +39,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLName</key>
-			<string>tencent</string>
+			<string>tencentchxq</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>tencent101565722</string>
@@ -49,7 +49,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLName</key>
-			<string>QQ</string>
+			<string>QQchxq</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>QQ060dc51a</string>
@@ -59,7 +59,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLName</key>
-			<string>weixin</string>
+			<string>weixinchxq</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
 				<string>wx163e76382d53654b</string>
@@ -75,6 +75,56 @@
 				<string>rainbowplanet</string>
 			</array>
 		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>weibouptoyo</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wb1960193914</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>tencentuptoyo</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>tencent101742987</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>QQuptoyo</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>QQ0610798b</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>weixinuptoyo</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>wx0aed0c936870ad29</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeRole</key>
+			<string>Editor</string>
+			<key>CFBundleURLName</key>
+			<string>uptoyo</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>uptoyo</string>
+			</array>
+		</dict>
 	</array>
 	<key>CFBundleVersion</key>
 	<string>1</string>