From 5b9c619fd0f57e1ce7286714645b5be02235aa9c Mon Sep 17 00:00:00 2001
From: fxy060608 <fxy060608@gmail.com>
Date: Thu, 26 May 2022 12:39:27 +0800
Subject: [PATCH] feat(push): plus.push.setAutoNotification

---
 .../uni-push/dist/uni-push.plus.es.js         |  1 +
 src/core/service/api/plugin/push.js           | 23 ++++---------------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js b/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js
index 95d1b3b79..c321f73f9 100644
--- a/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js
+++ b/packages/vue-cli-plugin-uni/packages/uni-push/dist/uni-push.plus.es.js
@@ -1,4 +1,5 @@
 Promise.resolve().then(() => {
+    plus.push.setAutoNotification && plus.push.setAutoNotification(false);
     const info = plus.push.getClientInfo();
     if (info.clientid) {
         // @ts-expect-error
diff --git a/src/core/service/api/plugin/push.js b/src/core/service/api/plugin/push.js
index 8a0c1dff2..ab05ed057 100644
--- a/src/core/service/api/plugin/push.js
+++ b/src/core/service/api/plugin/push.js
@@ -9,24 +9,9 @@ import {
 let cid
 let cidErrMsg
 
-function normalizePushMessage (type, message) {
+function normalizePushMessage (message) {
   try {
-    const res = JSON.parse(message)
-    if (type === 'receive') {
-      if (res.payload) {
-        if (res.aps) {
-          res.payload.aps = res.aps
-        }
-        return res.payload
-      }
-    } else if (type === 'click') {
-      delete res.type
-      delete res.__UUID__
-      delete res.appid
-      if (res.aps && res.aps.alert) {
-        res.title = res.aps.alert.title
-      }
-    }
+    return JSON.parse(message)
   } catch (e) {}
   return message
 }
@@ -42,14 +27,14 @@ export function invokePushCallback (
     onPushMessageCallbacks.forEach((callback) => {
       callback({
         type: 'receive',
-        data: normalizePushMessage('receive', args.message)
+        data: normalizePushMessage(args.message)
       })
     })
   } else if (args.type === 'click') {
     onPushMessageCallbacks.forEach((callback) => {
       callback({
         type: 'click',
-        data: normalizePushMessage('click', args.message)
+        data: normalizePushMessage(args.message)
       })
     })
   }
-- 
GitLab