From cf3bed37a38741714fc614870dce8f9e966d3bcf Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 1 Jan 2025 23:40:31 +0800
Subject: [PATCH] md

---
 src/layout/components/TopNotice/index.vue | 21 +++++++++++++--------
 src/utils/XDNoticeSdk.js                  | 19 +++++++++++++++++--
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/layout/components/TopNotice/index.vue b/src/layout/components/TopNotice/index.vue
index a164bac9..d0f41064 100644
--- a/src/layout/components/TopNotice/index.vue
+++ b/src/layout/components/TopNotice/index.vue
@@ -76,7 +76,9 @@
 <script>
 
 import {Notification} from "element-ui";
-import Speech from 'speak-tts'
+import { getToken } from "@/utils/auth";
+import { encrypt } from '@/utils/jsencrypt'
+// import Speech from 'speak-tts'
 import {getTopNoticeListByUserId,addReadTimes,getPublicNoticeList,clearNotice} from "@/api/system/notice";
 export default {
   name: 'TopNotice',
@@ -104,16 +106,16 @@ export default {
   mounted() {
     window.addEventListener("click", this.setCanPlayTone);
     this.initXDNoticSdk();
-    this.speechInit();
+    // this.speechInit();
     this.initUserNotice();
 
   },
   methods: {
-    speechInit() {
-      this.speech = new Speech();
-      this.speech.setLanguage("zh-CN");
-      this.speech.init().then(() => {});
-    },
+    // speechInit() {
+    //   this.speech = new Speech();
+    //   this.speech.setLanguage("zh-CN");
+    //   this.speech.init().then(() => {});
+    // },
      setCanPlayTone() {
        this.isPlay = true;
      },
@@ -127,8 +129,11 @@ export default {
       console.log("===>initXDNoticSdk==>")
         this.xdNoticSdk = this.$xdNoticeSdk;
         const userId=this.$store.getters.userId;
+        // const token=getToken();
         // console.log("===>userId==>",userId);
-        this.xdNoticSdk.init(userId);
+        // this.xdNoticSdk.init(userId);
+        this.xdNoticSdk.initWsPlus(userId);
+
 
         this.xdNoticSdk.setOnOpen(this.onNoticeOpen);
         this.xdNoticSdk.setOnClose(this.onNoticeClose);
diff --git a/src/utils/XDNoticeSdk.js b/src/utils/XDNoticeSdk.js
index eee1bf78..344f4818 100644
--- a/src/utils/XDNoticeSdk.js
+++ b/src/utils/XDNoticeSdk.js
@@ -7,8 +7,13 @@ class XDNoticeSdk {
     VERSION="1.0.0"
     MAX_SENT_RETRY_COUNT = 9;
     WS_URL = process.env.VUE_APP_WS_HOST+'/ws/';
+    WS_PLUS_URL = process.env.VUE_APP_WS_HOST+'/wsplus/';
+
 
     userId = null;
+    encUserId = null;
+
+    token = null;
 
     AUTH_TOKEN=null;
 
@@ -55,6 +60,13 @@ class XDNoticeSdk {
       this.start();
     }
 
+    initWsPlus(userId){
+      // 初始化参数建立连接
+      this.userId=userId;
+      this.connect();
+      this.start();
+    }
+
     setOnOpen(callback){
       this.onOpenCallback.push(callback);
 
@@ -107,8 +119,11 @@ class XDNoticeSdk {
       if (!this.ws || this.getWSReadyState() === this.WS_CLOSING || this.getWSReadyState() === this.WS_CLOSE) {
         try {
 
-          // wss://api.emis.tanex56.com/api/bizsvr/ws/123/pc
-          this.ws = new WebSocket(this.WS_URL+""+this.userId+"/pc");
+          // wss://api.emis.tanex56.com/api/bizsvr/ws/123
+          // wss://api.emis.tanex56.com/api/bizsvr/wsplus/123
+
+          // this.ws = new WebSocket(this.WS_URL+""+this.userId);
+          this.ws = new WebSocket(this.WS_PLUS_URL+""+this.userId);
 
           this.ws.onerror = () => {
               // console.log("ws onerror!");