ソースを参照

推送优化,没有打开App 跳转到指定的页面

南鑫林 5 年 前
コミット
2f89ecfe56

+ 8 - 8
RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -149,7 +149,6 @@
 		A741449D232F24F60062FB6F /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A72A72EF22321E8800B21995 /* CoreMotion.framework */; };
 		A741449F232F24F70062FB6F /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A72A72F722321EB600B21995 /* CoreGraphics.framework */; };
 		A74144A1232F24F90062FB6F /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A72A72F122321E9300B21995 /* CFNetwork.framework */; };
-		A74144A3232F24FB0062FB6F /* ATAuthSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A7F577C022FD894F00E2D757 /* ATAuthSDK.framework */; };
 		A74144A7232F28370062FB6F /* PublishConfirmPhotoNewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74144A6232F28370062FB6F /* PublishConfirmPhotoNewViewController.swift */; };
 		A74144A9232F8BF40062FB6F /* PublishNewVideoPhotoSetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74144A8232F8BF40062FB6F /* PublishNewVideoPhotoSetView.swift */; };
 		A74144AC23306EA90062FB6F /* RongCloudIMManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A74144AB23306EA90062FB6F /* RongCloudIMManager.swift */; };
@@ -442,10 +441,11 @@
 		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 */; };
-		A7F577C422FD894F00E2D757 /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A7F577C122FD894F00E2D757 /* ATAuthSDK.bundle */; };
 		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 */; };
@@ -1120,11 +1120,11 @@
 		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>"; };
 		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>"; };
 		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>"; };
@@ -1373,7 +1373,7 @@
 				A741449B232F24F40062FB6F /* CoreTelephony.framework in Frameworks */,
 				A7414493232F24ED0062FB6F /* QuartzCore.framework in Frameworks */,
 				A7414499232F24F30062FB6F /* CoreText.framework in Frameworks */,
-				A74144A3232F24FB0062FB6F /* ATAuthSDK.framework in Frameworks */,
+				A7F89400233E246B00A16253 /* ATAuthSDK.framework in Frameworks */,
 				A741448F232F24EA0062FB6F /* UIKit.framework in Frameworks */,
 				A7414497232F24F10062FB6F /* Foundation.framework in Frameworks */,
 				A741448C232F24E80062FB6F /* UserNotifications.framework in Frameworks */,
@@ -2493,8 +2493,8 @@
 		A763BE6F22F1B3D3000CE594 /* ATAuthSDK */ = {
 			isa = PBXGroup;
 			children = (
-				A7F577C022FD894F00E2D757 /* ATAuthSDK.framework */,
-				A7F577C122FD894F00E2D757 /* ATAuthSDK.bundle */,
+				A7F89401233E252500A16253 /* ATAuthSDK.bundle */,
+				A7F893FF233E246B00A16253 /* ATAuthSDK.framework */,
 			);
 			path = ATAuthSDK;
 			sourceTree = "<group>";
@@ -5335,7 +5335,6 @@
 				BD108C9B22A60C3300837DAB /* HGImage.storyboard in Resources */,
 				A7464B752338B2C6003CE3A0 /* CommunityModule.xcassets in Resources */,
 				A7FF1577228C824300A85748 /* OrderModule.xcassets in Resources */,
-				A7F577C422FD894F00E2D757 /* ATAuthSDK.bundle in Resources */,
 				A72E684F22F2BBB30063D967 /* login_video.mp4 in Resources */,
 				BD4B50AC22BC7DEA0073B516 /* FilterResource.bundle in Resources */,
 				A76068EB22E49BC1008DF18F /* collect.json in Resources */,
@@ -5345,6 +5344,7 @@
 				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 */,
 			);

+ 1 - 1
RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift

@@ -18,7 +18,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         //初始化窗口
         initWindow(didFinishLaunchingWithOptions: launchOptions)
-        
+
         return true
     }
     

+ 1 - 0
RainbowPlanet/RainbowPlanet/Manager/ATAuthSDKManager/ATAuthSDKManager.swift

@@ -14,6 +14,7 @@ class ATAuthSDKManager: NSObject {
 
     /// 手机一键登录
     class func oneBuiltLogin(vc:UIViewController?) {
+        
         TXCommonHandler.sharedInstance().checkAsyncGatewayVerifyEnable(nil) {[weak vc] (enable) in
             DispatchQueue.main.async {
                 [weak vc] in

+ 16 - 0
RainbowPlanet/RainbowPlanet/Manager/UMManager/UMManager.swift

@@ -150,6 +150,9 @@ public extension UMManager {
 
             }
         }
+        
+        // 启动接受通知跳转到指定页面
+        receiveRemoteNotification(launchOptions: launchOptions)
     }
     
     /// 添加别名
@@ -204,6 +207,19 @@ extension UMManager:UNUserNotificationCenterDelegate {
             //应用处于后台时的本地推送接受
         }
     }
+    
+    
+    /// 启动跳转到指定页面
+    func receiveRemoteNotification(launchOptions:[UIApplication.LaunchOptionsKey: Any]?) {
+        let userInfo = launchOptions?[UIApplication.LaunchOptionsKey.remoteNotification] as? [AnyHashable : Any]
+        if userInfo != nil {
+            UMessage.setAutoAlert(false)
+            let json = JSON(userInfo as Any)
+            RouterManager.shared.UMPush(pushModel: PushModel(JSONString: json.description) ?? PushModel())
+            //必须加这句代码
+            UMessage.didReceiveRemoteNotification(userInfo)
+        }
+    }
 }
 
 

+ 1 - 0
RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -45,6 +45,7 @@ class CommunityViewController: BaseViewController {
         super.viewWillAppear(animated)
         self.view.frame = CGRect(x: 0, y: 0, width: kScreenWidth, height: kScreenHeight-kTabBarTotalHeight)
         self.view.layoutIfNeeded()
+        
     }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)

+ 3 - 3
RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceManger/SwiftMoyaNetWorkManager/ApiMacro.swift

@@ -11,13 +11,13 @@ import Foundation
 /// Service
 let kPersonalService = false
 let kDevelopSever = false
-let kBetaSever = false
-let kProductSever = true
+let kBetaSever = true
+let kProductSever = false
 
 /// H5Service
 let kH5PersonalService = false
 let kH5DevelopSever = false
-let kH5BetaSever = false
+let kH5BetaSever = true
 let kH5ProductSever = true
 
 // MARK: - 数据服务器