From e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 02 十二月 2020 16:34:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL-NEW'
---
HDL_ON/DAL/Server/NewApiRes.cs | 489 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 371 insertions(+), 118 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 7c3ad7e..ee11cc6 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -405,6 +405,10 @@
/// 浣忓畢鍚嶇О
/// </summary>
public string homeName;
+ /// <summary>
+ /// 浣忓畢鍦板潃
+ /// </summary>
+ public string Address;
}
@@ -479,63 +483,31 @@
#endregion
#region 鑾峰彇浣忓畢缃戝叧鍒楄〃
- [Serializable]
- public class HomeGatewayRes
- {
- public int totalPages;
- public int totalElements;
- public bool last;
- public bool first;
- public int numberOfElements;
- public int size;
- public int number;
- public bool empty;
- public List<HomeGatewayInfo> content = new List<HomeGatewayInfo>();
- }
+ //[Serializable]
+ //public class HomeGatewayRes
+ //{
+ // public int totalPages;
+ // public int totalElements;
+ // public bool last;
+ // public bool first;
+ // public int numberOfElements;
+ // public int size;
+ // public int number;
+ // public bool empty;
+ // public List<HomeGatewayInfo> content = new List<HomeGatewayInfo>();
+ //}
[Serializable]
public class HomeGatewayInfo
{
/// <summary>
- /// 缃戝叧
+ /// 缃戝叧ID
/// </summary>
- public string id;
+ public string gatewayId;
/// <summary>
- /// 浣忓畢ID
+ /// 缃戝叧snID
/// </summary>
- public string homeId;
- /// <summary>
- ///
- /// </summary>
- public string untieMark;
- /// <summary>
- ///
- /// </summary>
- public string gwFirmwareVersion;
- /// <summary>
- ///
- /// </summary>
- public string mac;
- /// <summary>
- ///
- /// </summary>
- public string projectName;
- /// <summary>
- ///
- /// </summary>
- public string userName;
- /// <summary>
- ///
- /// </summary>
- public string groupName;
- /// <summary>
- ///
- /// </summary>
- public string gatewayName;
- /// <summary>
- ///
- /// </summary>
- public string primaryKey;
+ public string sn;
/// <summary>
///
/// </summary>
@@ -543,11 +515,24 @@
/// <summary>
///
/// </summary>
- public string encryptionType;
+ public string gatewayType;
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
/// <summary>
///
/// </summary>
- public string gatewayType;
+ public string mac;
+ /// <summary>
+ ///
+ /// </summary>
+ public string primaryKey;
+ /// <summary>
+ ///
+ /// </summary>
+ public string encryptionType;
+
/// <summary>
/// 瀛愮綉鍙�
/// </summary>
@@ -557,6 +542,27 @@
/// </summary>
public int deviceId;
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string gwFirmwareVersion;
+
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string projectName;
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string userName;
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string groupName;
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public string gatewayName;
}
@@ -780,6 +786,21 @@
#region 娣诲姞銆佹煡璇€�佸垹闄ゅ瓙璐﹀彿
/// <summary>
+ /// ChildBaseObj
+ /// </summary>
+ [System.Serializable]
+ public class ChildBaseObj
+ {
+ /// <summary>
+ /// 瀛愯处鍙稩D childAccountId
+ /// </summary>
+ public string childAccountId;
+ /// <summary>
+ /// 浣忓畢
+ /// </summary>
+ public string homeId;
+ }
+ /// <summary>
/// 娣诲姞瀛愯处鍙�
/// </summary>
[System.Serializable]
@@ -811,16 +832,9 @@
/// 鍒犻櫎瀛愯处鍙�
/// </summary>
[System.Serializable]
- public class ChildDeleteObj
+ public class ChildDeleteObj: ChildBaseObj
{
- /// <summary>
- ///
- /// </summary>
- public string childAccountId;
- /// <summary>
- /// 浣忓畢
- /// </summary>
- public string homeId;
+
}
/// <summary>
@@ -885,21 +899,24 @@
}
+ /// <summary>
+ /// 鏇存柊瀛愯处鍙峰娉ㄥ悕瀛�
+ /// </summary>
+ [System.Serializable]
+ public class UpdateChildNickNameObj: ChildBaseObj
+ {
+ /// <summary>
+ /// nickName
+ /// </summary>
+ public string nickName;
+ }
/// <summary>
/// 鏇存柊杩滅▼鎺у埗
/// </summary>
[System.Serializable]
- public class UpdateRemoteObj
+ public class UpdateRemoteObj : ChildBaseObj
{
- /// <summary>
- /// 瀛愯处鍙稩D
- /// </summary>
- public string childAccountId;
- /// <summary>
- /// 浣忓畢
- /// </summary>
- public string homeId;
/// <summary>
/// 鏄惁鍏佽杩滅▼鎺у埗
/// </summary>
@@ -910,6 +927,18 @@
public string childAccountType;
}
+ /// <summary>
+ /// 淇敼鏄惁鍏佽鍒涘缓鍦烘櫙
+ /// </summary>
+ [System.Serializable]
+ public class UpdateChildAllowCreateSceneObj : ChildBaseObj
+ {
+ /// <summary>
+ /// 鏄惁鍏佽鍒涘缓鍦烘櫙
+ /// </summary>
+ public bool isAllowCreateScene;
+
+ }
#endregion
#region 鏁版嵁鍒嗕韩
@@ -917,16 +946,8 @@
/// 鏌ヨ鏌愪綇瀹呮煇瀛愯处鍙风殑鍒嗕韩鏂囦欢淇℃伅
/// </summary>
[System.Serializable]
- public class HomeShareFindAll
+ public class HomeShareFindAll : ChildBaseObj
{
- /// <summary>
- /// 浣忓畢ID
- /// </summary>
- public string homeId;
- /// <summary>
- /// 瀛愯处鍙穒d
- /// </summary>
- public string childAccountId;
}
@@ -1005,7 +1026,7 @@
/// </summary>
public string deviceName;
/// <summary>
- ///
+ /// Android銆両OS銆乄inPhone
/// </summary>
public string deviceType;
/// <summary>
@@ -1015,55 +1036,55 @@
/// <summary>
/// 鎺ㄩ�両D
/// </summary>
- public string pushid;
+ public string pushToken;
/// <summary>
- /// 1鏄疕DL_ON銆�2HDL_Zigbee
+ /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
/// </summary>
- //public string software = MainPage.RequestSource;
- public string software = "HDL_ON";
+ public string software = SoftwareType.ON_Plus.ToString();
}
-
+ /// <summary>
+ ///
+ /// </summary>
[System.Serializable]
- public class PushserivceIdObj
+ public class PushIdObj
{
/// <summary>
///
/// </summary>
- public string id;
+ public string pushId;
}
- ///// <summary>
- ///// 鎺ㄩ�佹秷鎭垪琛�
- ///// </summary>
- //[System.Serializable]
- //public class PushMesInfoRes
- //{
- // /// <summary>
- // ///
- // /// </summary>
- // public string pushId;
- // /// <summary>
- // ///
- // /// </summary>
- // public string pushTitle;
- // /// <summary>
- // ///
- // /// </summary>
- // public string pushContent;
- // /// <summary>
- // ///
- // /// </summary>
- // public string pushType;
- // /// <summary>
- // ///
- // /// </summary>
- // public bool isRead;
- // /// <summary>
- // ///
- // /// </summary>
- // public string pushDatetime;
- //}
+ /// <summary>
+ ///
+ /// </summary>
+ [System.Serializable]
+ public class GetMessageListObj: PushIdObj
+ {
+ /// <summary>
+ /// 浣忓畢涓婚敭id
+ /// 1銆佷紶绌烘煡璇㈠叏閮紙闇�瑕佹牴鎹敤鎴峰煙鍚嶆煡璇級 2銆佷紶鎸囧畾浣忓畢ID鏌ヨ鎸囧畾璁板綍 锛堥渶瑕佹牴鎹綇瀹呭煙鍚嶆煡璇級
+ /// </summary>
+ public string homeId;
+ /// <summary>
+ /// ""锛氬叏閮紱Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭�
+ /// </summary>
+ public string pushType;
+ }
+
+ /// <summary>
+ /// 娑堟伅璁板綍Id
+ /// </summary>
+ [System.Serializable]
+ public class PushMsgIdObj
+ {
+ /// <summary>
+ /// 娑堟伅璁板綍Id
+ /// </summary>
+ public string msgId;
+ }
+
+
#endregion
@@ -1087,10 +1108,242 @@
public string Id;
}
+ #region APP鐗堟湰妫�娴�
+ /// <summary>
+ /// AppVersionCheckObj
+ /// </summary>
+ [System.Serializable]
+ public class AppVersionCheckObj
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public string version = MainPage.VersionString;
+ /// <summary>
+ /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+ /// </summary>
+ public string appName = SoftwareType.ON_Plus.ToString();
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ [System.Serializable]
+ public class AppVersionRes
+ {
+ /// <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;
+ }
+
+ /// <summary>
+ /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙ｆ瀽
+ /// </summary>
+ public class ReasonStrJson
+ {
+ /// <summary>
+ /// 涓枃
+ /// </summary>
+ public string Chinese;
+ /// <summary>
+ /// 鑻辨枃
+ /// </summary>
+ public string English;
+ /// <summary>
+ ///
+ /// </summary>
+ public string Czech;
+ }
+
+ /// <summary>
+ /// 妫�娴嬫洿鏂拌繑鍥炲瓧娈�
+ /// </summary>
+ public class UpdateDialogInfo
+ {
+ ///// <summary>
+ ///// 闇�瑕佸己鍒舵洿鏂�
+ ///// </summary>
+ //public bool IsNeedForceUpdate;
+ /// <summary>
+ /// 1.鎻愮ず鏇存柊鐨勫唴瀹�
+ /// 2.寮哄埗鏇存柊鍘熷洜
+ /// 3.鎻愮ず鐨勯�氱煡鍐呭
+ /// </summary>
+ public string ReasonStr;
+ /// <summary>
+ /// O 涓嶉渶瑕佹洿鏂�
+ /// 1 鎻愮ず鏇存柊
+ /// 2 寮哄埗鏇存柊
+ /// 3 鎻愮ず閫氱煡鍐呭
+ /// </summary>
+ public int UpdateType;
+ /// <summary>
+ /// 褰撳墠鏂扮増鏈彿
+ /// </summary>
+ public string NewVersion;
+ /// <summary>
+ /// 褰撳墠鏂扮増鏈彿
+ /// </summary>
+ public string NewVersionUrl;
+
+ }
+
+ ///// <summary>
+ ///// 妫�娴婣PP鐗堟湰 鍝嶅簲鍙傛暟
+ ///// 濡傛灉鏄痠OS杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
+ ///// 濡傛灉鏄疉ndroid杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
+ ///// </summary>
+ //public class APPVersion
+ //{
+ // /// <summary>
+ // /// 褰撳墠鏈�鏂扮殑鐗堟湰鍙�
+ // /// </summary>
+ // public string NewVersion;
+
+ // /// <summary>
+ // /// 褰撳墠鏈�鏂扮増鏈笅杞藉湴鍧�
+ // /// </summary>
+ // public string NewVersionUrl;
+ //}
+
#endregion
-
+ #region 鏁版嵁鍒嗕韩
+ ///// <summary>
+ ///// 娣诲姞鍒嗕韩
+ ///// </summary>
+ //[System.Serializable]
+ //public class ShareData
+ //{
+ // /// <summary>
+ // /// 浣忓畢ID
+ // /// </summary>
+ // public int homeId;
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // public List<ShareDatasItem> shareDatas;
+ // /// <summary>
+ // /// 瀛愯处鍙稩D
+ // /// </summary>
+ // public List<string> childAccountIds;
+ //}
+
+ /// <summary>
+ /// 娣诲姞鍒嗕韩
+ /// </summary>
+ [System.Serializable]
+ public class AddShareObj
+ {
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
+ /// <summary>
+ ///
+ /// </summary>
+ public List<ShareData> shareDatas;
+ /// <summary>
+ /// 瀛愯处鍙稩D
+ /// </summary>
+ public List<string> childAccountIds;
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public class ShareData
+ {
+ /// <summary>
+ /// 鍒嗕韩绫诲瀷琛╥d
+ /// </summary>
+ public string shareTypeId;
+ /// <summary>
+ /// 瀛愬笎鍙稩D
+ /// </summary>
+ public string childAccountId;
+ /// <summary>
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// </summary>
+ public string shareType = "DEVICE";
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎鍒嗕韩
+ /// </summary>
+ [System.Serializable]
+ public class DeleteShareObj
+ {
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
+ /// <summary>
+ ///
+ /// </summary>
+ public List<ShareData> shareDatas;
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍒嗕韩
+ /// </summary>
+ [System.Serializable]
+ public class GetShareObj
+ {
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
+ /// <summary>
+ /// 瀛愯处鍙稩D
+ /// </summary>
+ public string childAccountId;
+ /// <summary>
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// </summary>
+ public string shareType = "DEVICE";
+ }
+
+ #endregion
+
+ #endregion
+
+
//#region 鏃ф帴鍙�
///// <summary>
--
Gitblit v1.8.0