From 026ed1573ad8b9ba28f0e2c0bf0c9cd85f1dd2ed Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 02 十二月 2020 16:32:00 +0800
Subject: [PATCH] 2020-12-02 1.增加子账号设备分享。 2.房间删除时间优化。3.消息中心接口对接。4.版本检测更新接口对接。
---
HDL_ON/DAL/Server/NewApiRes.cs | 308 ++++++++++++++++++++++++++++++--------------------
1 files changed, 183 insertions(+), 125 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index 5f99529..ee11cc6 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -483,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>
@@ -547,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>
@@ -561,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;
}
@@ -1064,6 +1066,10 @@
/// 1銆佷紶绌烘煡璇㈠叏閮紙闇�瑕佹牴鎹敤鎴峰煙鍚嶆煡璇級 2銆佷紶鎸囧畾浣忓畢ID鏌ヨ鎸囧畾璁板綍 锛堥渶瑕佹牴鎹綇瀹呭煙鍚嶆煡璇級
/// </summary>
public string homeId;
+ /// <summary>
+ /// ""锛氬叏閮紱Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭�
+ /// </summary>
+ public string pushType;
}
/// <summary>
@@ -1077,39 +1083,8 @@
/// </summary>
public string msgId;
}
-
- ///// <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;
- //}
+
#endregion
@@ -1135,36 +1110,89 @@
#region APP鐗堟湰妫�娴�
/// <summary>
- /// ForceUpdateObj
+ /// AppVersionCheckObj
/// </summary>
[System.Serializable]
- public class ForceUpdateObj
+ public class AppVersionCheckObj
{
- /// <summary>
- /// 鎵嬫満绫诲瀷
- /// Android銆両OS銆乄inPhone
- /// </summary>
- public string DeviceType = PhoneDeviceType.Android.ToString();
/// <summary>
///
/// </summary>
- public string RequestVersion = MainPage.VersionString;
+ public string version = MainPage.VersionString;
/// <summary>
/// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
/// </summary>
- public string Software = SoftwareType.ON_Plus.ToString();
+ public string appName = SoftwareType.ON_Plus.ToString();
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ [System.Serializable]
+ public class AppVersionRes
+ {
/// <summary>
- /// 璇█
+ /// 搴旂敤甯傚満鍚嶇О
/// </summary>
- public string LanguageType;
+ 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 ForceUpdateInfo
+ public class UpdateDialogInfo
{
-
///// <summary>
///// 闇�瑕佸己鍒舵洿鏂�
///// </summary>
@@ -1193,28 +1221,48 @@
}
- /// <summary>
- /// 妫�娴婣PP鐗堟湰 鍝嶅簲鍙傛暟
- /// 濡傛灉鏄痠OS杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
- /// 濡傛灉鏄疉ndroid杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
- /// </summary>
- public class APPVersion
- {
- /// <summary>
- /// 褰撳墠鏈�鏂扮殑鐗堟湰鍙�
- /// </summary>
- public string NewVersion;
+ ///// <summary>
+ ///// 妫�娴婣PP鐗堟湰 鍝嶅簲鍙傛暟
+ ///// 濡傛灉鏄痠OS杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
+ ///// 濡傛灉鏄疉ndroid杩斿洖iOS鐨勬渶鏂扮増鏈拰Url涓嬭浇鍦板潃
+ ///// </summary>
+ //public class APPVersion
+ //{
+ // /// <summary>
+ // /// 褰撳墠鏈�鏂扮殑鐗堟湰鍙�
+ // /// </summary>
+ // public string NewVersion;
- /// <summary>
- /// 褰撳墠鏈�鏂扮増鏈笅杞藉湴鍧�
- /// </summary>
- public string NewVersionUrl;
- }
+ // /// <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>
@@ -1224,28 +1272,34 @@
/// <summary>
/// 浣忓畢ID
/// </summary>
- public int homeId;
+ public string homeId;
/// <summary>
///
/// </summary>
- public List<ShareDatasItem> shareDatas;
+ public List<ShareData> shareDatas;
/// <summary>
/// 瀛愯处鍙稩D
/// </summary>
public List<string> childAccountIds;
}
-
- public class ShareDatasItem
+ /// <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;
+ public string shareType = "DEVICE";
}
@@ -1256,13 +1310,13 @@
public class DeleteShareObj
{
/// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string homeId;
+ /// <summary>
///
/// </summary>
- public List<ShareDatasItem> shareDatas;
- /// <summary>
- /// 瀛愯处鍙稩D
- /// </summary>
- public List<string> childAccountIds;
+ public List<ShareData> shareDatas;
}
/// <summary>
@@ -1274,11 +1328,15 @@
/// <summary>
/// 浣忓畢ID
/// </summary>
- public int homeId;
+ public string homeId;
/// <summary>
- /// 鍒嗕韩涓婚敭ids
+ /// 瀛愯处鍙稩D
/// </summary>
- public List<string> ids;
+ public string childAccountId;
+ /// <summary>
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// </summary>
+ public string shareType = "DEVICE";
}
#endregion
--
Gitblit v1.8.0