From 5239e90611556e1cd48a17bed656a7aa828fcb0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Mon, 5 May 2025 12:22:33 +0800
Subject: [PATCH] =?UTF-8?q?Signalr=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                 |  11 +-
 manifest.json                           | 212 ++++++++++++------------
 package.json                            |   1 +
 pages/index.vue                         | 107 +++++++++++-
 pages/produceManagement/andon/alarm.vue |  28 +---
 utils/signalrUtil.js                    |  49 ++++++
 6 files changed, 271 insertions(+), 137 deletions(-)
 create mode 100644 utils/signalrUtil.js

diff --git a/App.vue b/App.vue
index 4fb27ce..9b92a09 100644
--- a/App.vue
+++ b/App.vue
@@ -7,6 +7,13 @@ export default {
 	onLaunch: function () {
 		this.initApp();
 	},
+	onUnload() {
+	},
+	data() {
+		return {
+
+		};
+	},
 	methods: {
 		// 初始化应用
 		initApp() {
@@ -16,9 +23,8 @@ export default {
 			//#ifdef H5
 			this.checkLogin();
 			//#endif
-			// 震动实验
-			
 		},
+		
 		initConfig() {
 			this.globalData.config = config;
 		},
@@ -31,6 +37,7 @@ export default {
 };
 </script>
 
+
 <style lang="scss">
 @import '@/static/scss/index.scss';
 .border {
diff --git a/manifest.json b/manifest.json
index e04c368..7749a2c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,105 +1,109 @@
 {
-    "name" : "DOAN总装车间PDA",
-    "appid" : "__UNI__EFA389B",
-    "description" : "DOAN总装车间PDA",
-    "versionName" : "1.5.0",
-    "versionCode" : 150,
-    "transformPx" : false,
-    "app-plus" : {
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {},
-        "distribute" : {
-            "android" : {
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {
-                "dSYMs" : false
-            },
-            "sdkConfigs" : {
-                "ad" : {}
-            },
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
-                },
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
-                    },
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
-                    }
-                }
-            }
-        }
-    },
-    "quickapp" : {},
-    "mp-weixin" : {
-        "appid" : "wxccd7e2a0911b3397",
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : false,
-            "minified" : true,
-            "postcss" : true
-        },
-        "optimization" : {
-            "subPackages" : true
-        },
-        "usingComponents" : true
-    },
-    "vueVersion" : "2",
-    "h5" : {
-        "template" : "static/index.html",
-        "devServer" : {
-            "port" : 9090,
-            "https" : false
-        },
-        "title" : "RuoYi-App",
-        "router" : {
-            "mode" : "hash",
-            "base" : "./"
-        }
-    }
-}
+	"name": "DOAN总装车间PDA",
+	"appid": "__UNI__EFA389B",
+	"description": "DOAN总装车间PDA",
+	"versionName": "1.5.0",
+	"versionCode": 150,
+	"transformPx": false,
+	"app-plus": {
+		"networkTimeout": {
+			"request": 60000
+		},
+		"usesCleartextTraffic": true,
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"modules": {},
+		"distribute": {
+			"android": {
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			"ios": {
+				"dSYMs": false
+			},
+			"sdkConfigs": {
+				"ad": {}
+			},
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
+				},
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
+					},
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
+					}
+				}
+			}
+		}
+	},
+	"quickapp": {},
+	"mp-weixin": {
+		"appid": "wxccd7e2a0911b3397",
+		"setting": {
+			"urlCheck": false,
+			"es6": false,
+			"minified": true,
+			"postcss": true
+		},
+		"optimization": {
+			"subPackages": true
+		},
+		"usingComponents": true
+	},
+	"vueVersion": "2",
+	"h5": {
+		"template": "static/index.html",
+		"devServer": {
+			"port": 9090,
+			"https": false
+		},
+		"title": "RuoYi-App",
+		"router": {
+			"mode": "hash",
+			"base": "./"
+		}
+	}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index 8155ec5..efda0b2 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "@microsoft/signalr": "^8.0.7",
     "dayjs": "^1.11.13"
   }
 }
diff --git a/pages/index.vue b/pages/index.vue
index 0679967..a54ff73 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -34,17 +34,19 @@
 				</uni-grid-item>
 			</uni-grid>
 		</view>
+		<view ref="socketRef"></view>
 	</view>
 </template>
 
 <script>
-import { fail } from 'assert';
+import { getBaseUrl } from '@/utils/baseUrl';
 export default {
 	onShow() {
 		uni.hideLoading();
 	},
 	data() {
 		return {
+			socketRef:null,
 			current: 0,
 			swiperDotIndex: 0,
 			bannerList: [
@@ -79,7 +81,7 @@ export default {
 					name: '安灯报警',
 					icon: 'notification-filled',
 					url: '/pages/produceManagement/andon/alarm'
-				},
+				}
 			],
 			// 物料模块
 			materialOptions: [
@@ -87,7 +89,7 @@ export default {
 					name: '产线备料',
 					icon: 'upload-filled',
 					url: '/pages/materialManagement/preparationByPlan/index'
-				},
+				}
 				// {
 				// 	name: '工单备料',
 				// 	icon: 'upload-filled',
@@ -122,11 +124,108 @@ export default {
 					this.$modal.showToast('模块建设中~');
 				}
 			});
+		},
+		// 处理来自 renderjs 的获取存储数据请求
+		handleGetStorage() {
+			const value = getBaseUrl();
+			console.log('handleGetStorage', this.$refs.socketRef);
+			this.$refs.socketRef.receiveStorageValue(value);
 		}
 	}
 };
 </script>
 
