From 22aa441f75affc5dd6c984bf4b04ff583cfeec8d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 15 十一月 2023 17:26:20 +0800
Subject: [PATCH] 2023年11月15日17:24:32
---
HDL_ON/DAL/Server/NewApiRes.cs | 92 ++++++++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 47 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 1f2c5b9..42b4790 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>
@@ -633,6 +633,28 @@
/// </summary>
public bool gatewayStatus;
+ /// <summary>
+ /// 鏄惁鏀寔缇ゆ帶
+ /// </summary>
+ public bool isSupportGroupControl = false;
+
+
+ public string linkDriverVersion = "3.0.0";
+
+ /// <summary>
+ /// 鏄惁鏀寔鍦烘櫙鎺у埗鑷姩鍖栦娇鑳�
+ /// </summary>
+ public bool isSupportSceneEnableAutomation {
+ get
+ {
+#if DEBUG
+ linkDriverVersion = "V03.08.00";
+#endif
+ return string.Compare(linkDriverVersion, "V03.07.99", false) == 1 ? true : false;
+
+ }
+ }
+
///// <summary>
/////
///// </summary>
@@ -659,7 +681,7 @@
- #endregion
+#endregion
#region 瑙ｇ粦缃戝叧
/// <summary>
@@ -679,7 +701,7 @@
}
#endregion
- #endregion
+#endregion
#region 鈻� 澶囦唤鐩稿叧 ____________________________
/// <summary>
@@ -885,7 +907,7 @@
/// <summary>
/// 瀛愯处鍙稩D childAccountId
/// </summary>
- public string childAccountId;
+ public string childId;
/// <summary>
/// 浣忓畢
/// </summary>
@@ -908,7 +930,7 @@
/// <summary>
/// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN
/// </summary>
- public string childAccountType;
+ //public string childAccountType;
///// <summary>
///// 鏄惁鍏佽杩滅▼鎺у埗 0:鍏佽 1:涓嶅厑璁�
///// </summary>
@@ -994,7 +1016,7 @@
}
-
+
#endregion
#region 鏁版嵁鍒嗕韩
@@ -1219,57 +1241,33 @@
/// <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 AppVersionRes
+ public class AppVersionResNew
{
- /// <summary>
- /// 搴旂敤甯傚満鍚嶇О
- /// </summary>
- public string appMarket;
- /// <summary>
- /// app鍚嶇О
- /// </summary>
- public string appName;
- /// <summary>
- /// ios涓嬭浇鍦板潃
- /// </summary>
- public string iosUrl;
- /// <summary>
- /// 瀹夊崜涓嬭浇鍦板潃
- /// </summary>
- public string androidUrl;
- /// <summary>
- /// 鏄惁鏄己鍒舵洿鏂�
- /// </summary>
- public bool isEnforce;
- /// <summary>
- /// 鍙戝竷绯荤粺锛孖OS銆丄ndroid
- /// </summary>
- public string releaseSystem;
- /// <summary>
- /// 澶囨敞
- /// </summary>
- public string remark;
- /// <summary>
- /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙ｆ瀽
- /// </summary>
- public string updateDescription;
- /// <summary>
- /// 鐗堟湰鍙�
- /// </summary>
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>
/// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙ｆ瀽
/// </summary>
@@ -1483,7 +1481,7 @@
#endregion
- #endregion
+#endregion
/// <summary>
--
Gitblit v1.8.0