From a170a2ecef6d5c87883ed552dbbc81cfb0358d13 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 19 十一月 2021 16:43:53 +0800
Subject: [PATCH] Merge branch 'WJC' into newBranch1
---
HDL_ON/Entity/Device/DeviceModule.cs | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Entity/Device/DeviceModule.cs b/HDL_ON/Entity/Device/DeviceModule.cs
index c110801..ca6bf4e 100644
--- a/HDL_ON/Entity/Device/DeviceModule.cs
+++ b/HDL_ON/Entity/Device/DeviceModule.cs
@@ -14,19 +14,40 @@
/// </summary>
public string device_mac = "0281B9078C000000";
/// <summary>
+ /// 缃戝叧ID
+ /// </summary>
+ public string gatewayId = "";
+ /// <summary>
/// 璁惧绫诲瀷
/// 缃戝叧鐩墠涓衡�溾��
/// 璇煶闈㈡澘:4
/// </summary>
- public int gateway_type = 0;
+ public string gateway_type = "";
public string model_id = "";
public string device_name = "hdl_bus_gatway";
- public string model_type = "HDL GWA01IP";
public string ip_address = "172.16.2.202";
public string local_data_encode = "false";
public string access_mode = "LAN";
public string oid = "";
-
-
+ public string device_model = "HDL-MGWIP.430";
+ /// <summary>
+ /// 璁惧瀛愮綉鍙疯澶囧彿锛�
+ /// FFFF
+ /// </summary>
+ public string addresses = "";
+ /// <summary>
+ /// 璁惧椹卞姩浠ｇ爜
+ /// 鍖哄垎鏄痓us璁惧锛岃繕鏄痥nx璁惧
+ /// </summary>
+ public string driver_code = "";
+ /// <summary>
+ /// 鏄惁涓荤綉鍏�
+ /// </summary>
+ public string master;
+ /// <summary>
+ /// 鏄惁寮�鍚簡鏈湴鍔犲瘑
+ /// 2021-09-23 娉ㄦ剰锛氫负浜嗗吋瀹规帶鍒朵互鍓嶄笉鍔犲瘑缃戝叧瑕佺敤杩欎釜鏂扮殑瀛楁锛屼笉鑳界敤local_encrypt锛屽洜涓哄彂鐜颁互鍓嶉儴鍒嗗浐浠跺凡缁忔湁杩欎釜鏍囪骞朵笖鍥炲true锛屼絾瀹為檯涓婇�氫俊杩樻病鍔犲瘑鐨�
+ /// </summary>
+ public bool isLocalEncrypt;
}
}
--
Gitblit v1.8.0