From 342b10ed5f4ebbccf2d2868d211fbe91cf3e8d5d Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期三, 19 三月 2025 09:10:27 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/IBox.WinFrmUI/IBoxForm.cs | 46 ++++++++++++++++++++--------------------------
1 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs b/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs
index 796cde5..0f1941c 100644
--- a/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs
+++ b/WinFrmUI/IBox.WinFrmUI/IBoxForm.cs
@@ -3,12 +3,11 @@
using InTheHand.Net;
using InTheHand.Net.Bluetooth;
using InTheHand.Net.Sockets;
-using PBS.Model;
+using PBS.Vmo;
using System.Net.Http;
using System.Text;
using Yw;
using Yw.WinFrmUI;
-using PBS.Vmo;
namespace IBox.WinFrmUI
{
@@ -23,7 +22,7 @@
private Thread listenThread, sendThread;//鍙戦��/鎺ユ敹绾跨▼
private BluetoothClient myClient = null;
-
+
private BluetoothDeviceInfo curLanYa = null;
private List<BluetoothDeviceInfo> LstBluetooth = null;
@@ -82,14 +81,14 @@
private void ConnectedEve()
{
- barButtonItem2.Enabled = barButtonItem3.Enabled = barButtonItem14.Enabled = barButtonItem11.Enabled = barButtonItem12.Enabled = barButtonItem4.Enabled = barButtonItem5.Enabled = barButtonItem6.Enabled = barButtonItem7.Enabled = barButtonItem8.Enabled = barButtonItem9.Enabled = barButtonItem13.Enabled = true;
+ barButtonItem2.Enabled = barButtonItem3.Enabled = barButtonItem14.Enabled = barButtonItem11.Enabled = barButtonItem12.Enabled = barButtonItem4.Enabled = barButtonItem5.Enabled = barButtonItem7.Enabled = barButtonItem8.Enabled = barButtonItem13.Enabled = true;
barButtonItemConnected.Enabled = false;
barButtonItemClose.Enabled = true;
}
private void ClosedEve()
{
- barButtonItem2.Enabled = barButtonItem3.Enabled = barButtonItem14.Enabled = barButtonItem11.Enabled = barButtonItem12.Enabled = barButtonItem4.Enabled = barButtonItem5.Enabled = barButtonItem6.Enabled = barButtonItem7.Enabled = barButtonItem8.Enabled = barButtonItem9.Enabled = barButtonItem13.Enabled = false;
+ barButtonItem2.Enabled = barButtonItem3.Enabled = barButtonItem14.Enabled = barButtonItem11.Enabled = barButtonItem12.Enabled = barButtonItem4.Enabled = barButtonItem5.Enabled = barButtonItem7.Enabled = barButtonItem8.Enabled = barButtonItem13.Enabled = false;
barButtonItemConnected.Enabled = true;
barButtonItemClose.Enabled = false;
}
@@ -291,6 +290,7 @@
{
BluetoothHelper.GetInstance().SMR += new BluetoothHelper.ShowMessReturn(GetReceive);
barEditItem2.EditValue = "2";
+
//InitControl();
}
@@ -326,12 +326,12 @@
switch (smsg[0].Trim())
{
- case "getlog":
+ case IBoxHelper.getlogCode:
var getloglist = JsonHelper.Json2Object<List<IBoxLogViewModel>>(smsg[1].Trim());
IBoxFormLog.BindData(getloglist, ConnectType == 1 ? true : false);
break;
- case "getbase":
+ case IBoxHelper.getbaseCode:
var getbaselist = JsonHelper.Json2Object<List<StationMonitorListGroupMobileDto>>(smsg[1].Trim());
if (IBoxFormOverview != null)
{
@@ -340,11 +340,11 @@
stationMonitors = getbaselist;
//else
if (IBoxFormMonitor != null)
- IBoxFormMonitor.BindGrid(getbaselist, ConnectType == 1 ? true : false);
+ IBoxFormMonitor.BindGrid(getbaselist, ConnectType == 1 ? true : false);
WaitFormHelper.HideWaitForm();
break;
- case "gethistoryrecord":
+ case IBoxHelper.gethistoryrecordCode:
var b = smsg[1].Trim();
var gethistoryrecordlist = new List<MonitorRecord>();
@@ -360,71 +360,65 @@
IBoxFormMonitor.SetChartData(gethistoryrecordlist, ConnectType == 1 ? true : false);
break;
- case "getalarmbyday":
+ case IBoxHelper.getalarmbydayCode:
var l = smsg[1].Trim();
IBoxFormMonitor.SetAlarmByDay(l, ConnectType == 1 ? true : false);
break;
- case "getbysignalidofdayrange":
+ case IBoxHelper.getbysignalidofdayrangeCode:
var getbysignalidofdayrangelist = JsonHelper.Json2Object<List<MonitorValueAlarmRecord>>(smsg[1].Trim());
break;
- case "getrealrecord":
+ case IBoxHelper.getrealrecordCode:
var getrealrecordlist = JsonHelper.Json2Object<List<MonitorRealRecord>>(smsg[1].Trim());
if (IBoxFormMonitor != null)
IBoxFormMonitor.SetRealRecord(getrealrecordlist, ConnectType == 1 ? true : false);
break;
- case "getparams":
+ case IBoxHelper.getparamsCode:
var model = JsonHelper.Json2Object<IBoxConfigViewModel>(smsg[1].Trim());
IBoxFormParams.BindData(model, ConnectType == 1 ? true : false);
break;
- case "getprotocol":
+ case IBoxHelper.getprotocolCode:
{
var pmodel = JsonHelper.Json2Object<IBoxProtocolViewModel>(smsg[1].Trim());
IBoxFormProtocol.BindData(pmodel, ConnectType == 1 ? true : false);
break;
}
- case "getrules":
+ case IBoxHelper.getrulesCode:
{
var rgetbaselist = JsonHelper.Json2Object<List<StationMonitorListGroupMobileDto>>(smsg[1].Trim());
IBoxFormRule.BindGrid(rgetbaselist, ConnectType == 1 ? true : false);
SendText(null, IBoxHelper.startCode + IBoxHelper.getsignaltypeCode + IBoxHelper.paramCode + IBoxHelper.endCode);
break;
}
- case "getcalvalue":
- {
- var getcalvaluelist = JsonHelper.Json2Object<List<CalcValue>>(smsg[1].Trim());
- //IBoxFormScheme.BindData(getcalvaluelist, stationMonitors, ConnectType == 1 ? true : false);
- break;
- }
- case "getstore":
+ case IBoxHelper.getstoreCode:
{
var pmodel = JsonHelper.Json2Object<SystemInfoViewModel>(smsg[1].Trim());
IBoxFormSystemInfo.BindData(pmodel, ConnectType == 1 ? true : false);
break;
}
- case "getfilter":
+ case IBoxHelper.getfilterCode:
{
var pmodel = JsonHelper.Json2Object<IBoxFilterViewModel>(smsg[1].Trim());
IBoxFormDataFilter.BindData(pmodel, ConnectType == 1 ? true : false);
break;
}
- case "getsignaltype":
+ case IBoxHelper.getsignaltypeCode:
{
var list = JsonHelper.Json2Object<List<IBox.WinFrmUI.GeneralViewModel>>(smsg[1].Trim());
IBoxFormRule.SetSignalType(list);
SendText(null, IBoxHelper.startCode + IBoxHelper.getMonitorgroupCode + IBoxHelper.paramCode + IBoxHelper.endCode);
break;
}
- case "getmonitorgroup":
+ case IBoxHelper.getMonitorgroupCode:
{
var list = JsonHelper.Json2Object<List<IBox.WinFrmUI.MonitorPointGroup>>(smsg[1].Trim());
IBoxFormRule.SetMonitorPoint(list);
break;
}
- case "getenergyanaly":
+ case IBoxHelper.getenergyanalyCode:
{
var list = JsonHelper.Json2Object<List<PumpEnergyViewModel>>(smsg[1].Trim());
IBoxFormEnergyAnalysis.BindData(list);
--
Gitblit v1.9.3