From 2238ae31e734ee2a7cccee77d6c79c5822f3f223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=A5=E9=A3=8E=E8=BF=87=E5=AE=A2?= <3529987066@qq.com> Date: Sun, 28 Apr 2024 17:51:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=EF=BC=9A?= =?UTF-8?q?=201=20=E7=BC=96=E5=86=99=E5=9C=B0=E9=9C=87=E4=BB=AA=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E4=BB=A3=E7=A0=81=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.vs/JiangsuEarthquake/v17/.suo | Bin 254464 -> 253952 bytes .../JiangsuEarthquake/v17/DocumentLayout.json | 35 ++++--- .../jiangsuearthquake.metadata.v7.bin | Bin 216023 -> 217233 bytes .../jiangsuearthquake.projects.v7.bin | Bin 5029370 -> 5272020 bytes .../Models/SeismographModel.cs | 86 +++++++++++++++++- .../JiangsuEarthquake.AssemblyInfo.cs | 2 +- ...JiangsuEarthquake.AssemblyInfoInputs.cache | 2 +- 7 files changed, 103 insertions(+), 22 deletions(-) diff --git a/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo b/JiangsuEarthquake/.vs/JiangsuEarthquake/v17/.suo index f1b5904066abad8f73d2a3302927bb26d1dcc64d..d93cb0434b5d95cdcfa742c287f68fa911d6b342 100644 GIT binary patch delta 9591 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 delta 78 zcmbQZkoWp@UM_|?d<&EI|B)P0vaTQ6Yr6jsBRcm#{~Aw<$i!eX_UC5>HTYEp}I z70WOAC13gHA^iUN621`<7Ez^IRE=6Ob?P-}6xXC#i-cBf+I8sErCX0)fj<2P3>q?Q z#HcajCQO<#ZN{uQ^A;>xlC*5asx|92Y}&GI$F4p5QVtwSJ96yAsWay?vX2+#r^54f rkdDN@i}&$RC3nSS;w_r1Os;Tsnfi*~2Bl0PC}lrh|F`*y&HuH(I_G4& delta 163 zcmV~$OEy9Q007YA35AfNRD?nwM3PS*QVLmAgS( stationNameData = new List(); + for (int i = 4; i < 36; i++) + stationNameData.Add(dataRecv[i]); + string stationName = Encoding.UTF8.GetString(stationNameData.ToArray()); + + //台名缩写 + List stationNameAbbData = new List(); + for (int i = 36; i < 44; i++) + stationNameAbbData.Add(dataRecv[i]); + string stationNameAbb = Encoding.UTF8.GetString(stationNameAbbData.ToArray()); + + //地震计总数 + int seisNum = BitConverter.ToInt16(new byte[] { dataRecv[45], dataRecv[44] }, 0); + + //总通道数 + int passNum = BitConverter.ToInt16(new byte[] { dataRecv[47], dataRecv[46] }, 0); + + //纬度 + int latitude = BitConverter.ToInt16(new byte[] { dataRecv[51], dataRecv[50], dataRecv[49], dataRecv[48] }, 0); + + //经度 + int longitude = BitConverter.ToInt16(new byte[] { dataRecv[55], dataRecv[54], dataRecv[53], dataRecv[52] }, 0); + + //经度 + int elevation = BitConverter.ToInt16(new byte[] { dataRecv[59], dataRecv[58], dataRecv[57], dataRecv[56] }, 0); + + //起用日期 + List enablingDateList = new List(); + for (int i = 60; i < 92; i++) + enablingDateList.Add(dataRecv[i]); + string enablingDate = Encoding.UTF8.GetString(enablingDateList.ToArray()); + + //台网标志 + string tetworkLogo = Encoding.UTF8.GetString(new byte[] { dataRecv[95], dataRecv[94], dataRecv[93], dataRecv[92] }); + + //软件编本 + List softVersionList = new List(); + for (int i = 96; i < 128; i++) + softVersionList.Add(dataRecv[i]); + string softVersion = Encoding.UTF8.GetString(softVersionList.ToArray()); + } + else if (Tools.CompareByte(cmdRecv, new byte[] { 0xC0, 0x50 })) //启动地震计调零 + { + if (dataRecv.Count != 2) + return; + + int seisNum = BitConverter.ToInt16(new byte[] { dataRecv[1], dataRecv[0] }, 0); + } + else if (Tools.CompareByte(cmdRecv, new byte[] { 0xC0, 0x51 })) //停止地震计调零 + { + + } + else if (Tools.CompareByte(cmdRecv, new byte[] { 0xC0, 0x66 })) //运行状态信息 + { + if (dataRecv.Count != 56) + return; + + int supplyVoltage = BitConverter.ToInt16(new byte[] { dataRecv[1], dataRecv[0] }, 0); + } + else if (Tools.CompareByte(cmdRecv, new byte[] { 0xC0, 0x90 })) //启动地震计调平 + { + + } + else if (Tools.CompareByte(cmdRecv, new byte[] { 0xC0, 0x91 })) //停止地震计调平 + { + + } + } + } } } diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs index ec7c2a1..6ad27b9 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+14e7fe49e9e6d49082ec0ec1a0839f6ce7695faa")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+1cb4a8b813af00448dbedc4d1384ab56def77f30")] [assembly: System.Reflection.AssemblyProductAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyTitleAttribute("JiangsuEarthquake")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache index ad1dabd..249bfbd 100644 --- a/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache +++ b/JiangsuEarthquake/JiangsuEarthquake/obj/Debug/net6.0-windows/JiangsuEarthquake.AssemblyInfoInputs.cache @@ -1 +1 @@ -d85f7398275725d03be5e8ee96488b3727df451ccd9d9c93184d66ccb7d2bf32 +a7e873d2a45b97372ea2d5fe393bd311f755d5bbdbfa31e4885b5be072fb4238