From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/DAL/Server/NewApiRes.cs | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index e145110..91d22eb 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -544,38 +544,38 @@
/// <summary>
/// 缃戝叧ID
/// </summary>
- public string gatewayId;
+ public string gatewayId ="";
/// <summary>
/// 缃戝叧snID
/// </summary>
- public string sn;
+ public string sn = "";
/// <summary>
///
/// </summary>
- public string aesKey;
+ public string aesKey = "";
/// <summary>
/// BUSUDPGATEWAY,
/// AGATEWAY,
/// ZIGBEEGATEWAY,
/// KNXGATEWAY
/// </summary>
- public string gatewayType;
+ public string gatewayType = "";
/// <summary>
/// 浣忓畢ID
/// </summary>
- public string homeId;
+ public string homeId = "";
/// <summary>
///
/// </summary>
- public string mac;
+ public string mac = "";
/// <summary>
///
/// </summary>
- public string primaryKey;
+ public string primaryKey = "";
/// <summary>
///
/// </summary>
- public string encryptionType;
+ public string encryptionType = "";
/// <summary>
/// 瀛愮綉鍙�
@@ -1123,6 +1123,18 @@
public string Id;
}
+ /// <summary>
+ /// AppNameObj
+ /// </summary>
+ [System.Serializable]
+ public class AppNameObj
+ {
+ /// <summary>
+ /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+ /// </summary>
+ public string appName = SoftwareType.ON_Plus.ToString();
+ }
+
#region APP鐗堟湰妫�娴�
/// <summary>
/// AppVersionCheckObj
@@ -1348,10 +1360,11 @@
/// 瀛愯处鍙稩D
/// </summary>
public string childAccountId;
- /// <summary>
- /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
- /// </summary>
- public string shareType = "DEVICE";
+ ///// <summary>
+ ///// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ ///// 涓嶄紶榛樿鏌ュ叏閮�
+ ///// </summary>
+ //public string shareType = "DEVICE";
}
#endregion
--
Gitblit v1.8.0