From bbc74a6dae2e90a811b2507c5896fe89aa29ccc0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期三, 08 一月 2020 11:30:46 +0800
Subject: [PATCH] 2020-01-08 1.替换新服务器接口。
---
Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs | 1023 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 821 insertions(+), 202 deletions(-)
diff --git a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs
index 46e5190..d57a5f5 100644
--- a/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs
+++ b/Crabtree/SmartHome/HDL/Operation/ResponseEntity/SendJson.cs
@@ -1,8 +1,606 @@
锘縰sing System;
using System.Collections.Generic;
+using Shared.SimpleControl;
namespace Shared
{
+
+
+ /// <summary>
+ /// BaseRequestObj
+ /// </summary>
+ [System.Serializable]
+ public class BaseRequestObj
+ {
+ public string RequestVersion = MainPage.RequestVersion;
+
+ public string RequestSource = MainPage.RequestSource;
+
+ public string LoginAccessToken;
+
+ }
+
+ [System.Serializable]
+ public class BaseNoTokenObj
+ {
+ public string RequestVersion = MainPage.RequestVersion;
+
+ public string RequestSource = MainPage.RequestSource;
+
+ }
+
+ [System.Serializable]
+ public class PageSettingObj
+ {
+ public int Page = 1;
+
+ public int PageSize = 50;
+ }
+
+ [System.Serializable]
+ public class BaseReqDtoObj
+ {
+ public PageSettingObj PageSetting = new PageSettingObj();
+ public string LoginAccessToken;
+
+ }
+
+ [System.Serializable]
+ public class BaseAccountCtrlObj: BaseRequestObj
+ {
+ /// <summary>
+ /// 鏄惁鏄瓙璐﹀彿杩涜鎿嶄綔
+ /// </summary>
+ public bool IsOtherAccountCtrl = MainPage.IsAdministrator;
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public string HomeId;
+
+ }
+
+ #region 椤圭洰(浣忓畢)
+ #region 2銆佸浠�
+
+ #region 1.21娣诲姞椤圭洰(浣忓畢)[App(缃戝叧)鎵嬪姩澶囦唤]澶囨敞鏂囦欢澶�
+ /// <summary>
+ /// 娣诲姞椤圭洰澶囦唤鏂囦欢澶�
+ /// </summary>
+ [System.Serializable]
+ public class AddHomeAppGatewayNameObj : BaseAccountCtrlObj
+ {
+
+ /// <summary>
+ /// 澶囦唤鍚� -->閿悕 : BackupName
+ /// </summary>
+ public string BackupName;
+
+ /// <summary>
+ /// 缃戝叧鐨勫敮涓�Id(褰揗anualBackupType=2鏃�,姝ゅ�间笉鑳戒负绌�!
+ /// </summary>
+ public string GatewayUniqueId;
+ /// <summary>
+ /// ManualBackupType 鎵嬪姩澶囦唤绫诲瀷(0:App鎵嬪姩澶囦唤,2锛氱綉鍏虫墜鍔ㄥ浠�,4:鍏叡澶囦唤) 榛樿鍊�: 0
+ /// </summary>
+ public int ManualBackupType = 0;
+
+
+ }
+ #endregion
+
+ #region 1.22 涓婁紶[椤圭洰(浣忓畢(App(缃戝叧)鎵嬪姩澶囦唤]瀛愭枃浠�
+ /// <summary>
+ /// 涓婁紶鎵嬪姩澶囦唤
+ /// </summary>
+ [System.Serializable]
+ public class UploadHomeAppGatewaySubFilesObj : BaseAccountCtrlObj
+ {
+
+ /// <summary>
+ /// 澶囦唤鍚嶇殑Id
+ /// </summary>
+ public string BackupClassId;
+
+ /// <summary>
+ /// ManualBackupType 鎵嬪姩澶囦唤绫诲瀷(0:App鎵嬪姩澶囦唤,2锛氱綉鍏虫墜鍔ㄥ浠�,4:鍏叡澶囦唤) 榛樿鍊�: 0
+ /// </summary>
+ public int ManualBackupType = 0;
+
+ /// <summary>
+ /// 澶囦唤鏂囦欢鍒楄〃
+ /// </summary>
+ public List<FileInfoData> UploadSubFileLists = new List<FileInfoData> ();
+
+ }
+
+
+ /// <summary>
+ /// 鏂囦欢鏁版嵁
+ /// </summary>
+ public class FileInfoData
+ {
+ /// <summary>
+ /// BackupFileName
+ /// </summary>
+ public string BackupFileName = string.Empty;
+ /// <summary>
+ /// BackupFileContent
+ /// </summary>
+ public byte [] BackupFileContent;
+ }
+
+
+ [System.Serializable]
+ public class UploadSubFileListsObj
+ {
+
+ public string BackupFileName;
+ public byte[] BackupFileContent;
+ }
+
+ #endregion
+
+
+ #region 1.23 鍒犻櫎App澶囦唤
+ /// <summary>
+ /// 鍒犻櫎App澶囦唤
+ /// </summary>
+ [System.Serializable]
+ public class DeleteAppBackupFileObj : BaseAccountCtrlObj
+ {
+
+ /// <summary>
+ /// 澶囦唤鍚嶇殑Id
+ /// </summary>
+ public string BackupClassId;
+ /// <summary>
+ /// 闇�瑕佸垹闄ゆ枃浠跺悕鐨勬暟缁� (娉ㄦ剰濡傛灉鎻愪氦鐨勬枃浠跺悕鐨勬暟缁勪腑骞朵笉鏄綘, 鎴栬�呬笉瀛樺湪鐨勶紝鍒欎笉鎵ц鍒犻櫎)
+ /// </summary>
+ public List<string> DeleteFileNameLists;
+
+ }
+ #endregion
+
+ #region 1.24 鑾峰彇浣忓畢澶囦唤鏁版嵁_鍒嗛〉
+ /// <summary>
+ /// 鑾峰彇浣忓畢澶囦唤鏁版嵁_鍒嗛〉
+ /// </summary>
+ [System.Serializable]
+ public class GetHomeDataBackupPaggerObj : BaseAccountCtrlObj
+ {
+ public string BackupType = "0";
+ public string GatewayUniqueId;
+ public PageSettingObj PageSetting = new PageSettingObj ();
+ }
+ #endregion
+
+ #region 1.25 鑾峰彇澶囦唤鏂囦欢涓嶅甫鏁版嵁_鍒嗛〉
+ /// <summary>
+ /// 鑾峰彇澶囦唤鏂囦欢涓嶅甫鏁版嵁_鍒嗛〉
+ /// </summary>
+ [System.Serializable]
+ public class GetHomeDataBackupUploadListPaggerObj : BaseAccountCtrlObj
+ {
+ public bool IsGatewayAutoBackup = false;
+ public string GatewayUniqueId;
+ public string BackupClassId;
+ public PageSettingObj PageSetting = new PageSettingObj ();
+ }
+ #endregion
+
+
+
+ #region 1.26 涓嬭浇鏌愪竴涓浠芥暟鎹枃浠�
+ /// <summary>
+ /// 涓嬭浇鏌愪竴涓浠芥暟鎹枃浠�
+ /// </summary>
+ [System.Serializable]
+ public class DownloadSomeDataBackupObj : BaseAccountCtrlObj
+ {
+ /// <summary>
+ /// 涓嬭浇鐨勬枃浠跺悕绉�
+ /// </summary>
+ public string BackupFileName;
+ /// <summary>
+ /// BackupClassId
+ /// </summary>
+ public string BackupClassId = "";
+ /// <summary>
+ /// 褰撳墠鑾峰彇鏄惁涓虹綉鍏宠嚜鍔ㄥ浠�
+ /// </summary>
+ public bool IsGatewayAutoBackup = false;
+ /// <summary>
+ /// ZigbeeUniqueId 缃戝叧鐨勫敮涓�Id 褰揑sGatewayBackup= true鏃讹紝姝ゅ弬鏁板繀椤绘彁渚�
+ /// </summary>
+ public string GatewayUniqueId = null;
+
+ }
+ #endregion
+
+
+ #region 1.27 鍒犻櫎椤圭洰 (浣忓畢)鍚勭澶囦唤鏂囦欢澶�
+ /// <summary>
+ /// 鍒犻櫎椤圭洰 (浣忓畢)鍚勭澶囦唤鏂囦欢澶�
+ /// </summary>
+ [System.Serializable]
+ public class DelHomeAppGatewayNameObj : BaseAccountCtrlObj
+ {
+ /// <summary>
+ /// 澶囨敞鍚嶄富閿�
+ /// </summary>
+ public string BackupClassId;
+ }
+ #endregion
+
+ #region 1.28 鏇存柊椤圭洰(浣忓畢)[App(缃戝叧)鎵嬪姩澶囦唤]澶囨敞鍚�
+ /// <summary>
+ /// 鏇存柊椤圭洰(浣忓畢)[App(缃戝叧)鎵嬪姩澶囦唤]澶囨敞鍚�
+ /// </summary>
+ [System.Serializable]
+ public class UpdateHomeAppGatewayNameObj : BaseAccountCtrlObj
+ {
+ /// <summary>
+ /// 鏇存柊澶囨敞鍚�
+ /// </summary>
+ public string BackupName;
+ /// <summary>
+ /// 澶囨敞鍚嶄富閿�
+ /// </summary>
+ public string BackupClassId;
+ }
+ #endregion
+
+ #region 1.29 椤圭洰 (浣忓畢)涓婣pp鑷姩澶囦唤
+ /// <summary>
+ /// 椤圭洰 (浣忓畢)涓婣pp鑷姩澶囦唤
+ /// </summary>
+ [System.Serializable]
+ public class HomeAppAutoDataBackupObj : BaseAccountCtrlObj
+ {
+
+ }
+ #endregion
+
+ #endregion
+
+
+ #region 6銆佺粦瀹�
+ #region 1.61 缁戝畾缃戝叧鍒伴」鐩�(浣忓畢)
+ /// <summary>
+ /// 缁戝畾缃戝叧鍒伴」鐩�(浣忓畢)
+ /// </summary>
+ [System.Serializable]
+ public class BindGatewayToHomeObj : BaseAccountCtrlObj
+ {
+ /// <summary>
+ /// 缃戝叧ID鍒楄〃
+ /// </summary>
+ public List<string> BindGateways = new List<string> ();
+ }
+ #endregion
+
+ #region 1.62 瑙ｇ粦瀹氱綉鍏冲埌椤圭洰(浣忓畢)
+ /// <summary>
+ /// 缁戝畾缃戝叧鍒伴」鐩�(浣忓畢)
+ /// </summary>
+ [System.Serializable]
+ public class ReleaseGatewayToHomeObj : BaseAccountCtrlObj
+ {
+ /// <summary>
+ /// 缃戝叧ID鍒楄〃
+ /// </summary>
+ public List<string> BindGateways = new List<string> ();
+ }
+ #endregion
+
+ #region 1.63 鑾峰緱鏌愪釜甯愬彿鎵�鏈夊凡缁戝畾鐨勭綉鍏冲垎椤�
+ /// <summary>
+ /// 鑾峰緱鏌愪釜甯愬彿鎵�鏈夊凡缁戝畾鐨勭綉鍏冲垎椤�
+ /// </summary>
+ [System.Serializable]
+ public class GetAllBindGatewarysPaggerObj : BaseNoTokenObj
+ {
+ /// <summary>
+ /// 椤圭洰(浣忓畢)绫诲瀷(0:Zigbee 1:Buspro銆�3:Knx
+ /// </summary>
+ public int HomeType = 1;
+ public BaseReqDtoObj ReqDto = new BaseReqDtoObj();
+ }
+ #endregion
+
+ #region 1.64 鑾峰彇鏌愪釜浣忓畢鐨勭綉鍏冲垎椤�
+ /// <summary>
+ /// 鑾峰彇鏌愪釜浣忓畢鐨勭綉鍏冲垎椤�
+ /// </summary>
+ [System.Serializable]
+ public class GetSingleHomeGatewayPaggerObj : BaseNoTokenObj
+ {
+ public GetSingleHomeReqDtoObj ReqDto = new GetSingleHomeReqDtoObj() ;
+ }
+
+ [System.Serializable]
+ public class GetSingleHomeReqDtoObj : BaseAccountCtrlObj
+ {
+ /// <summary>
+ /// 鎼滅储缃戝叧鍞竴鏍囪瘑 榛樿涓簄ull
+ /// </summary>
+ public string GatewayUniqueId;
+
+ public PageSettingObj PageSetting = new PageSettingObj ();
+ }
+ #endregion
+
+
+ #region 1.65 UpdateMac
+ /// <summary>
+ /// UpdateMac 鏇存柊Mac(鍗板害)
+ /// </summary>
+ [System.Serializable]
+ public class UpdateMacObj : BaseRequestObj
+ {
+ /// <summary>
+ /// 浣忓畢Id
+ /// </summary>
+ public string HomeId;
+ public string OldMac;
+ public string NewMac;
+
+ }
+ #endregion
+
+
+
+ #endregion
+
+ #region 8銆侀」鐩�(浣忓畢)
+ #region AddHome 1.81椤圭洰(浣忓畢) - 1銆佹坊鍔犻」鐩�(浣忓畢)
+ /// <summary>
+ /// 娣诲姞椤圭洰(浣忓畢)
+ /// </summary>
+ [System.Serializable]
+ public class AddHomeObj : BaseRequestObj
+ {
+ /// <summary>
+ /// 浣忓畢鍖哄煙鍚嶇О
+ /// </summary>
+ public string Name;
+ /// <summary>
+ /// 椤圭洰(浣忓畢)绫诲瀷(0:Zigbee 1:Buspro銆�3:Knx
+ /// </summary>
+ public int HomeType = 1;
+ }
+ #endregion
+
+ #region DelHome 1.82鍒犻櫎椤圭洰(浣忓畢)
+ /// <summary>
+ /// 鍒犻櫎椤圭洰(浣忓畢)
+ /// </summary>
+ [System.Serializable]
+ public class DelHomeObj : BaseRequestObj
+ {
+ /// <summary>
+ /// 椤圭洰(浣忓畢)Id -->閿悕 : HomeId
+ /// </summary>
+ public string HomeId;
+
+ }
+ #endregion
+
+ #region EditHome 1.83缂栬緫椤圭洰(浣忓畢)
+ /// <summary>
+ /// 鍒犻櫎椤圭洰(浣忓畢)
+ /// </summary>
+ [System.Serializable]
+ public class EditHomeObj : BaseRequestObj
+ {
+ /// <summary>
+ /// 椤圭洰(浣忓畢)Id -->閿悕 : HomeId
+ /// </summary>
+ public string HomeId;
+ /// <summary>
+ /// 浣忓畢鍖哄煙鍚嶇О
+ /// </summary>
+ public string Name;
+ /// <summary>
+ /// 椤圭洰(浣忓畢)绫诲瀷(0:Zigbee 1:Buspro銆�3:Knx
+ /// </summary>
+ public int HomeType = 1;
+
+ }
+ #endregion
+
+ #region AddHome 1.84 鑾峰彇椤圭洰 (浣忓畢)鍒嗛〉
+ [System.Serializable]
+ public class GetHomePagerReqDtoObj: BaseReqDtoObj
+ {
+ public string Name;
+
+ }
+
+ /// <summary>
+ /// 鑾峰彇椤圭洰 (浣忓畢)鍒嗛〉
+ /// </summary>
+ [System.Serializable]
+ public class GetHomePagerObj : BaseNoTokenObj
+ {
+ /// <summary>
+ /// 椤圭洰(浣忓畢)绫诲瀷(0:Zigbee 1:Buspro銆�3:Knx
+ /// </summary>
+ public int HomeType = 1;
+ public GetHomePagerReqDtoObj ReqDto = new GetHomePagerReqDtoObj ();
+ }
+ #endregion
+
+ #region 1.85 鑾峰彇鎺у埗鍒嗕韩椤圭洰 (浣忓畢)璇锋眰淇℃伅
+ /// <summary>
+ /// 鑾峰彇鎺у埗鍒嗕韩椤圭洰 (浣忓畢)璇锋眰淇℃伅
+ /// </summary>
+ [System.Serializable]
+ public class GetSharedHomeApiControlObj : BaseRequestObj
+ {
+ /// <summary>
+ /// 鍒嗕韩鑰匢d -->閿悕 : MainAccountId
+ /// </summary>
+ public string MainAccountId;
+
+ /// <summary>
+ /// 鍒嗕韩鑰呬綇瀹匢d -->閿悕 : SharedHid
+ /// </summary>
+ public string SharedHid;
+
+
+ }
+ #endregion
+
+ #endregion
+
+
+ #region ZigbeeUsers
+
+ #region 2.11 浣跨敤甯愬彿瀵嗙爜鐧诲綍
+ /// <summary>
+ /// 浣跨敤甯愬彿瀵嗙爜鐧诲綍
+ /// </summary>
+ [System.Serializable]
+ public class LoginObj : BaseNoTokenObj
+ {
+ public string Account;
+ public string Password;
+ public int Company;
+ }
+ #endregion
+
+
+ ///Zigbee鐢ㄦ埛妯″潡
+ #region UpdatePassword 2.33淇敼瀵嗙爜 鍔熻兘鎻忚堪锛氫慨鏀瑰綋鍓嶈处鍙风殑瀵嗙爜
+ /// <summary>
+ /// Need Authorization
+ /// 鍝嶅簲鐘舵�佺爜
+ //(1)Success 鍒欒皟鐢ㄦ鎺ュ彛鎴愬姛
+ //(2)NewPasswordAndOldPasswordEqual 鍘熷瘑鐮佸拰鏂板瘑鐮佺浉鍚�
+ //(3)OldPwdNoYes 鍘熷瘑鐮侀敊璇�
+ //(4)Fail 鎿嶄綔澶辫触
+ //(5)AccountNoExists 鐢ㄦ埛涓嶅瓨鍦�
+ /// </summary>
+ [System.Serializable]
+ public class UpdatePasswordObj:BaseNoTokenObj
+ {
+ public string OldPassword;// 鍘熷瘑鐮� string 鏄�
+ public string NewPassword;// 鏂板瘑鐮� string 鏄�
+ }
+
+
+
+ #region 2.314 妫�娴嬪笎鍙锋槸鍚﹀瓨鍦�
+ /// <summary>
+ /// 妫�娴嬪笎鍙锋槸鍚﹀瓨鍦�
+ /// </summary>
+ [System.Serializable]
+ public class DetectionAccountObj : BaseNoTokenObj
+ {
+ public string Account;
+ }
+ #endregion
+
+ #region 2.320 娉ㄥ唽 鍔熻兘鎻忚堪锛氱敤鎴锋墜鏈哄拰閭娉ㄥ唽
+ [System.Serializable]
+ public class YdRegisterAccountObj: BaseNoTokenObj
+ {
+ public string Account;
+ public string Password;
+ public string Language;//璇█ (鍥哄畾涓猴細Chinese鍜孍nglish) string 鏄�
+ public string Contact;
+ public int Company;
+ }
+
+ #endregion
+
+ #region YdForgetPasswordObj 2.321 鍔熻兘鎻忚堪锛氬繕璁板瘑鐮侀偖浠跺舰寮�
+ [System.Serializable]
+ public class YdForgetPasswordObj:BaseNoTokenObj
+ {
+ public string Account;// 璐﹀彿 string 鏄�
+ public int Company;
+ }
+
+ #endregion
+
+
+
+ #region BindSubAccount 2.322 鍔熻兘鎻忚堪锛氱粦瀹氬瓙璐﹀彿鍒伴」鐩�
+ [System.Serializable]
+ public class BindSubAccountObj : BaseNoTokenObj
+ {
+ public string SubAccount;//
+ /// <summary>
+ /// 浣忓畢Id
+ /// </summary>
+ public string HouseDistributedMark;
+ /// <summary>
+ /// 鏄惁鍏佽瀛愬笎鍙疯繙绋嬫帶鍒�
+ /// </summary>
+ public bool IsAllowRemoteCtrl = true;
+ }
+
+ #endregion
+
+ #region DeletedSubAccount 2.323 鍔熻兘鎻忚堪锛氳В闄ゅ瓙璐﹀彿鍜屼綇瀹呯殑缁戝畾
+ [System.Serializable]
+ public class DeletedSubAccountObj : BaseNoTokenObj
+ {
+ public string SubAccount;//
+ /// <summary>
+ /// 浣忓畢Id
+ /// </summary>
+ public string HouseDistributedMark;
+ }
+
+ #endregion
+
+ #region GetSubAccountByDistributedMark 2.324 鍔熻兘鎻忚堪锛氳幏鍙栭」鐩�(浣忓畢)涓嬮潰鐨勫瓙璐﹀彿
+ [System.Serializable]
+ public class GetSubAccountByDistributedMarkObj : BaseNoTokenObj
+ {
+ /// <summary>
+ /// 浣忓畢Id
+ /// </summary>
+ public string DistributedMark;
+ }
+
+ #endregion
+
+
+ #endregion
+
+ #region Alexa璁惧绠＄悊 閮ㄥ垎
+ #region UploadDevices 1.31涓婁紶璁惧淇℃伅 鍔熻兘鎻忚堪锛氫笂浼犺澶囦俊鎭��
+ ///// <summary>
+ ///// Need Authorizatin
+ ///// </summary>
+ //[System.Serializable]
+ //public class UploadDevicesObj:AlexaDevice
+ //{
+
+ //}
+
+
+ public class AlexaDeviceObj:BaseNoTokenObj
+ {
+ public string DeviceName;// 璁惧鍚� string 鏄�
+ public string DeviceType;// 璁惧埆绫诲瀷, 鍥哄畾涓�
+ public int SubnetID;// 瀛愮綉鍙� int 鏄�
+ public int DeviceID;// 璁惧鍙� int 鏄�
+ public int LoopID;// 鍥炶矾鍙� int 鏄�
+ public string MAC;// 闇�瑕佺粦瀹氱殑涓�绔彛MAC鐮� string 鏄�
+ public string RegionID;// 浣忓畢鍖哄煙缂栧彿 Int 鏄�
+ }
+
+ #endregion
+
+ #endregion
+
+
+ //********************************鏃�****************************************
//#region ON杞欢璇诲彇鎸囧畾鍖哄煙缃戝叧鍒楄〃锛屾柟娉曞悕锛欸atewayListON 鍙傛暟锛歊egionID 绫诲瀷锛歩nt
///// <summary>
@@ -40,19 +638,19 @@
#endregion
- #region Login 鐧诲綍 鍔熻兘鎻忚堪锛氱櫥褰曞悗鑾峰彇璁块棶浠ょ墝銆�
- [System.Serializable]
- public class LoginObj
- {
- public string Account;
+ //#region Login 鐧诲綍 鍔熻兘鎻忚堪锛氱櫥褰曞悗鑾峰彇璁块棶浠ょ墝銆�
+ //[System.Serializable]
+ //public class LoginObj
+ //{
+ // public string Account;
- public string Password;
+ // public string Password;
- public int Company;
+ // public int Company;
- }
+ //}
- #endregion
+ //#endregion
#region IsExistingAccount 楠岃瘉璐﹀彿鏄惁琚娇鐢� 鍔熻兘鎻忚堪锛氶獙璇佹墜鏈哄拰閭鏄惁琚敞鍐�
[System.Serializable]
@@ -63,18 +661,18 @@
#endregion
- #region SignIn 娉ㄥ唽 鍔熻兘鎻忚堪锛氱敤鎴锋墜鏈哄拰閭娉ㄥ唽
- [System.Serializable]
- public class SignInObj
- {
- public string Account;
- public string Password;
- public string Language;//璇█ (鍥哄畾涓猴細Chinese鍜孍nglish) string 鏄�
- public string Contact;
- public int Company;
- }
+ //#region SignIn 娉ㄥ唽 鍔熻兘鎻忚堪锛氱敤鎴锋墜鏈哄拰閭娉ㄥ唽
+ //[System.Serializable]
+ //public class SignInObj
+ //{
+ // public string Account;
+ // public string Password;
+ // public string Language;//璇█ (鍥哄畾涓猴細Chinese鍜孍nglish) string 鏄�
+ // public string Contact;
+ // public int Company;
+ //}
- #endregion
+ //#endregion
#region SignPhone 鍔熻兘鎻忚堪锛氬彂閫佹墜鏈洪獙璇佺爜
[System.Serializable]
@@ -96,15 +694,15 @@
#endregion
- #region ForgetPassword 鍔熻兘鎻忚堪锛氭牴鎹处鍙风被鍨嬪彂閫侀獙璇佹柟寮�(閭璐﹀彿鍙戦�侀偖浠讹紝鎵嬫満璐﹀彿鍙戦�佺煭淇￠獙璇佺爜锛�
- [System.Serializable]
- public class ForgetPasswordObj
- {
- public string Account;// 璐﹀彿 string 鏄�
- public int Company;
- }
+ //#region ForgetPassword 鍔熻兘鎻忚堪锛氭牴鎹处鍙风被鍨嬪彂閫侀獙璇佹柟寮�(閭璐﹀彿鍙戦�侀偖浠讹紝鎵嬫満璐﹀彿鍙戦�佺煭淇￠獙璇佺爜锛�
+ //[System.Serializable]
+ //public class ForgetPasswordObj
+ //{
+ // public string Account;// 璐﹀彿 string 鏄�
+ // public int Company;
+ //}
- #endregion
+ //#endregion
#region ForgetPasswordAction 鍔熻兘鎻忚堪锛氬繕璁板瘑鐮侊紝鎵嬫満鍙锋壘鍥炲瘑鐮佹柟娉�
[System.Serializable]
@@ -115,16 +713,16 @@
}
#endregion
- #region UpdatePassword 1.8淇敼瀵嗙爜 鍔熻兘鎻忚堪锛氫慨鏀瑰綋鍓嶈处鍙风殑瀵嗙爜
- /// <summary>
- /// Need Authorization
- /// </summary>
- [System.Serializable]
- public class UpdatePasswordObj
- {
- public string OldPassword;// 鍘熷瘑鐮� string 鏄�
- public string Password;// 鏂板瘑鐮� string 鏄�
- }
+ //#region UpdatePassword 1.8淇敼瀵嗙爜 鍔熻兘鎻忚堪锛氫慨鏀瑰綋鍓嶈处鍙风殑瀵嗙爜
+ ///// <summary>
+ ///// Need Authorization
+ ///// </summary>
+ //[System.Serializable]
+ //public class UpdatePasswordObj
+ //{
+ // public string OldPassword;// 鍘熷瘑鐮� string 鏄�
+ // public string Password;// 鏂板瘑鐮� string 鏄�
+ //}
#endregion
#region UpdateUserInformation 1.9鏇存柊鎴栬缃敤鎴峰熀鏈俊鎭� 鍔熻兘鎻忚堪锛氫慨鏀规垨璁剧疆褰撳墠鐧诲綍鐨勭敤鎴峰熀鏈俊鎭�
@@ -174,18 +772,18 @@
}
#endregion
- #region SignSubAccount 1.13娉ㄥ唽瀛愯处鍙� 鍔熻兘鎻忚堪锛氬綋鍓嶇櫥褰曡处鍙锋敞鍐屽瓙璐﹀彿
- /// <summary>
- /// Need Authorzation
- /// </summary>
- [System.Serializable]
- public class SignSubAccountObj
- {
- public string Email;// 璐﹀彿 string 鏄�
- public string Password;// 瀵嗙爜 string 鏄�
- public string Remark;// 澶囨敞 string 鏄�
- }
- #endregion
+ //#region SignSubAccount 1.13娉ㄥ唽瀛愯处鍙� 鍔熻兘鎻忚堪锛氬綋鍓嶇櫥褰曡处鍙锋敞鍐屽瓙璐﹀彿
+ ///// <summary>
+ ///// Need Authorzation
+ ///// </summary>
+ //[System.Serializable]
+ //public class SignSubAccountObj
+ //{
+ // public string Email;// 璐﹀彿 string 鏄�
+ // public string Password;// 瀵嗙爜 string 鏄�
+ // public string Remark;// 澶囨敞 string 鏄�
+ //}
+ //#endregion
#region EditSubAccount 1.14缂栬緫瀛愯处鍙� 鍔熻兘鎻忚堪锛氱紪杈戝瓙璐﹀彿鐨勫娉ㄥ拰瀵嗙爜
@@ -203,16 +801,16 @@
#endregion
- #region RemoveSubAccount 1.15鍒犻櫎瀛愯处鍙� 鍔熻兘鎻忚堪锛氬垹闄ゅ瓙璐﹀彿
- /// <summary>
- /// Need Authorization
- /// </summary>
- [System.Serializable]
- public class RemoveSubAccountObj
- {
- public string Email;
- }
- #endregion
+ //#region RemoveSubAccount 1.15鍒犻櫎瀛愯处鍙� 鍔熻兘鎻忚堪锛氬垹闄ゅ瓙璐﹀彿
+ ///// <summary>
+ ///// Need Authorization
+ ///// </summary>
+ //[System.Serializable]
+ //public class RemoveSubAccountObj
+ //{
+ // public string Email;
+ //}
+ //#endregion
#region DisableDebug 1.16绂佺敤璋冭瘯璐﹀彿 鍔熻兘鎻忚堪锛氱鐢ㄥ綋鍓嶈处鍙风殑璋冭瘯璐﹀彿
@@ -288,19 +886,23 @@
#endregion
- #region 鍏充簬鍖哄煙鐨勬柟娉�
- #region AddHome 1.23鍒涘缓涓�涓綇瀹呭尯鍩� 鍔熻兘鎻忚堪锛氬垱寤轰竴涓敤鎴蜂綇瀹呭尯鍩�
- /// <summary>
- /// Need Authorization
- /// </summary>
- [System.Serializable]
- public class AddHomeObj
- {
- /// <summary>
- /// 浣忓畢鍖哄煙鍚嶇О
- /// </summary>
- public string Name;
- }
+ //#region 鍏充簬鍖哄煙鐨勬柟娉�
+ //#region AddHome 1.23鍒涘缓涓�涓綇瀹呭尯鍩� 鍔熻兘鎻忚堪锛氬垱寤轰竴涓敤鎴蜂綇瀹呭尯鍩�
+ ///// <summary>
+ ///// Need Authorization
+ ///// </summary>
+ //[System.Serializable]
+ //public class AddHomeObj: BaseRequestObj
+ //{
+ // /// <summary>
+ // /// 浣忓畢鍖哄煙鍚嶇О
+ // /// </summary>
+ // public string Name;
+
+ // public string LoginAccessToken;
+
+ //}
+
[System.Serializable]
public class AddHomeAndGatewayByONObj
{
@@ -316,68 +918,68 @@
#endregion
- #region HomeList 1.24鑾峰彇鐢ㄦ埛鐨勪綇瀹呭尯鍩熷垪琛� 鍔熻兘鎻忚堪锛氳幏鍙栫敤鎴锋墍鏈変綇瀹呭尯鍩熺殑鍒楄〃
- /// <summary>
- /// Need Authorization
- /// </summary>
- [System.Serializable]
- public class HomeListObj
- {
+ //#region HomeList 1.24鑾峰彇鐢ㄦ埛鐨勪綇瀹呭尯鍩熷垪琛� 鍔熻兘鎻忚堪锛氳幏鍙栫敤鎴锋墍鏈変綇瀹呭尯鍩熺殑鍒楄〃
+ ///// <summary>
+ ///// Need Authorization
+ ///// </summary>
+ //[System.Serializable]
+ //public class HomeListObj
+ //{
- }
- #endregion
+ //}
+ //#endregion
#region EditHome 1.25缂栬緫浣忓畢鍖哄煙鍚嶇О 鍔熻兘鎻忚堪锛氱紪杈戜綇瀹呭尯鍩熷悕绉�
- /// <summary>
- /// Need Authorization
- /// </summary>
- [System.Serializable]
- public class EditHomeObj
- {
- public string Name;// 浣忓畢鍖哄煙鍚嶇О string 鏄�
- public string Id;// 浣忓畢鍖哄煙缂栧彿 Int 鏄�
- }
- #endregion
- #region EditMACByON 淇敼浣忓畢缁戝畾鐨刴ac
- [System.Serializable]
- public class EditMACByONObj
- {
- /// <summary>
- /// 淇敼鐨勬柊鐨刴ac
- /// </summary>
- public string MAC;
- /// <summary>
- /// mac 鐨刬d
- /// </summary>
- public int Id;
+ ///// <summary>
+ ///// Need Authorization
+ ///// </summary>
+ //[System.Serializable]
+ //public class EditHomeObj
+ //{
+ // public string Name;// 浣忓畢鍖哄煙鍚嶇О string 鏄�
+ // public string Id;// 浣忓畢鍖哄煙缂栧彿 Int 鏄�
+ //}
+ //#endregion
+ //#region EditMACByON 淇敼浣忓畢缁戝畾鐨刴ac
+ //[System.Serializable]
+ //public class EditMACByONObj
+ //{
+ // /// <summary>
+ // /// 淇敼鐨勬柊鐨刴ac
+ // /// </summary>
+ // public string MAC;
+ // /// <summary>
+ // /// mac 鐨刬d
+ // /// </summary>
+ // public int Id;
- }
- [System.Serializable]
- public class EditMACByHomeId
- {
- /// <summary>
- /// 淇敼鐨勬柊鐨刴ac
- /// </summary>
- public string MAC;
- /// <summary>
- /// Home 鐨刬d
- /// </summary>
- public string RegionID;
+ //}
+ //[System.Serializable]
+ //public class EditMACByHomeId
+ //{
+ // /// <summary>
+ // /// 淇敼鐨勬柊鐨刴ac
+ // /// </summary>
+ // public string MAC;
+ // /// <summary>
+ // /// Home 鐨刬d
+ // /// </summary>
+ // public string RegionID;
- public bool IsReBind;
+ // public bool IsReBind;
- }
- #endregion
- #region DeleteHome 1.26鍒犻櫎鏁翠釜浣忓畢鍖哄煙 鍔熻兘鎻忚堪锛氬垹闄ゆ暣涓綇瀹呭尯鍩�
- /// <summary>
- /// Need Authorzation
- /// </summary>
- [System.Serializable]
- public class DeleteHomeObj
- {
- public string Id;// 浣忓畢鍖哄煙缂栧彿 int 鏄�
- }
- #endregion
+ //}
+ ////#endregion
+ //#region DeleteHome 1.26鍒犻櫎鏁翠釜浣忓畢鍖哄煙 鍔熻兘鎻忚堪锛氬垹闄ゆ暣涓綇瀹呭尯鍩�
+ ///// <summary>
+ ///// Need Authorzation
+ ///// </summary>
+ //[System.Serializable]
+ //public class DeleteHomeObj
+ //{
+ // public string Id;// 浣忓畢鍖哄煙缂栧彿 int 鏄�
+ //}
+ //#endregion
#region UploadDevices 1.30涓婁紶缃戝叧璁惧 鍔熻兘鎻忚堪锛氫笂浼犵綉鍏充俊鎭�
/// <summary>
@@ -393,36 +995,36 @@
public string RegionID;// 浣忓畢鍖哄煙缂栧彿 int 鏄�
}
#endregion
- #region UploadDevices 1.31涓婁紶璁惧淇℃伅 鍔熻兘鎻忚堪锛氫笂浼犺澶囦俊鎭��
- /// <summary>
- /// Need Authorizatin
- /// </summary>
- [System.Serializable]
- public class UploadDevicesObj
- {
- public AlexaDevice Device = new AlexaDevice();
- }
- public class AlexaDevice
- {
- public string DeviceName;// 璁惧鍚� string 鏄�
- public string DeviceType;// 璁惧埆绫诲瀷, 鍥哄畾涓�
- public int SubnetID;// 瀛愮綉鍙� int 鏄�
- public int DeviceID;// 璁惧鍙� int 鏄�
- public int LoopID;// 鍥炶矾鍙� int 鏄�
- public string MAC;// 闇�瑕佺粦瀹氱殑涓�绔彛MAC鐮� string 鏄�
- public string RegionID;// 浣忓畢鍖哄煙缂栧彿 Int 鏄�
- }
+ //#region UploadDevices 1.31涓婁紶璁惧淇℃伅 鍔熻兘鎻忚堪锛氫笂浼犺澶囦俊鎭��
+ ///// <summary>
+ ///// Need Authorizatin
+ ///// </summary>
+ //[System.Serializable]
+ //public class UploadDevicesObj
+ //{
+ // public AlexaDevice Device = new AlexaDevice();
+ //}
+ //public class AlexaDevice
+ //{
+ // public string DeviceName;// 璁惧鍚� string 鏄�
+ // public string DeviceType;// 璁惧埆绫诲瀷, 鍥哄畾涓�
+ // public int SubnetID;// 瀛愮綉鍙� int 鏄�
+ // public int DeviceID;// 璁惧鍙� int 鏄�
+ // public int LoopID;// 鍥炶矾鍙� int 鏄�
+ // public string MAC;// 闇�瑕佺粦瀹氱殑涓�绔彛MAC鐮� string 鏄�
+ // public string RegionID;// 浣忓畢鍖哄煙缂栧彿 Int 鏄�
+ //}
- #endregion
+ //#endregion
#region GatewayList 1.32璇诲彇鐢ㄦ埛鎵�鏈夌綉鍏冲垪琛� 鍔熻兘鎻忚堪锛氳鍙栧綋鍓嶇敤鎴风殑鎵�鏈変竴绔彛
- /// <summary>
- /// Need Authorization
- /// </summary>
- [System.Serializable]
- public class GatewayListObj
- {
+ ///// <summary>
+ ///// Need Authorization
+ ///// </summary>
+ //[System.Serializable]
+ //public class GatewayListObj
+ //{
- }
+ //}
[System.Serializable]
public class GatewayMACObj
{
@@ -481,34 +1083,34 @@
#endregion
#region 澶囦唤鎭㈠鏁版嵁
- /// <summary>
- /// 娣诲姞澶囦唤鐩綍
- /// </summary>
- [Serializable]
- public class AddFolderObj
- {
- /// <summary>
- /// 鍖哄煙ID
- /// </summary>
- public string LevelID ;
- /// <summary>
- /// 澶囦唤鐩綍鍚嶇О
- /// </summary>
- public string Name;
+ ///// <summary>
+ ///// 娣诲姞澶囦唤鐩綍
+ ///// </summary>
+ //[Serializable]
+ //public class AddFolderObj
+ //{
+ // /// <summary>
+ // /// 鍖哄煙ID
+ // /// </summary>
+ // public string LevelID ;
+ // /// <summary>
+ // /// 澶囦唤鐩綍鍚嶇О
+ // /// </summary>
+ // public string Name;
- }
+ //}
- /// <summary>
- /// 鑾峰彇鍖哄煙涓嬬殑澶囦唤鍒楄〃鐩綍
- /// </summary>
- [Serializable]
- public class GetUserFolderObj
- {
- /// <summary>
- /// 鍖哄煙ID
- /// </summary>
- public string LevelID;
- }
+ ///// <summary>
+ ///// 鑾峰彇鍖哄煙涓嬬殑澶囦唤鍒楄〃鐩綍
+ ///// </summary>
+ //[Serializable]
+ //public class GetUserFolderObj
+ //{
+ // /// <summary>
+ // /// 鍖哄煙ID
+ // /// </summary>
+ // public string LevelID;
+ //}
/// <summary>
/// 澶囦唤鏂囦欢澶归噷闈㈢殑鏂囦欢鐩綍
@@ -530,33 +1132,50 @@
public int Id;
}
+ ///// <summary>
+ ///// 涓婁紶澶囦唤鏂囦欢鏁版嵁
+ ///// </summary>
+ //[Serializable]
+ //public class AddUserBackupObj
+ //{
+ // /// <summary>
+ // /// wenjian mingcheng
+ // /// </summary>
+ // public string Name;
+ // /// <summary>
+ // /// 鏂囦欢鏁版嵁
+ // /// </summary>
+ // public byte [] DetailByte;
+ // /// <summary>
+ // /// 鏂囦欢澶� ID
+ // /// </summary>
+ // public int LevelID;
+ //}
+
+ ///// <summary>
+ ///// Delete backup data.
+ ///// </summary>
+ //[Serializable]
+ //public class DeleteFolderDataObj
+ //{
+ // public int Id;
+ //}
+
+
+
/// <summary>
- /// 涓婁紶澶囦唤鏂囦欢鏁版嵁
+ /// 涓嶆槸鍦ㄦ湰鍖哄煙鐨勭櫥褰曞搷搴�,闇�瑕侀噸瀹氬悜鍒拌姹傚緱鍒扮殑鍩熷悕涓�--RegionServer
/// </summary>
[Serializable]
- public class AddUserBackupObj
+ public class UserLoginLocalRegionRes
{
+ public string RegionName;
/// <summary>
- /// wenjian mingcheng
+ /// 璇烽噸瀹氬悜鍒版鍩熷悕涓嬪搴旀帴鍙ｈ姹�
/// </summary>
- public string Name;
- /// <summary>
- /// 鏂囦欢鏁版嵁
- /// </summary>
- public byte [] DetailByte;
- /// <summary>
- /// 鏂囦欢澶� ID
- /// </summary>
- public int LevelID;
+ public string RegionServer;
}
- /// <summary>
- /// Delete backup data.
- /// </summary>
- [Serializable]
- public class DeleteFolderDataObj
- {
- public int Id;
- }
+
#endregion
--
Gitblit v1.8.0