+<!-- SignalR的使用 -->
+<script module="socketRef" lang="renderjs">
+import SignalRUtil from '@/utils/signalrUtil';
+
+export default {
+	data() {
+		return {
+			baseUrl:"",
+			signalRUtil: null,
+			isSignalRConnected: false
+		}
+	},
+	methods: {
+		initSignalR() {
+			this.requestStorageValue();
+			let baseUrl = this.baseUrl;
+			let url = `http://${baseUrl}/pdaHub`;
+			//let url = "http://192.168.50.163/pdaHub";
+			this.signalRUtil = new SignalRUtil(url);
+			this.signalRUtil
+				.startConnection()
+				.then(() => {
+					this.isSignalRConnected = true;
+					// 监听服务器发送的消息
+					this.signalRUtil.on('Call', (message) => {
+						this.showSystemAlertAndVibrate(message)
+					});
+				})
+				.catch((error) => {
+					console.error('SignalR 连接失败:', error);
+				});
+		},
+		stopSignalRConnection() {
+			if (this.isSignalRConnected && this.signalRUtil) {
+				this.signalRUtil
+					.stopConnection()
+					.then(() => {
+						this.isSignalRConnected = false;
+						console.log('SignalR 连接已停止');
+					})
+					.catch((error) => {
+						console.error('停止 SignalR 连接失败:', error);
+					});
+			}
+		},
+		// 示例：发送系统通知并震动
+		showSystemAlertAndVibrate(obj) {
+			// 发送系统通知
+			this.sendNativeNotification(obj);
+		},
+		// 在需要发送通知的地方调用
+		sendNativeNotification(obj) {
+			const {lineCode,askPerson,faultDict,faultContext} = obj;
+			// #ifdef APP-PLUS
+			let content = `线别:${lineCode} 报警人:${askPerson}\n报警类别:${faultDict}\n报警内容:${faultContext}`;
+			let options = {
+				cover: false,
+				when: new Date(),
+				title: '产线Andon报警'
+			};
+			let body = {
+				id: 'id',
+				key: 'key'
+			};
+			let payload = JSON.stringify(body);
+			plus.push.createMessage(content, payload, options);
+			if (plus && plus.vibration) {
+				plus.vibration.vibrate(3000);
+			} else {
+				console.error('震动功能不可用');
+			}
+			// #endif
+		},
+		    // 向逻辑层请求存储数据
+		    requestStorageValue() {
+		      this.$ownerInstance.callMethod('handleGetStorage');
+		    },
+		    // 接收逻辑层返回的存储数据
+		    receiveStorageValue(value) {
+				console.log('从存储中获取的值:', value);
+				this.baseUrl = value;
+
+		      // 在这里可以进行后续处理
+		    }
+	},
+	async mounted() {
+		this.initSignalR()
+	},
+}
+</script>
+
 <style lang="scss">
 /* #ifndef APP-NVUE */
 page {
@@ -186,7 +285,7 @@ view {
 	height: 300rpx;
 	line-height: 300rpx;
 }
-.card-box{
+.card-box {
 	padding-bottom: 60px;
 	margin-bottom: 60px;
 }
diff --git a/pages/produceManagement/andon/alarm.vue b/pages/produceManagement/andon/alarm.vue
index 6d5089f..c7e54d8 100644
--- a/pages/produceManagement/andon/alarm.vue
+++ b/pages/produceManagement/andon/alarm.vue
@@ -150,33 +150,7 @@ export default {
 				})
 				.catch((err) => {});
 		},
-		// 在需要发送通知的地方调用
-		sendNativeNotification() {
-			// #ifdef APP-PLUS
-			let content = '您有一条新的消息~';
-			let options = {
-				cover: false,
-				when: new Date(),
-				title: '通知消息'
-			};
-			let body = {
-				id: 'id',
-				key: 'key'
-			};
-			let payload = JSON.stringify(body);
-			plus.push.createMessage(content, payload, options);
-			if (plus && plus.vibration) {
-				plus.vibration.vibrate(3000);
-			} else {
-				console.error('震动功能不可用');
-			}
-			// #endif
-		},
-		// 示例：发送系统通知并震动
-		showSystemAlertAndVibrate() {
-			// 发送系统通知
-			this.sendNativeNotification();
-		}
+		
 	}
 };
 </script>
diff --git a/utils/signalrUtil.js b/utils/signalrUtil.js
new file mode 100644
index 0000000..3c40048
--- /dev/null
+++ b/utils/signalrUtil.js
@@ -0,0 +1,49 @@
+import * as signalR from '@microsoft/signalr';
+import { getToken } from '@/utils/auth'
+class SignalRUtil {
+    constructor(url) {
+		console.log('SignalR 连接：',url);
+        this.hubConnection = new signalR.HubConnectionBuilder()
+           .withUrl(url)
+           .withAutomaticReconnect()
+		   .configureLogging(signalR.LogLevel.Warning)
+           .build();
+
+        this.hubConnection.onclose(() => {
+            console.log('SignalR 连接已关闭');
+        });
+    }
+
+    async startConnection() {
+        try {
+            await this.hubConnection.start();
+            console.log('SignalR 连接已建立');
+        } catch (error) {
+            console.error('SignalR 连接失败:', error);
+        }
+    }
+
+    on(methodName, callback) {
+        this.hubConnection.on(methodName, callback);
+    }
+
+    async invoke(methodName, ...args) {
+        try {
+            return await this.hubConnection.invoke(methodName, ...args);
+        } catch (error) {
+            console.error('调用 SignalR 方法失败:', error);
+        }
+    }
+
+    async stopConnection() {
+        try {
+            await this.hubConnection.stop();
+            console.log('SignalR 连接已停止');
+        } catch (error) {
+            console.error('停止 SignalR 连接失败:', error);
+        }
+    }
+}
+
+export default SignalRUtil;
+    
\ No newline at end of file