From 61a2e8ac8900ec4166747d48ded25b708014c8f9 Mon Sep 17 00:00:00 2001
From: linju <linju@dcloud.io>
Date: Thu, 21 Nov 2024 16:05:30 +0800
Subject: [PATCH] =?UTF-8?q?update=20uni-push=E8=A1=A5=E5=85=85sendPushMess?=
 =?UTF-8?q?age=E3=80=81sendPushMessage=E3=80=81offPushMessage=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/API/uni-push/uni-push.uvue              | 153 ++++++++++++++----
 .../cloudfunctions/uni-push-co/index.obj.js   |  21 +++
 .../cloudfunctions/uni-push-co/package.json   |   8 +
 3 files changed, 147 insertions(+), 35 deletions(-)
 create mode 100644 uniCloud-aliyun/cloudfunctions/uni-push-co/index.obj.js
 create mode 100644 uniCloud-aliyun/cloudfunctions/uni-push-co/package.json

diff --git a/pages/API/uni-push/uni-push.uvue b/pages/API/uni-push/uni-push.uvue
index 1fa0420f..ecb76452 100644
--- a/pages/API/uni-push/uni-push.uvue
+++ b/pages/API/uni-push/uni-push.uvue
@@ -27,9 +27,18 @@
     <button class="normal-button" type="default" @click="handleCleanBadge">
       清空角标 | setAppBadgeNumber(0)
     </button>
-    <!-- #endif -->
+    <!-- #endif -->
+    <button class="normal-button" type="default" @click="handleSendPushMessage">
+      发送通知消息 | sendPushMessage
+    </button>
     <button class="normal-button uni-common-mb" type="default" @click="handleGetClientId">
       获取cid | getPushClientId
+    </button>
+    <button class="normal-button" type="default" @click="handleOnPushMessage">
+      注册回调 | onPushMessage
+    </button>
+    <button class="normal-button" type="default" @click="handleOffPushMessage">
+      注销回调 | offPushMessage
     </button>
   </view>
   <!-- #ifdef APP -->
@@ -39,15 +48,44 @@
 
 <script setup>
   const channelInfo = ref("")
-
-  onMounted(() => {
-    uni.onPushMessage((res : OnPushMessageCallbackResult) => {
-      uni.showModal({
-        title: "onPushMessage回调信息",
-        content: `type：${res.type} \n data：${JSON.stringify(res.data)}`
-      })
+
+  const onPushMessageCallback = (res : OnPushMessageCallbackResult) => {
+    uni.showModal({
+      title: "onPushMessage回调信息",
+      content: `type：${res.type} \n data：${JSON.stringify(res.data)}`
     })
-  })
+  }
+
+  let isRegister = false
+  const handleOnPushMessage = () => {
+    if (isRegister) {
+      uni.showToast({
+        icon: "error",
+        title: "无需重复注册"
+      })
+      return
+    }
+    uni.onPushMessage(onPushMessageCallback)
+    isRegister = true
+    uni.showToast({
+      title: "成功注册"
+    })
+  }
+
+  const handleOffPushMessage = () => {
+    if (!isRegister) {
+      uni.showToast({
+        icon: "error",
+        title: "未注册, 无需注销"
+      })
+      return
+    }
+    uni.offPushMessage(onPushMessageCallback)
+    isRegister = false
+    uni.showToast({
+      title: "成功注销"
+    })
+  }
 
   const handleCreateChannel = (showToast : boolean) => {
     // #ifdef APP-ANDROID
@@ -120,32 +158,77 @@
         icon: "error"
       })
     }
