getDeviceId()接口变更为Promise模式

wonday · May 29, 2018 · ab25d84 · ab25d84
1 parent a504938
commit ab25d84
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,30 @@
 
 ### 修改履历
 
+v1.0.12
+1. getDeviceId()逻辑处理变更为一次取得失败后延迟三秒再次获取
+2. ```重要变更```getDeviceId()接口变更为Promise模式，使用旧版本需要升级代码。
+
+
+**v1.0.11及以前代码用法:**
+```
+AliyunPush.getDeviceId((deviceId)=>{
+    console.log("AliyunPush DeviceId:" + deviceId);
+});
+```
+
+**v1.0.12及以后代码用法:**
+```
+AliyunPush.getDeviceId()
+    .then((deviceId)=>{
+        //console.log("deviceId:"+deviceId);
+    })
+    .catch((error)=>{
+        console.log("getDeviceId() failed");
+    });
+```
+
+
 v1.0.11
 
 1. 增加角标同步功能syncBadgeNum()（仅iOS支持）
@@ -290,9 +314,13 @@ handleAliyunPushMessage = (e) => {
 
 示例:
 ```
-AliyunPush.getDeviceId((deviceId)=>{
-    console.log("AliyunPush DeviceId:" + deviceId);
-});
+AliyunPush.getDeviceId()
+    .then((deviceId)=>{
+        //console.log("deviceId:"+deviceId);
+    })
+    .catch((error)=>{
+        console.log("getDeviceId() failed");
+    });
 ```
 **绑定账号**
 

diff --git a/android/src/main/java/org/wonday/aliyun/push/AliyunPushModule.java b/android/src/main/java/org/wonday/aliyun/push/AliyunPushModule.java
@@ -65,8 +65,26 @@ public String getName() {
     }
 
     @ReactMethod
-    public void getDeviceId(Callback callback) {
-        callback.invoke(PushServiceFactory.getCloudPushService().getDeviceId());
+    public void getDeviceId(final Promise promise) {
+        String deviceID = PushServiceFactory.getCloudPushService().getDeviceId();
+        if (deviceID!=null && deviceID.length()>0) {
+            promise.resolve(deviceID);
+        } else {
+            // 或许还没有初始化完成，等3秒钟再次尝试
+            try{
+                Thread.sleep(3000);
+                deviceID = PushServiceFactory.getCloudPushService().getDeviceId();
+
+                if (deviceID!=null && deviceID.length()>0) {
+                    promise.resolve(deviceID);
+                    return;
+                }
+            } catch (Exception e) {
+
+            }
+
+            promise.reject("getDeviceId() failed.");
+        }
     }
 
     @ReactMethod

diff --git a/index.js b/index.js
@@ -39,10 +39,8 @@ function getKey(listener,type){
 
 export default class AliyunPush {
 
-    static getDeviceId = (callback) => {
-        AliyunPushNative.getDeviceId(function(args) {
-            callback(args);
-        });
+    static getDeviceId = () => {
+        return AliyunPushNative.getDeviceId();
     }
 
     static getApplicationIconBadgeNumber = (callback) => {

diff --git a/ios/RCTAliyunPush/AliyunPushManager.m b/ios/RCTAliyunPush/AliyunPushManager.m
@@ -128,10 +128,24 @@ + (AliyunPushManager *)sharedInstance
 /**
  * Get the aliyun push device id
  */
-RCT_EXPORT_METHOD(getDeviceId:(RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(getDeviceId:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 {
     NSString *deviceId = [CloudPushSDK getDeviceId];
-    callback(@[deviceId]);
+    if (deviceId!=Nil) {
+        resolve(deviceId);
+    } else {
+        // 或许还没有初始化完成，等3秒钟再次尝试
+        [NSThread sleepForTimeInterval:3.0f];
+
+        deviceId = [CloudPushSDK getDeviceId];
+        if (deviceId!=Nil) {
+            resolve(deviceId);
+        } else {
+            reject([NSString stringWithFormat:@"getDeviceId() failed."], nil, RCTErrorWithMessage(@"getDeviceId() failed."));
+        }
+
+    }
 }
 
 /**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-aliyun-push",
-    "version": "1.0.11",
+    "version": "1.0.12",
     "description": "A react native wrapper for aliyun push SDK",
     "main": "index.js",
     "repository": {