From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/DAL/Server/NewApiRes.cs | 504 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 303 insertions(+), 201 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index ff11be3..5f99529 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -219,7 +219,7 @@
/// </summary>
public string mail;
/// <summary>
- /// 1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱粦瀹�4:楠岃瘉鐮佺櫥闄� 5:鏁忔劅鏁版嵁
+ /// 1锛氭敞鍐� 2锛氭壘鍥炲瘑鐮� 3锛氱粦瀹� 4锛氶獙璇佺爜鐧婚檰 5锛氭晱鎰熸暟鎹�
/// 榛樿浼�1
/// </summary>
public int verifyType = 1;
@@ -227,6 +227,10 @@
/// 楠岃瘉鐮佽繃鏈熸椂闂达紙绉掞級,榛樿5鍒嗛挓
/// </summary>
public string verifyCode;
+ /// <summary>
+ /// 楠岃瘉鎴愬姛鍚庨獙璇佺爜鏄惁澶辨晥 涓嶄紶鍊兼垨鑰卼rue澶辨晥锛屽彧鏈変紶false鐨勬椂鍊欙紝鏍￠獙閫氳繃鍚庨獙璇佺爜涔熶笉澶辨晥
+ /// </summary>
+ public bool verifySuccessFail = true;
}
@@ -304,6 +308,14 @@
/// 鐢ㄦ埛鎵嬫満鍙�
/// </summary>
public string memberPhone;
+ /// <summary>
+ /// 鍥藉鍖哄彿
+ /// </summary>
+ public string memberPhonePrefix;
+ /// <summary>
+ /// 鐧诲綍鍚�
+ /// </summary>
+ public string loginName;
}
@@ -334,7 +346,7 @@
/// <summary>
/// 鐢ㄦ埛鎵嬫満
/// </summary>
- public string memberMail;
+ public string memberEmail;
/// <summary>
/// 楠岃瘉鍚�
/// </summary>
@@ -342,6 +354,19 @@
}
+
+ /// <summary>
+ /// 瑙ｇ粦缁戝畾璁よ瘉(鎵嬫満/閭)
+ /// </summary>
+ [System.Serializable]
+ public class UnBindAccountObj
+ {
+ /// <summary>
+ /// 瑙ｇ粦鏍囩ず锛孭HONE锛孍MAIL
+ /// </summary>
+ public string unBindLabel;
+ }
+
#endregion
@@ -380,6 +405,10 @@
/// 浣忓畢鍚嶇О
/// </summary>
public string homeName;
+ /// <summary>
+ /// 浣忓畢鍦板潃
+ /// </summary>
+ public string Address;
}
@@ -755,6 +784,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]
@@ -786,16 +830,9 @@
/// 鍒犻櫎瀛愯处鍙�
/// </summary>
[System.Serializable]
- public class ChildDeleteObj
+ public class ChildDeleteObj: ChildBaseObj
{
- /// <summary>
- ///
- /// </summary>
- public string childAccountId;
- /// <summary>
- /// 浣忓畢
- /// </summary>
- public string homeId;
+
}
/// <summary>
@@ -860,21 +897,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>
@@ -885,6 +925,18 @@
public string childAccountType;
}
+ /// <summary>
+ /// 淇敼鏄惁鍏佽鍒涘缓鍦烘櫙
+ /// </summary>
+ [System.Serializable]
+ public class UpdateChildAllowCreateSceneObj : ChildBaseObj
+ {
+ /// <summary>
+ /// 鏄惁鍏佽鍒涘缓鍦烘櫙
+ /// </summary>
+ public bool isAllowCreateScene;
+
+ }
#endregion
#region 鏁版嵁鍒嗕韩
@@ -892,16 +944,8 @@
/// 鏌ヨ鏌愪綇瀹呮煇瀛愯处鍙风殑鍒嗕韩鏂囦欢淇℃伅
/// </summary>
[System.Serializable]
- public class HomeShareFindAll
+ public class HomeShareFindAll : ChildBaseObj
{
- /// <summary>
- /// 浣忓畢ID
- /// </summary>
- public string homeId;
- /// <summary>
- /// 瀛愯处鍙穒d
- /// </summary>
- public string childAccountId;
}
@@ -980,7 +1024,7 @@
/// </summary>
public string deviceName;
/// <summary>
- ///
+ /// Android銆両OS銆乄inPhone
/// </summary>
public string deviceType;
/// <summary>
@@ -990,23 +1034,50 @@
/// <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 GetMessageListObj: PushIdObj
+ {
+ /// <summary>
+ /// 浣忓畢涓婚敭id
+ /// 1銆佷紶绌烘煡璇㈠叏閮紙闇�瑕佹牴鎹敤鎴峰煙鍚嶆煡璇級 2銆佷紶鎸囧畾浣忓畢ID鏌ヨ鎸囧畾璁板綍 锛堥渶瑕佹牴鎹綇瀹呭煙鍚嶆煡璇級
+ /// </summary>
+ public string homeId;
+ }
+
+ /// <summary>
+ /// 娑堟伅璁板綍Id
+ /// </summary>
+ [System.Serializable]
+ public class PushMsgIdObj
+ {
+ /// <summary>
+ /// 娑堟伅璁板綍Id
+ /// </summary>
+ public string msgId;
+ }
+
///// <summary>
///// 鎺ㄩ�佹秷鎭垪琛�
@@ -1062,190 +1133,221 @@
public string Id;
}
+ #region APP鐗堟湰妫�娴�
+ /// <summary>
+ /// ForceUpdateObj
+ /// </summary>
+ [System.Serializable]
+ public class ForceUpdateObj
+ {
+ /// <summary>
+ /// 鎵嬫満绫诲瀷
+ /// Android銆両OS銆乄inPhone
+ /// </summary>
+ public string DeviceType = PhoneDeviceType.Android.ToString();
+ /// <summary>
+ ///
+ /// </summary>
+ public string RequestVersion = MainPage.VersionString;
+ /// <summary>
+ /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus
+ /// </summary>
+ public string Software = SoftwareType.ON_Plus.ToString();
+ /// <summary>
+ /// 璇█
+ /// </summary>
+ public string LanguageType;
+ }
+
+ /// <summary>
+ /// 妫�娴嬫洿鏂拌繑鍥炲瓧娈�
+ /// </summary>
+ public class ForceUpdateInfo
+ {
+
+ ///// <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 鈻� 鏋氫妇 ____________________________
+ #region 鏁版嵁鍒嗕韩
/// <summary>
- /// 瀹㈡埛绔被鍨� 濡侶dlOn銆丒voyoHome銆佽皟璇曞疂
+ /// 娣诲姞鍒嗕韩
/// </summary>
- public enum APIClientType
+ [System.Serializable]
+ public class AddShareObj
{
+ /// <summary>
+ /// 浣忓畢ID
+ /// </summary>
+ public int homeId;
+ /// <summary>
+ ///
+ /// </summary>
+ public List<ShareDatasItem> shareDatas;
+ /// <summary>
+ /// 瀛愯处鍙稩D
+ /// </summary>
+ public List<string> childAccountIds;
+ }
- HdlOn,
- EvoyoHome,
- 璋冭瘯瀹�,
+
+ public class ShareDatasItem
+ {
+ /// <summary>
+ /// 鍒嗕韩绫诲瀷琛╥d
+ /// </summary>
+ public string shareTypeId;
+ /// <summary>
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// </summary>
+ public string shareType;
+ }
+
+
+ /// <summary>
+ /// 鍒犻櫎鍒嗕韩
+ /// </summary>
+ [System.Serializable]
+ public class DeleteShareObj
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public List<ShareDatasItem> shareDatas;
+ /// <summary>
+ /// 瀛愯处鍙稩D
+ /// </summary>
+ public List<string> childAccountIds;
}
/// <summary>
- /// 澶囦唤绫诲瀷
+ /// 鑾峰彇鍒嗕韩
/// </summary>
- public enum BackupClassify
+ [System.Serializable]
+ public class GetShareObj
{
/// <summary>
- /// 浜や簰澶囦唤
+ /// 浣忓畢ID
/// </summary>
- INTERACTIVE_ENGINEERING_BACKUP,
+ public int homeId;
/// <summary>
- /// 鑷畾涔夊伐绋嬪浠�
+ /// 鍒嗕韩涓婚敭ids
/// </summary>
- CUSTOM_PROJECT_BACKUP,
- /// <summary>
- /// 鐢ㄦ埛鑷姩澶囦唤
- /// </summary>
- AUTOMATIC_USER_BACKUP,
- /// <summary>
- /// 鐢ㄦ埛鑷畾涔夊浠�
- /// </summary>
- USER_DEFINED_BACKUP
- }
-
- /// <summary>
- /// BackupDataType
- /// </summary>
- public enum BackupDataType
- {
- HDL_ON,
- ZIGBEE,
- ZIGBEE_HOME,
- HDL_ON_PRO,
- BUSPRO
- }
-
- /// <summary>
- /// 浣忓畢绫诲瀷
- /// </summary>
- public enum HomeTypeEnum
- {
- ZIGBEE = 1,
- BUSPRO,
- A,
- ALL
- }
-
- /// <summary>
- /// 璇█绫诲瀷
- /// </summary>
- public enum LanguageTypeEnum
- {
- CHINESE,
- ENGLISH,
- }
-
- /// <summary>
- /// 鍙戦�侀獙璇佺爜鍔熻兘绫诲瀷
- /// </summary>
- public enum VerifyType
- {
- /// <summary>
- /// 鐢ㄦ埛娉ㄥ唽
- /// </summary>
- REGISTER_USER = 1,
- /// <summary>
- /// 蹇樿瀵嗙爜,鎵惧洖瀵嗙爜
- /// </summary>
- FIND_PASSWORD,
- /// <summary>
- /// 缁戝畾
- /// </summary>
- REGISTER_USER_SYSTEM,
- /// <summary>
- /// 楠岃瘉鐮佺櫥闄�
- /// </summary>
- VERIFY_LOGIN,
- /// <summary>
- /// 鏁忔劅鏁版嵁楠岃瘉
- /// </summary>
- SENSITIVE_DATA,
- }
-
- /// <summary>
- /// ChildAccountType
- /// </summary>
- public enum ChildAccountType
- {
- /// <summary>
- /// 涓昏处鍙疯嚜宸�(鏈汉)
- /// </summary>
- MYSELF = 0,
- /// <summary>
- /// 鏅��
- /// </summary>
- ORDINARY = 1,
- /// <summary>
- /// 璋冭瘯浜哄憳
- /// </summary>
- DEBUG,
- /// <summary>
- /// 绠＄悊鍛�
- /// </summary>
- ADMIN,
-
+ public List<string> ids;
}
#endregion
- #region 鏃ф帴鍙�
- /// <summary>
- ///
- /// </summary>
- public class FindCityObj
- {
- /// <summary>
- /// 鍩庡競ID
- /// </summary>
- public string Cid;
-
- /// <summary>
- ///
- /// </summary>
- public string Location;
-
- /// <summary>
- /// 鍩庡競
- /// </summary>
- public string City;
-
- /// <summary>
- ///
- /// </summary>
- public string Province;
-
- /// <summary>
- ///
- /// </summary>
- public string Country;
-
-
- /// <summary>
- ///
- /// </summary>
- public string TimeZone;
- }
- /// <summary>
- ///
- /// </summary>
- public class GetWeatherObj
- {
-
-
- public string Temperature;
-
- /// <summary>
- ///
- /// </summary>
- public string Humidity;
-
- /// <summary>
- ///
- /// </summary>
- public string PM25;
- /// <summary>
- ///
- /// </summary>
- public string Weather;
-
- }
#endregion
+
+
+ //#region 鏃ф帴鍙�
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public class FindCityObj
+ //{
+ // /// <summary>
+ // /// 鍩庡競ID
+ // /// </summary>
+ // public string Cid;
+
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // public string Location;
+
+ // /// <summary>
+ // /// 鍩庡競
+ // /// </summary>
+ // public string City;
+
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // public string Province;
+
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // public string Country;
+
+
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // public string TimeZone;
+ //}
+ ///// <summary>
+ /////
+ ///// </summary>
+ //public class GetWeatherObj
+ //{
+
+
+ // public string Temperature;
+
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // public string Humidity;
+
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // public string PM25;
+ // /// <summary>
+ // ///
+ // /// </summary>
+ // public string Weather;
+
+ //}
+ //#endregion
+
}
\ No newline at end of file
--
Gitblit v1.8.0