-  }
-  const handleGetClientId = () => {
-    uni.showLoading({
-      title: "正在获取cid",
-    })
-    uni.getPushClientId({
-      success: (res : GetPushClientIdSuccess) => {
-        uni.hideLoading()
-        uni.showModal({
-          title: "信息",
-          content: `cid : ${res.cid}`
-        })
-      },
-      fail: (err) => {
-        if (err.message.includes('uniPush is not enabled')) {
-            console.error('请先开通uni-push，详见文档：https://uniapp.dcloud.net.cn/unipush-v2.html#%E7%AC%AC%E4%B8%80%E6%AD%A5-%E5%BC%80%E9%80%9A');
-        } else {
-            console.error(err);
-        }
-        uni.hideLoading()
-        uni.showToast({
-          title: `获取cid失败`,
-          icon: "error"
-        })
-      }
-    })
+  }
+
+  async function getPushClientId(): Promise<string>{
+    let pushClientId = '';
+    let res:void = await new Promise(resolve => {
+      uni.getPushClientId({
+        success: (res: GetPushClientIdSuccess) => {
+          console.log(res.cid)
+          pushClientId = res.cid
+          resolve()
+        },
+        fail: (err: GetPushClientIdFail) => {
+          resolve()
+          console.error(err);
+          if (err.message.includes('uniPush is not enabled')) {
+            uni.showModal({
+              title: '获取cid失败',
+              content: '当前项目未启用uni-push，检查manifest.json中的uni-push配置',
+              showCancel: false
+            });
+          } else if (err.message.includes('getPushClientId:fail register fail: {\"errorCode\":1,\"errorMsg\":\"\"}')) {
+            uni.showModal({
+              title: '获取cid失败',
+              content: '当前项目未开通uni-push，开通文档：https://uniapp.dcloud.net.cn/unipush-v2.html#%E7%AC%AC%E4%B8%80%E6%AD%A5-%E5%BC%80%E9%80%9A',
+              showCancel: false
+            });
+          } else {
+            uni.showToast({
+              title: `获取cid失败`,
+              icon: "error"
+            })
+          }
+        }
+      })
+    })
+    return pushClientId
+  }
+
+  const handleGetClientId = async():Promise<void> =>{
+    uni.showLoading({
+      title: "正在获取cid",
+    })
+    const cid = await getPushClientId()
+    if (cid != '') {
+      uni.showModal({
+        title: "获取cid",
+        content: "获取cid成功" + cid,
+        showCancel: false
+      })
+    }
+    uni.hideLoading()
+  }
+  const handleSendPushMessage = async():Promise<void>=> {
+    const pushClientId = await getPushClientId()
+    if (pushClientId == ''){
+      return
+    }
+    const uniPushCo = uniCloud.importObject("uni-push-co")
+    try {
+      await uniPushCo.sendPushMessage(pushClientId)
+      uni.showToast({
+        title: "发送通知消息成功"
+      })
+    } catch (e) {
+      console.error(e);
+      // console.error(e["errorCode"] as Number );
+      uni.showToast({
+        title: "发送通知消息失败",
+        icon: "error"
+      })
+    }
   }
   const handleSetBadge = () => {
     if (uni.getDeviceInfo().deviceBrand?.toLowerCase() == "xiaomi") {
diff --git a/uniCloud-aliyun/cloudfunctions/uni-push-co/index.obj.js b/uniCloud-aliyun/cloudfunctions/uni-push-co/index.obj.js
new file mode 100644
index 00000000..92e63f44
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/uni-push-co/index.obj.js
@@ -0,0 +1,21 @@
+module.exports = {
+	async sendPushMessage(cid) {
+    // 防止非法调用
+    if (!cid) {
+      throw new Error('请传入推送客户端ID')
+    }
+    if (typeof cid !== 'string') {
+      throw new Error('推送客户端ID必须为字符串')
+    }
+    const pushManager = uniCloud.getPushManager({appId: '__UNI__HelloUniAppX'})
+    const res = await pushManager.sendMessage({
+      push_clientid: cid,
+      title: '测试推送标题',
+      content: '测试推送内容',
+      payload: {
+        data: '测试推送数据'
+      }
+    })
+    return res
+  }
+}
diff --git a/uniCloud-aliyun/cloudfunctions/uni-push-co/package.json b/uniCloud-aliyun/cloudfunctions/uni-push-co/package.json
new file mode 100644
index 00000000..776f226b
--- /dev/null
+++ b/uniCloud-aliyun/cloudfunctions/uni-push-co/package.json
@@ -0,0 +1,8 @@
+{
+  "name": "uni-push-co",
+  "dependencies": {},
+  "extensions": {
+    "uni-cloud-jql": {},
+    "uni-cloud-push": {}
+  }
+}
\ No newline at end of file
-- 
GitLab