重构app: 修复iOS通知

Strides-APP/ios/Strides.xcodeproj/project.pbxproj

@@ -34,13 +34,6 @@
 			remoteGlobalIDString = 0CEDE9F988A667E9E55A853581258D15;
 			remoteInfo = RNI18n;
 		};
-		25C62D882A5563B10008A89E /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = 8CC9178C366942FD6FF6A115604EAD58;
-			remoteInfo = FirebaseCoreDiagnostics;
-		};
 		25C7FBB12AA706B500F61AA1 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 3862FE5D2668D3C90097D3A3 /* Pods.xcodeproj */;
@@ -692,7 +685,6 @@
 				25C7FBB22AA706B500F61AA1 /* CocoaAsyncSocket */,
 				3862FE992668D3C90097D3A3 /* DoubleConversion */,
 				3806701926DF20DA00271DFA /* FirebaseCore */,
-				25C62D892A5563B10008A89E /* FirebaseCoreDiagnostics */,
 				732F2CF7296FA69A00A90ECF /* FirebaseCoreInternal */,
 				3806701D26DF20DA00271DFA /* FirebaseInstallations */,
 				3806701F26DF20DA00271DFA /* FirebaseMessaging */,
@@ -913,14 +905,6 @@
 			remoteRef = 25450AEF2A554B630078250E /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
-		25C62D892A5563B10008A89E /* FirebaseCoreDiagnostics */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			name = FirebaseCoreDiagnostics;
-			path = libFirebaseCoreDiagnostics.a;
-			remoteRef = 25C62D882A5563B10008A89E /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
 		25C7FBB22AA706B500F61AA1 /* CocoaAsyncSocket */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1852,6 +1836,10 @@
 					"-DREACT_NATIVE_MINOR_VERSION=64",
 					"-DREANIMATED_VERSION=2.14.4",
 				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(inherited)",
+					"-fcxx-modules",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1899,6 +1887,10 @@
 					"-DREACT_NATIVE_MINOR_VERSION=64",
 					"-DREANIMATED_VERSION=2.14.4",
 				);
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(inherited)",
+					"-fcxx-modules",
+				);
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

Strides-APP/ios/Strides/AppDelegate.mm

@@ -28,8 +28,8 @@ static void InitializeFlipper(UIApplication *application) {
 #endif
 
 @import UserNotifications;
-@import FirebaseCore;
-@import FirebaseMessaging;
+#import "FirebaseCore.h"
+#import "FirebaseMessaging.h"
 
 @interface AppDelegate () <UNUserNotificationCenterDelegate>
 
@@ -74,16 +74,16 @@ static void InitializeFlipper(UIApplication *application) {
 }
 
 - (void) messaging:(FIRMessaging *)messaging didReceiveRegistrationToken:(NSString *)fcmToken {
-  //NSLog(@"FCM registration token: %@", fcmToken);
+  // NSLog(@"FCM registration token: %@", fcmToken);
   // Notify about received token.
   NSDictionary *dataDict = [NSDictionary dictionaryWithObject:fcmToken forKey:@"token"];
   [[NSNotificationCenter defaultCenter] postNotificationName:
     @"FCMToken" object:nil userInfo:dataDict];
   // TODO: 如有必要，将令牌发送到应用程序服务器。
   //注意：每次应用程序启动时以及每当生成新令牌时，都会触发此回调。
-  //NSData *deviceToken = [fcmToken dataUsingEncoding:NSUTF8StringEncoding];
+  NSData *deviceToken = [fcmToken dataUsingEncoding:NSUTF8StringEncoding];
   //或者，您也可以监听名为 kFIRMessagingRegistrationTokenRefreshNotification 的 NSNotification，而不提供委托方法。该令牌属性始终具有当前令牌值。
-  //[RNCPushNotificationIOS didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
+  [RNCPushNotificationIOS didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
 }
 
 //- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
@@ -93,7 +93,7 @@ static void InitializeFlipper(UIApplication *application) {
 //Required for the register event.
 - (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
 {
-  // NSLog(@"APNs registration token: %@", hexString);
+  // NSLog(@"APNs registration token: %@", deviceToken);
   if ([FIRMessaging messaging].FCMToken != nil) {
     [FIRMessaging messaging].APNSToken = deviceToken;
     //NSLog(@"FIRMessaging token: %@", [FIRMessaging messaging].FCMToken);