From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:50:43 +0800 Subject: [PATCH] Revert "1" --- HDL_ON/DAL/Server/NewApiRes.cs | 813 +++++++++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 608 insertions(+), 205 deletions(-) diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs index da473ed..4d5cf58 100644 --- a/HDL_ON/DAL/Server/NewApiRes.cs +++ b/HDL_ON/DAL/Server/NewApiRes.cs @@ -17,7 +17,7 @@ [System.Serializable] public class NullObj { - + } #region 鈻� 鍏ㄧ悆鍖哄煙鍒楄〃 ____________________________ @@ -75,7 +75,7 @@ /// 楠岃瘉鐮侊紝鐭俊鐧诲綍鏃跺�欑敤 /// </summary> public string verifyCode; - + } @@ -134,6 +134,27 @@ /// 鐢ㄦ埛鍚嶅瓧 /// </summary> public string name; + + } + + /// <summary> + /// 鐧诲綍閿佸畾鍚庣殑寮傚父鎵╁睍鍙傛暟 + /// </summary> + [Serializable] + public class AccountLoginLockExtraRes + { + /// <summary> + /// 鏈�澶у厑璁哥殑瀵嗙爜閿欒娆℃暟 + /// </summary> + public int maxPwdErrorNum; + /// <summary> + /// 褰撳墠閿欒娆℃暟 + /// </summary> + public int currentPwdErrorNum; + /// <summary> + /// 瑙i攣浜嬩欢 + /// </summary> + public long unlockTime; } #endregion @@ -316,6 +337,10 @@ /// 鐧诲綍鍚� /// </summary> public string loginName; + /// <summary> + /// 鐢ㄦ埛澶村儚 + /// </summary> + public string memberHeadIcon; } @@ -332,6 +357,18 @@ } + /// <summary> + /// 鏇存柊涓汉澶村儚 + /// </summary> + [System.Serializable] + public class UpdateMemberHeadIconRes + { + /// <summary> + /// 鐢ㄦ埛澶村儚 + /// </summary> + public string memberHeadIcon; + + } /// <summary> /// 缁戝畾璁よ瘉(鎵嬫満/閭) @@ -351,7 +388,7 @@ /// 楠岃瘉鍚� /// </summary> public string verifyCode; - + } @@ -379,6 +416,10 @@ /// 浣忓畢绫诲瀷 /// </summary> public string homeType; + /// <summary> + /// 涓嶈嚜鍔ㄧ敓鎴愰粯璁や綇瀹� + /// </summary> + public bool autoGenerate = false; } @@ -408,7 +449,7 @@ /// <summary> /// 浣忓畢鍦板潃 /// </summary> - public string Address; + public string homeAddress; } @@ -483,75 +524,59 @@ #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> + /// 缃戝叧snID + /// </summary> + public string sn = ""; + /// <summary> + /// + /// </summary> + public string aesKey = ""; + /// <summary> + /// BUSUDPGATEWAY, + /// AGATEWAY, + /// ZIGBEEGATEWAY, + /// KNXGATEWAY + /// </summary> + public string gatewayType = ""; /// <summary> /// 浣忓畢ID /// </summary> - public string homeId; + public string homeId = ""; /// <summary> /// /// </summary> - public string untieMark; + public string mac = ""; /// <summary> /// /// </summary> - public string gwFirmwareVersion; + public string primaryKey = ""; /// <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; - /// <summary> - /// - /// </summary> - public string aesKey; - /// <summary> - /// - /// </summary> - public string encryptionType; - /// <summary> - /// - /// </summary> - public string gatewayType; + public string encryptionType = ""; + /// <summary> /// 瀛愮綉鍙� /// </summary> @@ -560,7 +585,34 @@ /// 璁惧鍙� /// </summary> public int deviceId; + /// <summary> + /// 缃戝叧鐘舵�� + /// ON_LINE(0,"鍦ㄧ嚎"), + /// OFF_LINE(1,"涓嬬嚎"),; + /// </summary> + public bool gatewayStatus; + ///// <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; } @@ -830,9 +882,9 @@ /// 鍒犻櫎瀛愯处鍙� /// </summary> [System.Serializable] - public class ChildDeleteObj: ChildBaseObj + public class ChildDeleteObj : ChildBaseObj { - + } /// <summary> @@ -847,61 +899,11 @@ public string homeId; } - - - //鑾峰彇椤圭洰 (浣忓畢)涓嬮潰鐨勫瓙璐﹀彿 - /// <summary> - /// 鑾峰彇鎴愬憳淇℃伅鐨勭粨鏋� - /// </summary> - /// [Serializable] - public class SubAccountNewRes - { - - /// <summary> - /// - /// </summary> - public string id; - /// <summary> - /// - /// </summary> - public string homeId; - /// <summary> - /// - /// </summary> - public string homeRegionId; - /// <summary> - /// - /// </summary> - public string childAccountId; - /// <summary> - /// - /// </summary> - public string childAccountRegionId; - /// <summary> - /// 瀛愯处鎴风被鍨� ORDINARY銆丏EBUG銆丄DMIN - /// </summary> - public string childAccountType; - /// <summary> - /// 鏄惁鍏佽杩滅▼鎺у埗 - /// </summary> - public bool isRemoteControl; - /// <summary> - /// 鏄电О1 - /// </summary> - public string nickName; - /// <summary> - /// - /// </summary> - public string createTime; - - - } - /// <summary> /// 鏇存柊瀛愯处鍙峰娉ㄥ悕瀛� /// </summary> [System.Serializable] - public class UpdateChildNickNameObj: ChildBaseObj + public class UpdateChildNickNameObj : ChildBaseObj { /// <summary> /// nickName @@ -935,8 +937,23 @@ /// 鏄惁鍏佽鍒涘缓鍦烘櫙 /// </summary> public bool isAllowCreateScene; - + } + + /// <summary> + /// + /// </summary> + [System.Serializable] + public class AccountObj + { + /// <summary> + /// 璐﹀彿 + /// </summary> + public string account; + + } + + #endregion #region 鏁版嵁鍒嗕韩 @@ -1038,7 +1055,7 @@ /// <summary> /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus /// </summary> - public string software = "ON_Plus"; + public string software = SoftwareType.ON_Plus.ToString(); } /// <summary> @@ -1057,13 +1074,17 @@ /// /// </summary> [System.Serializable] - public class GetMessageListObj: PushIdObj + public class GetMessageListObj : PushIdObj { /// <summary> /// 浣忓畢涓婚敭id /// 1銆佷紶绌烘煡璇㈠叏閮紙闇�瑕佹牴鎹敤鎴峰煙鍚嶆煡璇級 2銆佷紶鎸囧畾浣忓畢ID鏌ヨ鎸囧畾璁板綍 锛堥渶瑕佹牴鎹綇瀹呭煙鍚嶆煡璇級 /// </summary> public string homeId; + /// <summary> + /// ""锛氬叏閮紱Default锛氬垎浜笌鍔熻兘锛汚larm锛氭姤璀︾被锛汸rompt锛氱郴缁熸秷鎭� + /// </summary> + public string pushType; } /// <summary> @@ -1077,39 +1098,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 @@ -1133,70 +1123,113 @@ public string Id; } - #region APP鐗堟湰妫�娴� /// <summary> - /// ForceUpdateObj + /// AppNameObj /// </summary> [System.Serializable] - public class ForceUpdateObj + public class AppNameObj { - /// <summary> - /// 鎵嬫満绫诲瀷 - /// - /// 0鏄痠OS - /// 1鏄疉ndroid - /// 2鏄疉ndroid 鏂扮殑鍖呭悕鐗堟湰 - /// </summary> - public int DeviceType = 0; - /// <summary> - /// - /// </summary> - public string requestVersion = MainPage.VersionString; /// <summary> /// 杞欢鏉ユ簮锛孍voyo銆丱N銆丱N_Plus /// </summary> - public string software = "ON_Plus"; + public string appName = SoftwareType.ON_Plus.ToString(); + } + + #region APP鐗堟湰妫�娴� + /// <summary> + /// AppVersionCheckObj + /// </summary> + [System.Serializable] + public class AppVersionCheckObj + { /// <summary> - /// 璇█ + /// /// </summary> - public string languageType; + 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锛屽璇█鏈夊鎴风瑙f瀽 + /// </summary> + public string updateDescription; + /// <summary> + /// 鐗堟湰鍙� + /// </summary> + public string version; + } + + /// <summary> + /// 鏇存柊璇存槑json锛屽璇█鏈夊鎴风瑙f瀽 + /// </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> + //public bool IsNeedForceUpdate; /// <summary> - /// 闇�瑕佸己鍒舵洿鏂� - /// </summary> - public bool IsNeedForceUpdate; - - /// <summary> - /// 寮哄埗鏇存柊鍘熷洜 + /// 1.鎻愮ず鏇存柊鐨勫唴瀹� + /// 2.寮哄埗鏇存柊鍘熷洜 + /// 3.鎻愮ず鐨勯�氱煡鍐呭 /// </summary> public string ReasonStr; - /// <summary> - /// 寮哄埗鏇存柊鍘熷洜 - /// </summary> - public string ReasonStr_En; - - /// <summary> - /// 鏂扮増鏈琲OS App Store涓嬭浇鍦板潃 - /// </summary> - public string IosUrl; - - /// <summary> - /// 鏂扮増鏈珹ndroid搴旂敤甯傚満涓嬭浇鍦板潃 - /// </summary> - public string AndroidUrl; - - /// <summary> - /// 鏂扮増鏈珹ndroid 鑻辨枃搴旂敤甯傚満涓嬭浇鍦板潃 Google Play - /// </summary> - public string AndroidUrl_En; - /// <summary> /// O 涓嶉渶瑕佹洿鏂� /// 1 鎻愮ず鏇存柊 @@ -1204,46 +1237,416 @@ /// 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 + + + #region 鍥剧墖涓婁紶涓嬭浇 + /// <summary> + /// 涓婁紶鍥剧墖 + /// </summary> + [System.Serializable] + public class UploadImageObj + { + /// <summary> + /// 鍓嶇紑鏍囪瘑 + /// </summary> + public string prefix; + /// <summary> + /// 鍏宠仈ID + /// </summary> + public string uid; + /// <summary> + /// 鏂囦欢鍚嶇О + /// </summary> + public string fileName; + /// <summary> + /// 鍥剧墖浜岃繘鍒舵祦 + /// </summary> + public byte[] content; + } + + /// <summary> + /// 鏌ヨ鍥剧墖璺緞 + /// </summary> + [System.Serializable] + public class GetImageUrlObj + { + /// <summary> + /// 鍥剧墖涓嬭浇璺緞鏍囪瘑 + /// </summary> + public string imageKey; + } + #endregion + + + #endregion + + + /// <summary> + /// 鏋佸厜鎺ㄩ�佹秷鎭� + /// </summary> + [System.Serializable] + public class JPushMessageInfo + { + /// <summary> + /// 浣忓畢ID + /// </summary> + public string HomeId; + /// <summary> + /// 鎺ㄩ�佹爣棰� + /// </summary> + public string Title; + /// <summary> + /// 鎺ㄩ�佸唴瀹� + /// </summary> + public string Content; + /// <summary> + /// 鎺ㄩ�侀檮鍔犳暟鎹� + /// </summary> + public string Extras; + /// <summary> + /// 淇℃伅绫诲瀷 + /// </summary> + public string messageType = ""; + /// <summary> + /// 鎵╁睍鏁版嵁鍐呭 + /// </summary> + public string expantContent = ""; + } /// <summary> - /// 妫�娴婣PP鐗堟湰 + /// 鏋佸厜鎺ㄩ�佹秷鎭� /// </summary> - public class APPVersion + [System.Serializable] + public class JPushExpandData { - /// <summary> - /// 鏂扮増鏈琲OS App Store涓嬭浇鍦板潃 + /// 闄勫姞鍐呭 /// </summary> - public string IosUrl; + public string expandData; + + } + /// <summary> + /// 鏋佸厜鎺ㄩ�佹秷鎭� + /// </summary> + [System.Serializable] + public class ExpandData + { /// <summary> - /// 鏂扮増鏈珹ndroid搴旂敤甯傚満涓嬭浇鍦板潃 + /// 浣忓畢ID /// </summary> - public string AndroidUrl; + public string homeId; + /// <summary> + /// 闄勫姞鍐呭 + /// </summary> + public string expantContent; + /// <summary> + /// 淇℃伅绫诲瀷 + /// </summary> + public string messageType; + } + /// <summary> + /// 钀ょ煶浜戝瓙璐﹀彿token + /// </summary> + [System.Serializable] + public class EZChildAccessToken + { /// <summary> - /// 褰撳墠iOS鏈�鏂扮増鏈彿 + /// token /// </summary> - public string IosVersion; + public string accessToken; + /// <summary> + /// 杩囨湡鏃堕棿 + /// </summary> + public string expireTime; + } + + #region 闊崇 + /// <summary> + /// 鑾峰彇闊崇鍒楄〃 + /// </summary> + [System.Serializable] + public class GetSpeakerObj : HomeIdObj + { /// <summary> - /// 褰撳墠Android鏈�鏂扮増鏈彿 + /// 骞冲彴鍚嶇О /// </summary> - public string AndroidVersion; + public string platformName; + /// <summary> + /// 椤甸潰澶у皬 + /// </summary> + public int pageSize = 100; + /// <summary> + /// 椤甸潰搴忓彿 + /// </summary> + public int pageNo = 1; + } + + + [System.Serializable] + public class SpeakerObj : HomeIdObj + { + /// <summary> + /// 璁板綍鐨勪富閿甶d + /// </summary> + public string tokenId; + } + + /// <summary> + /// 鏇存柊闊崇澶囨敞 + /// </summary> + [System.Serializable] + public class UpdateSpeakerRemarkObj : SpeakerObj + { + /// <summary> + /// 澶囨敞 + /// </summary> + public string remark; + } + + + /// <summary> + /// 鑾峰彇闊崇鍒嗛厤鐨勮澶囧拰鍦烘櫙鍒楄〃 + /// </summary> + [System.Serializable] + public class GetSpeakerDeviceListObj : HomeIdObj + { + /// <summary> + /// 璁板綍鐨勪富閿甶d + /// </summary> + public string tokenId; } + + /// <summary> + /// 閰嶇疆鐨勮闊宠澶囧拰鍦烘櫙鏁版嵁 + /// </summary> + [System.Serializable] + public class SpeakerTargetInfo + { + /// <summary> + /// 鎺у埗鐨勭洰鏍嘔d锛屼簯绔殑璁惧Id鎴栬�呭満鏅疘d + /// </summary> + public string targetId; + /// <summary> + /// 鏄惁鏄澶囷紝鍦烘櫙涓篺alse + /// </summary> + public bool isDevice; + /// <summary> + /// 鐩爣鍚嶇О + /// </summary> + public string targetName; + /// <summary> + /// 鎵╁睍鍙傛暟褰撳墠rowview鏄惁閫変腑 + /// </summary> + public bool IsSelect; + } + + //[System.Serializable] + //public class SpeakerTargetInfoRow: SpeakerTargetInfo + //{ + // /// <summary> + // /// 褰撳墠rowview鏄惁閫変腑 + // /// </summary> + // public bool isSelect; + //} + + + /// <summary> + /// 鏇存柊闊崇鎺у埗鐨勮澶囧拰鍦烘櫙鐩爣 + /// </summary> + [System.Serializable] + public class UpdateSpeakerDeviceListObj : SpeakerObj + { + /// <summary> + /// 澶囨敞 + /// </summary> + public List<SpeakerTargetInfo> targetInfos; + } + + /// <summary> + /// 鏇存柊闊崇鎺у埗鐨勮澶囧拰鍦烘櫙鐩爣 + /// </summary> + [System.Serializable] + public class SpeakerListRes + { + /// <summary> + /// 闊崇鍒楄〃 + /// </summary> + public List<SpeakerInfo> list; + } + + /// <summary> + /// 闊崇淇℃伅 + /// </summary> + [System.Serializable] + public class SpeakerInfo + { + /// <summary> + /// + /// </summary> + public string platformName { get; set; } + /// <summary> + /// + /// </summary> + public string remark { get; set; } + /// <summary> + /// + /// </summary> + public string tokenId { get; set; } + /// <summary> + /// + /// </summary> + public string userId { get; set; } + /// <summary> + /// + /// </summary> + public string userRegion { get; set; } + /// <summary> + /// + /// </summary> + public string homeId { get; set; } + /// <summary> + /// + /// </summary> + public string homeRegion { get; set; } + } #endregion - - #endregion - - //#region 鏃ф帴鍙� ///// <summary> -- Gitblit v1.8.0