From cc37cf55c02da9e49eab9859ed72f146dee6f635 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 11 九月 2023 14:17:55 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc

---
 HDL_ON/DAL/Server/IMessageCommon.cs |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/HDL_ON/DAL/Server/IMessageCommon.cs b/HDL_ON/DAL/Server/IMessageCommon.cs
index c6d29f4..7626dff 100644
--- a/HDL_ON/DAL/Server/IMessageCommon.cs
+++ b/HDL_ON/DAL/Server/IMessageCommon.cs
@@ -164,6 +164,7 @@
             stateCodeDic["14007"] = StringId.ControlFailure;
             //缃戝叧绂荤嚎
             stateCodeDic["14005"] = StringId.GatewayOffline;
+            stateCodeDic["124005"] = StringId.GatewayOffline;
             //璁惧绂荤嚎
             stateCodeDic["14006"] = StringId.DeviceOffline;
 
@@ -272,6 +273,7 @@
                         {
                             var tip = new Tip()
                             {
+                                MaxWidth = Application.GetRealWidth(300),
                                 Text = mes,
                                 CloseTime = closeTime,
                                 Direction = AMPopTipDirection.None

--
Gitblit v1.8.0