react-native-nitro-ali-push 1.0.0 → 1.0.1

package/README.md

@@ -41,58 +41,83 @@ cd ios && pod install
 
 ## iOS 集成
 
-### 1. 引入 CloudPushSDK.framework
+### 1. 引入阿里云推送 SDK（`CloudPushSDK`）
 
-从 [阿里云移动推送控制台](https://push.console.aliyun.com/) 下载 iOS SDK（`CloudPushSDK.framework`），放入工程。
-推荐方式：放到本库 `ios/` 目录下，并在 `react-native-nitro-ali-push.podspec` 中取消注释 `s.vendored_frameworks`，或改为你自己的引入方式。
+**方式一：CocoaPods（默认，推荐）**
 
-### 2. AppDelegate 中初始化
+阿里云推送的 pod 不在 CocoaPods trunk，而在官方自己的 spec 仓库，所以要先在 `ios/Podfile` **顶部**声明 source：
 
-iOS 端的推送初始化必须在原生层完成（不能在 JS 中 `initPush`）：
+```ruby
+source 'https://github.com/aliyun/aliyun-specs.git'
+source 'https://cdn.cocoapods.org/'
+```
 
-```objc
-#import "AppDelegate.h"
-#import <UserNotifications/UserNotifications.h>
-#import <CloudPushSDK/CloudPushSDK.h>
-#import <NitroAliPush/NitroAliPush-Swift.h>
+若本机还没添加过该仓库，先执行一次：
 
-@implementation AppDelegate
+```bash
+pod repo add AliyunRepo https://github.com/aliyun/aliyun-specs.git
+```
 
-- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
-  // ... 其他初始化（RCTBridge 等）...
+本库 podspec 默认已声明 `s.dependency "AlicloudPush", "~> 3"`，因此无需再做其它配置，直接 `pod install` 即可。
 
-  // 初始化阿里云推送
-  [HybridAliPushPlugin.shared setParams:@"<appKey>"
-                             appSecret:@"<appSecret>"
-                          lauchOptions:launchOptions
-         createNotificationCategoryHandler:^{ }];
+**方式二：手动集成**
 
-  return YES;
-}
+从 [阿里云移动推送控制台](https://push.console.aliyun.com/) 下载 iOS SDK，把 `CloudPushSDK.framework`（3.x 为 `CloudPushSDK.xcframework`）放到本库 `ios/` 目录下。
+podspec 检测到该文件后会自动改用 `vendored_frameworks`，不再依赖 `AlicloudPush`，无需修改 podspec。
 
-// 注册 deviceToken
-- (void)application:(UIApplication *)application
-    didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
-  [[HybridAliPushPlugin.shared application:application
-      didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
-}
+> 若 `pod install` 报 `Unable to find a specification for 'AlicloudPush'`，说明 Podfile 里缺少上面的阿里云 source。
 
-- (void)application:(UIApplication *)application
-    didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
-  [[HybridAliPushPlugin.shared application:application
-      didFailToRegisterForRemoteNotificationsWithError:error];
-}
+### 2. AppDelegate 中初始化
 
-// 收到远程通知
-- (void)application:(UIApplication *)application
-    didReceiveRemoteNotification:(NSDictionary *)userInfo
-          fetchCompletionHandler:(void (^)(UIBackgroundFetchResult))completionHandler {
-  [[HybridAliPushPlugin.shared application:application
-                didReceiveRemoteNotification:userInfo
-                      fetchCompletionHandler:completionHandler];
-}
+iOS 端的推送初始化必须在原生层完成（不能在 JS 中 `initPush`）：
 
-@end
+```swift
+import UIKit
+import UserNotifications
+// 本库模块名由 podspec 名 react-native-nitro-ali-push 推导为 react_native_nitro_ali_push。
+// HybridAliPushPlugin 是 public，跨模块使用需 import 本库模块（不在 NitroAliPush）。
+import react_native_nitro_ali_push
+
+@main
+class AppDelegate: UIResponder, UIApplicationDelegate {
+
+  func application(_ application: UIApplication,
+                   didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
+    // ... 其他初始化（RCTBridge 等）...
+
+    // 初始化阿里云推送
+    HybridAliPushPlugin.shared().setParams(
+      "<appKey>",
+      appSecret: "<appSecret>",
+      lauchOptions: launchOptions as? [AnyHashable: Any],
+      createNotificationCategoryHandler: {}
+    )
+
+    return true
+  }
+
+  // 注册 deviceToken
+  func application(_ application: UIApplication,
+                  didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+    HybridAliPushPlugin.shared().application(application,
+      didRegisterForRemoteNotificationsWithDeviceToken: deviceToken)
+  }
+
+  func application(_ application: UIApplication,
+                  didFailToRegisterForRemoteNotificationsWithError error: Error) {
+    HybridAliPushPlugin.shared().application(application,
+      didFailToRegisterForRemoteNotificationsWithError: error)
+  }
+
+  // 收到远程通知
+  func application(_ application: UIApplication,
+                  didReceiveRemoteNotification userInfo: [AnyHashable: Any],
+                  fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
+    HybridAliPushPlugin.shared().application(application,
+      didReceiveRemoteNotification: userInfo,
+      fetchCompletionHandler: completionHandler)
+  }
+}
 ```
 
 > 若 CocoaPods 编译时提示找不到 `React` / `CloudPushSDK` 模块，请在 Podfile 中开启 `use_frameworks!` 或 `use_modular_headers!`。

package/ios/HybridAliPushPlugin.swift

@@ -25,8 +25,11 @@ private func DLog(_ message: String, file: String = #file, line: UInt = #line) {
  * iOS 端的推送初始化必须在原生层完成（AppDelegate 调用 `shared.setParams`），而不是
  * 从 JS 调用 `initPush`（该方法在 iOS 上为无操作）。
  */
+/// 必须 `public`：本库作为 pod 是独立模块，App 的 Swift/ObjC 需要引用它。
+/// 仅 `internal` 时不会写进 `<react_native_nitro_ali_push-Swift.h>`，App 端编译报
+/// "Use of undeclared identifier 'HybridAliPushPlugin'"。`@objc` 运行时名保持不变。
 @objc(HybridAliPushPlugin)
-class HybridAliPushPlugin: HybridAliPushPluginSpec, UNUserNotificationCenterDelegate {
+public final class HybridAliPushPlugin: HybridAliPushPluginSpec, UNUserNotificationCenterDelegate {
   /// 由 AppDelegate 创建的权威实例（持有 UNUserNotificationCenter 代理与 CloudPushSDK 回调）。
   private static var sharedInstance: HybridAliPushPlugin?
   /// JS 注册的监听器（静态池，AppDelegate 实例与 JS 实例共享）。
@@ -36,7 +39,7 @@ class HybridAliPushPlugin: HybridAliPushPluginSpec, UNUserNotificationCenterDele
 
   // MARK: - 单例（供 AppDelegate 使用）
 
-  @objc static func shared() -> HybridAliPushPlugin {
+  @objc public static func shared() -> HybridAliPushPlugin {
     if let instance = sharedInstance { return instance }
     let instance = HybridAliPushPlugin()
     sharedInstance = instance
@@ -51,7 +54,7 @@ class HybridAliPushPlugin: HybridAliPushPluginSpec, UNUserNotificationCenterDele
 
   // MARK: - 由原生 AppDelegate 调用完成 iOS 端推送初始化（不应从 JS 调用）
 
-  @objc func setParams(_ appKey: String,
+  @objc public func setParams(_ appKey: String,
                        appSecret: String,
                        lauchOptions: [AnyHashable: Any]?,
                        createNotificationCategoryHandler: @escaping () -> Void) {
@@ -95,7 +98,7 @@ class HybridAliPushPlugin: HybridAliPushPluginSpec, UNUserNotificationCenterDele
 
   // MARK: - AppDelegate 转发方法
 
-  @objc func application(_ application: UIApplication,
+  @objc public func application(_ application: UIApplication,
                           didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
     CloudPushSDK.registerDevice(deviceToken) { res in
       if res?.success ?? false {
@@ -106,12 +109,12 @@ class HybridAliPushPlugin: HybridAliPushPluginSpec, UNUserNotificationCenterDele
     }
   }
 
-  @objc func application(_ application: UIApplication,
+  @objc public func application(_ application: UIApplication,
                           didFailToRegisterForRemoteNotificationsWithError error: Error) {
     DLog("Get deviceToken failed, error: \(error.localizedDescription)")
   }
 
-  @objc func application(_ application: UIApplication,
+  @objc public func application(_ application: UIApplication,
                           didReceiveRemoteNotification userInfo: [AnyHashable: Any],
                           fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
     CloudPushSDK.sendNotificationAck(userInfo)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-ali-push",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "React Native wrapper for Alibaba Cloud Push (阿里云移动推送), built with Nitro Modules (swift/kotlin HybridObject).",
   "main": "lib/index.js",
   "module": "lib/index.js",

package/react-native-nitro-ali-push.podspec

@@ -21,9 +21,21 @@ Pod::Spec.new do |s|
   load 'nitrogen/generated/ios/NitroAliPush+autolinking.rb'
   add_nitrogen_files(s)
 
-  # 阿里云推送 SDK（CloudPushSDK.framework）。
-  # 推荐方式：放到本库 ios/ 目录下，并取消下面注释；或改为你自己的引入方式。
-  # s.vendored_frameworks = 'ios/CloudPushSDK.framework'
+  # 阿里云推送 SDK（CloudPushSDK）。
+  #
+  # 默认：走官方 CocoaPods 源 `AlicloudPush`。它不在 CocoaPods trunk，而是阿里云自己的
+  # spec 仓库，因此使用方必须在 Podfile 中声明该 source（见 README「iOS 集成」）：
+  #   source 'https://github.com/aliyun/aliyun-specs.git'
+  #   source 'https://cdn.cocoapods.org/'
+  #
+  # 手动集成：把 CloudPushSDK.framework（或 CloudPushSDK.xcframework）放到本库 ios/ 目录，
+  # 这里会自动改为 vendored 方式，不再依赖 AlicloudPush，两者不会同时引入。
+  vendored = Dir.glob(File.join(__dir__, "ios", "CloudPushSDK.{framework,xcframework}"))
+  if vendored.empty?
+    s.dependency "AlicloudPush", "~> 3"
+  else
+    s.vendored_frameworks = vendored.map { |p| "ios/#{File.basename(p)}" }
+  end
 
   s.dependency "React-Core"
 end