modify mqtt control

ModbusDemo/Common/ModualAlarm.cs

@@ -12,7 +12,7 @@ namespace ModbusDemo.Common
     public static class ModualAlarm
     {
         public const ushort usChannelNumber = 8;
-        private const string sAlarmTopic = "Witium/WTDS78X/20193261/Alarm";
+        private const string sAlarmTopic = "Witium/WTDS78X/66666666/Alarm";
         public static string sAlarmJson;
         public static string sAlarmJsonPackage;
         //private IMqttClient mqttClient = null;
@@ -24,7 +24,7 @@ namespace ModbusDemo.Common
             ChannelDataRespError = 4,
             ChannelDataChangeError = 8
         }
-        public static void vSetAlarmList(ushort usAddress, ushort[] usChannel, ushort[] usChannelAlarmcode,bool bStringIncrease)
+        public static void vSetAlarmList(ushort usAddress, ushort[] usChannel, ushort[] usChannelAlarmcode)
         {
             ushort i = 0;
             Hashtable hMqtttAlarmMap = new Hashtable();
@@ -36,11 +36,12 @@ namespace ModbusDemo.Common
                 i++;
             }
             hMqtttAlarmMap.Add("ts", Form1.GetTimeStamp());
-            sAlarmJson += JsonConvert.SerializeObject(hMqtttAlarmMap);
-            if (bStringIncrease == true)
+            if (sAlarmJson != "[")
             {
                 sAlarmJson += ",";
             }
