@dcloudio/uni-push 3.0.0-alpha-3050420220804008 → 3.0.0-alpha-3060020220830001

package/dist/uni-push.es.js

@@ -103,21 +103,35 @@ var GtPush = /*@__PURE__*/getDefaultExportFromCjs(gtpushMin);
 function initPushNotification() {
     // 仅 App 端
     if (typeof plus !== 'undefined' && plus.push) {
-        plus.push.addEventListener('click', (result) => {
-            // @ts-expect-error
-            uni.invokePushCallback({
-                type: 'click',
-                message: result,
-            });
-        });
-        uni.onPushMessage((res) => {
-            if (res.type === 'receive' &&
-                res.data &&
-                res.data.force_notification) {
-                // 创建通知栏
-                uni.createPushMessage(res.data);
-                res.stopped = true;
+        plus.globalEvent.addEventListener('newPath', ({ path }) => {
+            if (!path) {
+                return;
             }
+            // 指定的页面为当前页面
+            const pages = getCurrentPages();
+            const currentPage = pages[pages.length - 1];
+            if (currentPage &&
+                currentPage.$page &&
+                currentPage.$page.fullPath === path) {
+                return;
+            }
+            // 简单起见，先尝试 navigateTo 跳转，失败后，再尝试 tabBar 跳转
+            uni.navigateTo({
+                url: path,
+                fail(res) {
+                    if (res.errMsg.indexOf('tabbar') > -1) {
+                        uni.switchTab({
+                            url: path,
+                            fail(res) {
+                                console.error(res.errMsg);
+                            },
+                        });
+                    }
+                    else {
+                        console.error(res.errMsg);
+                    }
+                },
+            });
         });
     }
 }
@@ -141,7 +155,9 @@ if (!appid) {
     });
 }
 else {
+    // #ifdef APP
     initPushNotification();
+    // #endif
     GtPush.init({
         appid,
         onError: (res) => {
@@ -175,4 +191,16 @@ else {
             });
         },
     });
+    // 仅在 jssdk 中监听
+    // #ifdef APP
+    uni.onPushMessage((res) => {
+        if (res.type === 'receive' &&
+            res.data &&
+            res.data.force_notification) {
+            // 创建通知栏
+            uni.createPushMessage(res.data);
+            res.stopped = true;
+        }
+    });
+    // #endif
 }

package/dist/uni-push.plus.es.js

@@ -1,22 +1,45 @@
+function initPushNotification() {
+    // 仅 App 端
+    if (typeof plus !== 'undefined' && plus.push) {
+        plus.globalEvent.addEventListener('newPath', ({ path }) => {
+            if (!path) {
+                return;
+            }
+            // 指定的页面为当前页面
+            const pages = getCurrentPages();
+            const currentPage = pages[pages.length - 1];
+            if (currentPage &&
+                currentPage.$page &&
+                currentPage.$page.fullPath === path) {
+                return;
+            }
+            // 简单起见，先尝试 navigateTo 跳转，失败后，再尝试 tabBar 跳转
+            uni.navigateTo({
+                url: path,
+                fail(res) {
+                    if (res.errMsg.indexOf('tabbar') > -1) {
+                        uni.switchTab({
+                            url: path,
+                            fail(res) {
+                                console.error(res.errMsg);
+                            },
+                        });
+                    }
+                    else {
+                        console.error(res.errMsg);
+                    }
+                },
+            });
+        });
+    }
+}
+
 // @ts-expect-error
 uni.invokePushCallback({
     type: 'enabled',
     offline: true,
 });
 Promise.resolve().then(() => {
+    initPushNotification();
     plus.push.setAutoNotification && plus.push.setAutoNotification(false);
-    plus.push.addEventListener('click', (result) => {
-        // @ts-expect-error
-        uni.invokePushCallback({
-            type: 'click',
-            message: result,
-        });
-    });
-    plus.push.addEventListener('receive', (result) => {
-        // @ts-expect-error
-        uni.invokePushCallback({
-            type: 'pushMsg',
-            message: result,
-        });
-    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-push",
-  "version": "3.0.0-alpha-3050420220804008",
+  "version": "3.0.0-alpha-3060020220830001",
   "description": "@dcloudio/uni-push",
   "main": "lib/uni-push.js",
   "module": "lib/uni-push.js",
@@ -20,6 +20,6 @@
   },
   "gitHead": "33e807d66e1fe47e2ee08ad9c59247e37b8884da",
   "dependencies": {
-    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3050420220804008"
+    "@dcloudio/uni-cli-shared": "3.0.0-alpha-3060020220830001"
   }
 }