From 452e8cef1c740d18ee398be6971d9952e41dbd4a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 四月 2023 16:11:50 +0800
Subject: [PATCH] 1
---
HDL_ON/DAL/Server/NewApiRes.cs | 52 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 45 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 177a663..8447527 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -585,7 +585,7 @@
/// <summary>
/// 缃戝叧ID
/// </summary>
- public string gatewayId ="";
+ public string gatewayId = "";
/// <summary>
/// 缃戝叧snID
/// </summary>
@@ -632,6 +632,11 @@
/// OFF_LINE(1,"涓嬬嚎"),;
/// </summary>
public bool gatewayStatus;
+
+ /// <summary>
+ /// 鏄惁鏀寔缇ゆ帶
+ /// </summary>
+ public bool isSupportGroupControl = false;
///// <summary>
/////
@@ -885,7 +890,7 @@
/// <summary>
/// 瀛愯处鍙稩D childAccountId
/// </summary>
- public string childAccountId;
+ public string childId;
/// <summary>
/// 浣忓畢
/// </summary>
@@ -908,7 +913,7 @@
/// <summary>
/// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN
/// </summary>
- public string childAccountType;
+ //public string childAccountType;
///// <summary>
///// 鏄惁鍏佽杩滅▼鎺у埗 0:鍏佽 1:涓嶅厑璁�
///// </summary>
@@ -994,7 +999,7 @@
}
-
+
#endregion
#region 鏁版嵁鍒嗕韩
@@ -1121,6 +1126,18 @@
}
/// <summary>
+ /// 璁惧鎺ㄩ�佹秷鎭鍒�
+ /// </summary>
+ [Serializable]
+ public class DeviceMessageRules
+ {
+ public string homeId;
+ public string deviceId;
+ public string conditionIdentify;
+ public bool push;
+ }
+
+ /// <summary>
///
/// </summary>
[System.Serializable]
@@ -1207,11 +1224,32 @@
/// <summary>
///
/// </summary>
- public string version = MainPage.VersionString;
+ public string version = "V" + MainPage.VersionString;
+ ///// <summary>
+ ///// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+ ///// </summary>
+ //public string appName = SoftwareType.ON_Plus.ToString();
+
+ public string appCode = "1588071238036582401";
/// <summary>
- /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+ /// IOS銆丄ndroid
/// </summary>
- public string appName = SoftwareType.ON_Plus.ToString();
+ public string releaseSystem = "";
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ [System.Serializable]
+ public class AppVersionResNew
+ {
+ public string version;
+ public string appName;
+ public string appCode;
+ public bool isEnforce;
+ public string releaseSystem;
+ public string packageUrl;//": "http://hdl-hz-test.oss-cn-hangzhou.aliyuncs.com/20/2022/11/51b8b0b2-0ebc-4632-a3b5-0be1e5d104e4.apk",
+ public string remark;
}
/// <summary>
--
Gitblit v1.8.0