处理分享判断

20181011/SDK.ts

@@ -560,28 +560,48 @@ class WechatSDK {
         });
     }
     private async share(DATA): Promise<any> {
-        const that = this
+        const _selt = this
+        return new Promise(async (resolve, reject) => {
+            try {
+                let sharePromise = await _selt._share(DATA);
+                if(sharePromise) {
+                    resolve(sharePromise)
+                }
+                else if (this.ReportParams.SDKVersion >= '2.3') {  //10月10号开始2.3和以上版本用户取消share回调
+                    resolve(-1)
+                }
+                else {
+                    reject(sharePromise)
+                    console.log("@@SDK分享错误", sharePromise)
+                }
+            } catch (err) {
+                reject(err)
+            }
+        })
+    }
+    private _share(DATA) {
+        const _selt = this;
         return new Promise((resolve, reject) => {
             try {
-                (wx as any).shareAppMessage(that.deepCopy(DATA, {
+                (wx as any).shareAppMessage(_selt.deepCopy(DATA, {
                     withShareTicket: true,
                     success: res => {
-                        resolve(res)
+                        resolve(1)
                     },
                     fail: res => {
-                        reject(res)
+                        resolve(-1)
                     },
                     complete() {
-                        console.log("##SDK分享发起")
                         resolve(0);
                     }
                 }))
-                if (this.ReportParams.SDKVersion >= '2.3') {  //10月10号开始2.3和以上版本用户取消share回调
-                    resolve(-1)
-                }
+                setTimeout(function(){  // 两秒后直接当分享成功返回，避免回调取消引起await问题
+                    resolve(2)
+                }, 5000)
             } catch (err) {
-                reject(err)
+                resolve(err)
             }
+
         })
     }
     private shareInit() {