merge origin/master

ModbusDemo/windows/Form1.cs

@@ -409,6 +409,100 @@ namespace ModbusDemo
                     bSetDataIsRunning = false;
                 }
             }
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+        }
+        #region  PoolTest
+=======
+
+        }
+#region  PoolTest
+>>>>>>> ae9d62a8c8c10f8339da24024e6330c7ac4ff704
+
+#endregion
+        //声明委托
+        private delegate void ShowMessageDelegate(string message);
+        private void ShowMessage(string message)
+        {
+            if (this.InvokeRequired)
+            {
+                ShowMessageDelegate showMessageDelegate = ShowMessage;
+                this.Invoke(showMessageDelegate, new object[] { message });
+            }
+            else
+            {
+                //txtbox.Text = message;
+                //totxt.Log(message);
+            }
+        }
+#endregion
+
+#region json字符串转对象
+        /// <summary>
+        /// json字符串转对象
+        /// </summary>
+        /// <typeparam name="RData">接收的对象</typeparam>
+        /// <param name="rd">json字符串</param>
+        /// <returns></returns>
+        public RData DataConversion<RData>(string rd)
+        {
+            try
+            {
+                return JsonConvert.DeserializeObject<RData>(rd);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message);
+                return default(RData);
+            }
+        }
+        public UData DataConverion<UData>(string ud)
+        {
+            try
+            {
+                return JsonConvert.DeserializeObject<UData>(ud);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message);
+                return default(UData);
+            }
+        }
+        /// <summary>
+        /// 对象转json字符串
+        /// </summary>
+        /// <param name="ud">上传实体</param>
+        /// <returns></returns>
+        public string DataConversion(UData ud)
+        {
+            try
+            {
+                return JsonConvert.SerializeObject(ud);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message);
+                return "";
+            }
+        }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="rD"></param>
+        /// <returns></returns>
+        public string DataConversion(RData rD)
+        {
+            try
+            {
+                return JsonConvert.SerializeObject(rD);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex.Message);
+                return "";
+            }
+>>>>>>> origin/master
         }
 #endregion