From b2f25bfca6471fe3bfa041da8e4a1d01fd00f6ed Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 23 九月 2024 16:54:12 +0800
Subject: [PATCH] Update JLCountrycode.cs
---
HDL_ON/DAL/Server/NewApiRes.cs | 130 ++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index a3973e3..41a7f5e 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -62,6 +62,36 @@
#endregion
+ #region =============璁垮绠＄悊=============
+ /// <summary>
+ /// 璁垮涓存椂瀵嗙爜
+ /// </summary>
+ [System.Serializable]
+ public class VisitorTempPassword
+ {
+ public string id;
+ public string homeId;
+ public string phone;//":"13355558888",
+ public string tempPwd;//":"123456",
+ public string validBeginTime;//":"2022-05-06 13:00:00",
+ public string validEndTime;//":"2022-05-09 13:00:00",
+ public int useCount;//":1,
+ public bool status = true;//:true
+ }
+
+ /// <summary>
+ /// 鑾峰彇涓存椂瀵嗙爜鍒楄〃
+ /// </summary>
+ public class GetTempPasswordList
+ {
+ public string pageNo;//": 0,
+ public string pageSize;//": 0,
+ public string totalCount;//": 0,
+ public string totalPage;//": 0
+ public List<VisitorTempPassword> list;
+ }
+ #endregion
+
#region 鈻� 鐧诲綍 ____________________________
[System.Serializable]
public class LoginObj
@@ -555,7 +585,7 @@
/// <summary>
/// 缃戝叧ID
/// </summary>
- public string gatewayId ="";
+ public string gatewayId = "";
/// <summary>
/// 缃戝叧snID
/// </summary>
@@ -602,6 +632,28 @@
/// OFF_LINE(1,"涓嬬嚎"),;
/// </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>
/////
@@ -855,7 +907,7 @@
/// <summary>
/// 瀛愯处鍙稩D childAccountId
/// </summary>
- public string childAccountId;
+ public string childId;
/// <summary>
/// 浣忓畢
/// </summary>
@@ -878,7 +930,7 @@
/// <summary>
/// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN
/// </summary>
- public string childAccountType;
+ //public string childAccountType;
///// <summary>
///// 鏄惁鍏佽杩滅▼鎺у埗 0:鍏佽 1:涓嶅厑璁�
///// </summary>
@@ -964,7 +1016,7 @@
}
-
+
#endregion
#region 鏁版嵁鍒嗕韩
@@ -1091,6 +1143,18 @@
}
/// <summary>
+ /// 璁惧鎺ㄩ�佹秷鎭鍒�
+ /// </summary>
+ [Serializable]
+ public class DeviceMessageRules
+ {
+ public string homeId;
+ public string deviceId;
+ public string conditionIdentify;
+ public bool push;
+ }
+
+ /// <summary>
///
/// </summary>
[System.Serializable]
@@ -1177,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>
@@ -1356,7 +1396,7 @@
/// </summary>
public string childAccountId;
/// <summary>
- /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE 4.DEVICE_GROUP_CONTROL
/// </summary>
public string shareType = "DEVICE";
}
--
Gitblit v1.8.0