From a5ba89efa83d0a4afd0d25dbeba5989e4944b5b8 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 24 十一月 2020 18:57:56 +0800 Subject: [PATCH] 20201124;mqtt代码整理备份 --- HDL_ON/DAL/Server/NewApiRes.cs | 465 ++++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 291 insertions(+), 174 deletions(-) diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs index c449f04..6703451 100644 --- a/HDL_ON/DAL/Server/NewApiRes.cs +++ b/HDL_ON/DAL/Server/NewApiRes.cs @@ -6,12 +6,18 @@ #region **************************************鏂版湇鍔″櫒************************************** [System.Serializable] - public class Base3NoTokenObj + public class BaseNoTokenObj { //public string RequestVersion = MainPage.CodeIDString; ////璇锋眰鏉ユ簮 //public string clientType = MainPage.ClientType; + } + + [System.Serializable] + public class NullObj + { + } #region 鈻� 鍏ㄧ悆鍖哄煙鍒楄〃 ____________________________ @@ -164,7 +170,9 @@ public string memberName; } - //鍙戦�侀獙璇佺爜 + /// <summary> + /// 鍙戦�侀獙璇佺爜 + /// </summary> [System.Serializable] public class VerifyCodeSendObj { @@ -185,7 +193,7 @@ /// </summary> public string mail; /// <summary> - /// 1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱櫥闄� 4:缁戝畾 + /// 1:娉ㄥ唽 2锛氭壘鍥炲瘑鐮� 3锛氱粦瀹�4:楠岃瘉鐮佺櫥闄� 5:鏁忔劅鏁版嵁 /// 榛樿浼�1 /// </summary> public int verifyType = 1; @@ -193,6 +201,36 @@ /// 楠岃瘉鐮佽繃鏈熸椂闂达紙绉掞級,榛樿5鍒嗛挓 /// </summary> public int expireSecond = 300; + + } + + /// <summary> + /// 楠岃瘉楠岃瘉鐮� + /// </summary> + [System.Serializable] + public class VerifyCodeCheckObj + { + /// <summary> + /// 鎵嬫満鍙� + /// </summary> + public string phone; + /// <summary> + /// 閭 + /// </summary> + public string mail; + /// <summary> + /// 1锛氭敞鍐� 2锛氭壘鍥炲瘑鐮� 3锛氱粦瀹� 4锛氶獙璇佺爜鐧婚檰 5锛氭晱鎰熸暟鎹� + /// 榛樿浼�1 + /// </summary> + public int verifyType = 1; + /// <summary> + /// 楠岃瘉鐮佽繃鏈熸椂闂达紙绉掞級,榛樿5鍒嗛挓 + /// </summary> + public string verifyCode; + /// <summary> + /// 楠岃瘉鎴愬姛鍚庨獙璇佺爜鏄惁澶辨晥 涓嶄紶鍊兼垨鑰卼rue澶辨晥锛屽彧鏈変紶false鐨勬椂鍊欙紝鏍¢獙閫氳繃鍚庨獙璇佺爜涔熶笉澶辨晥 + /// </summary> + public bool verifySuccessFail = true; } @@ -247,6 +285,91 @@ #endregion + #region 鈻� 甯愬彿淇℃伅 ____________________________ + /// <summary> + /// 鑾峰彇涓汉淇℃伅 + /// </summary> + [System.Serializable] + public class MemberInfoRes + { + /// <summary> + /// 鐢ㄦ埛ID + /// </summary> + public string memberId; + /// <summary> + /// 鐢ㄦ埛鏄电О + /// </summary> + public string memberName; + /// <summary> + /// 鐢ㄦ埛閭 + /// </summary> + public string memberEmail; + /// <summary> + /// 鐢ㄦ埛鎵嬫満鍙� + /// </summary> + public string memberPhone; + /// <summary> + /// 鍥藉鍖哄彿 + /// </summary> + public string memberPhonePrefix; + /// <summary> + /// 鐧诲綍鍚� + /// </summary> + public string loginName; + + } + + /// <summary> + /// 鏇存柊涓汉淇℃伅 + /// </summary> + [System.Serializable] + public class UpdateMemberNameRes + { + /// <summary> + /// 鐢ㄦ埛鏄电О + /// </summary> + public string memberName; + + } + + + /// <summary> + /// 缁戝畾璁よ瘉(鎵嬫満/閭) + /// </summary> + [System.Serializable] + public class BindWithAccountObj + { + /// <summary> + /// 鐢ㄦ埛鎵嬫満 + /// </summary> + public string memberPhone; + /// <summary> + /// 鐢ㄦ埛鎵嬫満 + /// </summary> + public string memberEmail; + /// <summary> + /// 楠岃瘉鍚� + /// </summary> + public string verifyCode; + + + } + + /// <summary> + /// 瑙g粦缁戝畾璁よ瘉(鎵嬫満/閭) + /// </summary> + [System.Serializable] + public class UnBindAccountObj + { + /// <summary> + /// 瑙g粦鏍囩ず锛孭HONE锛孍MAIL + /// </summary> + public string unBindLabel; + } + + + #endregion + #region 鈻� 浣忓畢鐩稿叧 ____________________________ #region 鑾峰彇浣忓畢鍒嗛〉 [System.Serializable] @@ -282,6 +405,10 @@ /// 浣忓畢鍚嶇О /// </summary> public string homeName; + /// <summary> + /// 浣忓畢鍦板潃 + /// </summary> + public string Address; } @@ -657,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] @@ -688,16 +830,9 @@ /// 鍒犻櫎瀛愯处鍙� /// </summary> [System.Serializable] - public class ChildDeleteObj + public class ChildDeleteObj: ChildBaseObj { - /// <summary> - /// - /// </summary> - public string childAccountId; - /// <summary> - /// 浣忓畢 - /// </summary> - public string homeId; + } /// <summary> @@ -762,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> @@ -787,6 +925,18 @@ public string childAccountType; } + /// <summary> + /// 淇敼鏄惁鍏佽鍒涘缓鍦烘櫙 + /// </summary> + [System.Serializable] + public class UpdateChildAllowCreateSceneObj : ChildBaseObj + { + /// <summary> + /// 鏄惁鍏佽鍒涘缓鍦烘櫙 + /// </summary> + public bool isAllowCreateScene; + + } #endregion #region 鏁版嵁鍒嗕韩 @@ -964,185 +1114,152 @@ public string Id; } - - #endregion - - #region 鈻� 鏋氫妇 ____________________________ + #region APP鐗堟湰妫�娴� /// <summary> - /// 瀹㈡埛绔被鍨� 濡侶dlOn銆丒voyoHome銆佽皟璇曞疂 + /// ForceUpdateObj /// </summary> - public enum APIClientType + [System.Serializable] + public class ForceUpdateObj { - - HdlOn, - EvoyoHome, - 璋冭瘯瀹�, + /// <summary> + /// 鎵嬫満绫诲瀷 + /// + /// 0鏄痠OS + /// 1鏄疉ndroid + /// 2鏄疉ndroid 鏂扮殑鍖呭悕鐗堟湰 + /// </summary> + public int DeviceType = 0; + /// <summary> + /// + /// </summary> + public string RequestVersion = MainPage.VersionString; + /// <summary> + /// + /// </summary> + public string RequestSource = MainPage.ClientType; + /// <summary> + /// 璇█ + /// </summary> + public string languageType; } /// <summary> - /// 澶囦唤绫诲瀷 + /// 妫�娴嬫洿鏂拌繑鍥炲瓧娈� /// </summary> - public enum BackupClassify + public class ForceUpdateInfo { - /// <summary> - /// 浜や簰澶囦唤 - /// </summary> - INTERACTIVE_ENGINEERING_BACKUP, - /// <summary> - /// 鑷畾涔夊伐绋嬪浠� - /// </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 bool IsNeedForceUpdate; - /// <summary> - /// 浣忓畢绫诲瀷 - /// </summary> - public enum HomeTypeEnum - { - ZIGBEE, - BUSPRO, - A - } + /// <summary> + /// 寮哄埗鏇存柊鍘熷洜 + /// </summary> + public string ReasonStr; + /// <summary> + /// 寮哄埗鏇存柊鍘熷洜 + /// </summary> + public string ReasonStr_En; - /// <summary> - /// 璇█绫诲瀷 - /// </summary> - public enum LanguageTypeEnum - { - CHINESE, - ENGLISH, - } + /// <summary> + /// 鏂扮増鏈琲OS App Store涓嬭浇鍦板潃 + /// </summary> + public string IosUrl; - /// <summary> - /// VerifyType - /// </summary> - public enum VerifyType - { /// <summary> - /// 娉ㄥ唽 + /// 鏂扮増鏈珹ndroid搴旂敤甯傚満涓嬭浇鍦板潃 /// </summary> - REGISTER = 1, - /// <summary> - /// 蹇樿瀵嗙爜 - /// </summary> - FORGOTPASSWORD, - /// <summary> - /// 鐧诲綍 - /// </summary> - LOGIN, - /// <summary> - /// 缁戝畾 - /// </summary> - BIND, - } + public string AndroidUrl; - /// <summary> - /// ChildAccountType - /// </summary> - public enum ChildAccountType - { /// <summary> - /// 涓昏处鍙疯嚜宸�(鏈汉) + /// 鏂扮増鏈珹ndroid 鑻辨枃搴旂敤甯傚満涓嬭浇鍦板潃 Google Play /// </summary> - MYSELF = 0, + public string AndroidUrl_En; + /// <summary> - /// 鏅�� + /// O 涓嶉渶瑕佹洿鏂� + /// 1 鎻愮ず鏇存柊 + /// 2 寮哄埗鏇存柊 + /// 3 鎻愮ず閫氱煡鍐呭 /// </summary> - ORDINARY = 1, + public int UpdateType; + /// <summary> - /// 璋冭瘯浜哄憳 + /// 褰撳墠鏂扮増鏈彿 /// </summary> - DEBUG, - /// <summary> - /// 绠$悊鍛� - /// </summary> - ADMIN, + public string NewVersion; } #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