+            sAlarmJson += JsonConvert.SerializeObject(hMqtttAlarmMap);
+
         }
         public static async Task vPublishAlarmPackageJson(IMqttClient mqttClient)
         {

ModbusDemo/Common/Totxt.cs

@@ -13,6 +13,7 @@ namespace ModbusDemo.windows
             private string logFile;
             private StreamWriter writer;
             private FileStream fileStream = null;
+            private static object oTxtLock = new object();
             public Totxt(string fileName)
             {
                 logFile = fileName;
@@ -21,33 +22,35 @@ namespace ModbusDemo.windows
 
             public void Log(string info)
             {
-                try
+                lock (oTxtLock)
                 {
-                    System.IO.FileInfo fileInfo = new System.IO.FileInfo(logFile);
-                    if (!fileInfo.Exists)
+                    try
                     {
-                        fileStream = fileInfo.Create();
-                        writer = new StreamWriter(fileStream);
+                        System.IO.FileInfo fileInfo = new System.IO.FileInfo(logFile);
+                        if (!fileInfo.Exists)
+                        {
+                            fileStream = fileInfo.Create();
+                            writer = new StreamWriter(fileStream);
+                        }
+                        else
+                        {
+                            fileStream = fileInfo.Open(FileMode.Append, FileAccess.Write);
+                            writer = new StreamWriter(fileStream);
+                        }
+                        writer.WriteLine(DateTime.Now + ": " + info);
                     }
-                    else
+                    finally
                     {
-                        fileStream = fileInfo.Open(FileMode.Append, FileAccess.Write);
-                        writer = new StreamWriter(fileStream);
+                        if (writer != null)
+                        {
+                            writer.Close();
+                            writer.Dispose();
+                            fileStream.Close();
+                            fileStream.Dispose();
+                        }
                     }
-                    writer.WriteLine(DateTime.Now + ": " + info);
-                }
-            finally
-            {
-                if (writer != null)
-                {
-                    writer.Close();
-                    writer.Dispose();
-                    fileStream.Close();
-                    fileStream.Dispose();
                 }
             }
-        }
-
             public void CreateDirectory(string infoPath)
             {
                 DirectoryInfo directoryInfo = Directory.GetParent(infoPath);

ModbusDemo/MessageFormat/ModualControl.cs

+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using MQTTnet;
+using MQTTnet.Client;
+using Newtonsoft.Json;
+namespace ModbusDemo.MessageFormat
+{
+    public class ModualControl
+    {
+        public class Op
+        {
+            public UInt64  duration { get; set; }
+            public UInt64 startTime { get; set;}
+            public int d0 { get; set; }
+            public int d1 { get; set; }
+            public int d2 { get; set; }
+            public int d3 { get; set; }
+            public int d4 { get; set; }
+            public int d5 { get; set; }
+            public int d6 { get; set; }
+            public int d7 { get; set; }
+            public UInt64 ts { get; set; }
+        }
+
+        public class SsItem
+        {
+            public string addr { get; set; }
+            public Op op { get; set; }
+        }
+
+        public class MqttRoot
+        {
+            public string taskId { get; set; }
+            public List<SsItem> ss { get; set; }
+        }
+        public static List<MqttRoot> liModuualControl = new List<MqttRoot>();
+        public static void vGetaWay_Receive_Control(string sDataString)
+        { 
+             MqttRoot  cControl = JsonConvert.DeserializeObject<MqttRoot>(sDataString); 
+        }
+    }
+}

ModbusDemo/MessageFormat/mqttpacke.cs

@@ -132,7 +132,6 @@ namespace ModbusDemo
     }
     public class Ctrl
     {
-
         public string taskId;
         public void settaskId(string taskId)
         {

ModbusDemo/ModbusDemo.csproj

@@ -2,6 +2,20 @@
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SSDTUnitTestPath Condition="'$(SSDTUnitTestPath)' == ''">$(VsInstallRoot)\Common7\IDE\Extensions\Microsoft\SQLDB</SSDTUnitTestPath>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup>
     <SSDTPath Condition="'$(SSDTPath)' == ''">$(VsInstallRoot)\Common7\IDE\Extensions\Microsoft\SQLDB\DAC\130</SSDTPath>
@@ -22,20 +36,6 @@
     <FileAlignment>512</FileAlignment>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <TargetFrameworkProfile />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -43,7 +43,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;DEBUG_TEST</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -78,7 +78,6 @@
       <HintPath>..\packages\NModbus4.2.1.0\lib\net40\NModbus4.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -94,6 +93,7 @@
     <Compile Include="application\Pond.cs" />
     <Compile Include="application\UsThread.cs" />
     <Compile Include="Common\ModualAlarm.cs" />
+    <Compile Include="MessageFormat\ModualControl.cs" />
     <Compile Include="MessageFormat\ModbusComm.cs" />
     <Compile Include="Modular\414P.cs" />
     <Compile Include="Modular\478C.cs" />
@@ -168,10 +168,10 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <!-- <SsdtUnitTestVersion>3.1</SsdtUnitTestVersion> -->
-  <!-- </PropertyGroup> -->
-  <!-- <Import Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.Sql.UnitTesting.targets" Condition="$(VisualStudioVersion) != '15.0' And '$(SQLDBExtensionsRefPath)' != ''" /> -->
-  <!-- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.Sql.UnitTesting.targets" Condition="$(VisualStudioVersion) != '15.0' And '$(SQLDBExtensionsRefPath)' == ''" /> -->
-  <!-- <PropertyGroup> -->
+    <!-- </PropertyGroup> -->
+    <!-- <Import Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.Sql.UnitTesting.targets" Condition="$(VisualStudioVersion) != '15.0' And '$(SQLDBExtensionsRefPath)' != ''" /> -->
+    <!-- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.Sql.UnitTesting.targets" Condition="$(VisualStudioVersion) != '15.0' And '$(SQLDBExtensionsRefPath)' == ''" /> -->
+    <!-- <PropertyGroup> -->
     <SsdtUnitTestVersion>3.1</SsdtUnitTestVersion>
   </PropertyGroup>
   <Import Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.Sql.UnitTesting.targets" Condition="$(VisualStudioVersion) != '15.0' And '$(SQLDBExtensionsRefPath)' != ''" />