From 7ee0220b5f5626deef516b6e5c417bfa201e5a88 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期二, 18 三月 2025 09:34:45 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/IBox.WinFrmUI/IBoxForm.cs |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs b/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs
index 30bf9d7..796cde5 100644
--- a/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs
+++ b/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs
@@ -23,17 +23,7 @@
         private Thread listenThread, sendThread;//鍙戦��/鎺ユ敹绾跨▼
 
         private BluetoothClient myClient = null;
-        private string startCode = "[&start&]";
-        private string endCode = "[&end&]";
-        private string paramCode = "[&param&]";
-        private string getbaseCode = "getbase";
-        private string getrealrecordCode = "getrealrecord";
-        private string gethistoryrecordCode = "gethistoryrecord";
-        private string getalarmbydayCode = "getalarmbyday";
-        private string getbysignalidofdayrangeCode = "getbysignalidofdayrange";
-        private string getmonitorCode = "getmonitor";
-        private string getsignaltypeCode = "getsignaltype";
-        private string getMonitorgroupCode = "getmonitorgroup";
+        
         private BluetoothDeviceInfo curLanYa = null;
         private List<BluetoothDeviceInfo> LstBluetooth = null;
 
@@ -312,9 +302,9 @@
                 WaitFormHelper.HideWaitForm();
                 MessageBoxHelper.ShowError("钃濈墮璁惧杩炴帴澶辫触锛岃閲嶈瘯!"); return;
             }
-            if (!string.IsNullOrEmpty(msg) && msg.Contains(startCode))
+            if (!string.IsNullOrEmpty(msg) && msg.Contains(IBoxHelper.startCode))
             {
-                var order = msg.Replace(endCode, "").Replace(startCode, "").Trim();
+                var order = msg.Replace(IBoxHelper.endCode, "").Replace(IBoxHelper.startCode, "").Trim();
                 SetOrder(order);
             }
             else
@@ -328,7 +318,7 @@
 
         private void SetOrder(string order)
         {
-            var smsg = order.Split(new string[] { paramCode }, StringSplitOptions.RemoveEmptyEntries);
+            var smsg = order.Split(new string[] { IBoxHelper.paramCode }, StringSplitOptions.RemoveEmptyEntries);
             if (smsg.Length < 2)
             {
                 return;
@@ -400,7 +390,7 @@
                     {
                         var rgetbaselist = JsonHelper.Json2Object<List<StationMonitorListGroupMobileDto>>(smsg[1].Trim());
                         IBoxFormRule.BindGrid(rgetbaselist, ConnectType == 1 ? true : false);
-                        SendText(null, startCode + getsignaltypeCode + paramCode + endCode);
+                        SendText(null, IBoxHelper.startCode + IBoxHelper.getsignaltypeCode + IBoxHelper.paramCode + IBoxHelper.endCode);
                         break;
                     }
                 case "getcalvalue":
@@ -425,7 +415,7 @@
                     {
                         var list = JsonHelper.Json2Object<List<IBox.WinFrmUI.GeneralViewModel>>(smsg[1].Trim());
                         IBoxFormRule.SetSignalType(list);
-                        SendText(null, startCode + getMonitorgroupCode + paramCode + endCode);
+                        SendText(null, IBoxHelper.startCode + IBoxHelper.getMonitorgroupCode + IBoxHelper.paramCode + IBoxHelper.endCode);
                         break;
                     }
                 case "getmonitorgroup":
@@ -529,7 +519,7 @@
                 var result = Yw.Untity.HttpRequestHelper.Get(param);
                 if (result == "true")
                 {
-                    SendText(null, startCode + getbaseCode + paramCode + endCode);
+                    SendText(null, IBoxHelper.startCode + IBoxHelper.getbaseCode + IBoxHelper.paramCode + IBoxHelper.endCode);
                     ConnectedEve();
 
                     MessageBoxHelper.ShowSuccess("杩炴帴鎴愬姛!");
@@ -657,7 +647,7 @@
             }
             catch
             {
-                MessageBoxHelper.ShowInfo("杩欎釜鐢佃剳钃濈墮涓嶅彲鐢紒");
+                //MessageBoxHelper.ShowInfo("杩欎釜鐢佃剳钃濈墮涓嶅彲鐢紒");
             }
         }
 

--
Gitblit v1.9.3