From 2e7e5f9af5b32cfe1fc3c6ba40bf7eb984bbd0a4 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 11 五月 2020 17:52:06 +0800 Subject: [PATCH] ??????? --- ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 537 +++++++++-------------------------------------------------- 1 files changed, 84 insertions(+), 453 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs index e77d781..c4b44cc 100755 --- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs +++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs @@ -4,9 +4,9 @@ namespace ZigBee.Device { - public class ZbGatewayData : CommonDevice + public class ZbGatewayData { - #region 鏂拌拷鍔犵殑涓�浜涘彉閲� + #region 涓�鍫嗗彉閲� /// <summary> /// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫�� /// </summary> @@ -15,57 +15,32 @@ /// 缃戝叧鎵�鍦ㄧ殑鎴块棿ID /// </summary> public string RoomId = string.Empty; - - #endregion - - [Newtonsoft.Json.JsonIgnore] /// <summary> /// 铏氭嫙缃戝叧 /// </summary> - public bool IsVirtual; - - #region 缃戝叧鍩烘湰淇℃伅 + [Newtonsoft.Json.JsonIgnore] + public bool IsVirtual; /// <summary> - /// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈� + /// 鏈�鍚庣殑鏇存柊鏃堕棿 /// </summary> - public long AppVersion; + [Newtonsoft.Json.JsonIgnore] + public DateTime LastDateTime = DateTime.MinValue; - /// <summary> - /// Zigbee鍗忚鍣ㄧ▼搴忕増鏈� - /// </summary> - public int ZigbeeVersion; #endregion #region 缃戝叧淇℃伅. /// <summary> /// 缃戝叧鐗堟湰淇℃伅,缃戝叧鍙嶉淇℃伅 /// </summary> - public GetGwVersionAllData getGwVersionAllData; - /// <summary> - /// 缃戝叧鐗堟湰淇℃伅,缃戝叧鍙嶉淇℃伅 - /// </summary> [System.Serializable] - public class GetGwVersionAllData + public class GetGwVersionAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 缃戝叧鐗堟湰淇℃伅 /// </summary> public GetGwVersionData getGwVersion; } - /// <summary> - /// 缃戝叧鐗堟湰淇℃伅 - /// </summary> - public GetGwVersionData getGwVersion; /// <summary> /// 缃戝叧鐗堟湰淇℃伅 /// </summary> @@ -84,25 +59,13 @@ #endregion #region 鑾峰彇缃戝叧淇℃伅. - /// <summary> - /// 缃戝叧淇℃伅,缃戝叧鍙嶉鍏蜂綋淇℃伅. - /// </summary> - public GetGwAllData getGwAllData; + /// <summary> /// 缃戝叧淇℃伅,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> [System.Serializable] - public class GetGwAllData + public class GetGwAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 缃戝叧淇℃伅 /// </summary> @@ -114,7 +77,7 @@ /// </summary> public GetGwData getGwInfo; /// <summary> - /// 缃戝叧淇℃伅 + /// 缃戝叧淇℃伅(灞忚斀鎺変簡涓�浜涚洰鍓嶄笉浣跨敤鐨勫彉閲�) /// </summary> [System.Serializable] public class GetGwData @@ -122,10 +85,11 @@ ///<summary> ///缃戝叧搴忓垪鍙凤紝璇ョ綉鍏冲敮涓�鏍囪瘑 /// </summary> - public string GwId; + public string GwId; /// <summary> ///缃戝叧缁戝畾缃戝崱鐨刴ac鍦板潃 /// </summary> + [Newtonsoft.Json.JsonIgnore] public string GwMac; /// <summary> ///缃戝叧鍚嶇О @@ -140,61 +104,71 @@ ///<para>0锛氬惁</para> ///<para>1锛氭槸</para> /// </summary> - public int IsDominant; + public int IsDominant; ///<summary> ///utc鏃堕棿鎴筹紝绋嬪簭鍚姩鏃剁綉鍏崇殑绯荤粺鏃堕棿 ///</summary> - public long StartTime; + [Newtonsoft.Json.JsonIgnore] + public long StartTime; /// <summary> ///鍔犲叆灞�鍩熺綉妯″紡 ///<para>0锛歸ifi杩炴帴灞�鍩熺綉</para> ///<para>1锛氭湁绾胯繛鎺ュ眬鍩熺綉</para> ///<para>2锛氭湭鍔犲叆灞�鍩熺綉</para> /// </summary> + [Newtonsoft.Json.JsonIgnore] public int JoinMode; /// <summary> ///缃戝叧鎵�鍦ㄥ眬鍩熺綉鐨刬p鍦板潃 /// </summary> - public string GwIP; + public string GwIP; /// <summary> /// 涓讳汉鐨凣uid(鍗充娇鏄鐞嗗憳,杩欓噷涔熸槸涓讳汉鐨凣uid) /// </summary> + [Newtonsoft.Json.JsonIgnore] public string AccountId; /// <summary> ///褰撳墠灞�鍩熺綉缃戠粶鍙峰崰鐢ㄤ綅鏁帮紝鐢ㄤ簬璁$畻瀛愮綉鎺╃爜锛屽Mask=32锛屽垯瀛愮綉鎺╃爜涓�255.255.255.0 /// </summary> - public int Mask; + [Newtonsoft.Json.JsonIgnore] + public int Mask; /// <summary> ///涓婄骇璺敱鍣ㄦ棤绾垮悕绉� ///<para>褰� JoinMode = 0鏃跺瓨鍦� </para> /// </summary> - public string RouteESSID; + [Newtonsoft.Json.JsonIgnore] + public string RouteESSID; /// <summary> ///DNS鏈嶅姟鍣ㄥ湴鍧� /// </summary> + [Newtonsoft.Json.JsonIgnore] public string DNSServer; /// <summary> - /// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈� + /// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�(缃戝叧鍥轰欢鏃ユ湡锛燂紵) /// </summary> - public long AppVersion; + public long AppVersion; /// <summary> /// Zigbee鍗忚鍣ㄧ▼搴忕増鏈� /// </summary> - public int ZigbeeVersion; + [Newtonsoft.Json.JsonIgnore] + public int ZigbeeVersion; /// <summary> ///鍗忚皟鍣╩ac鍦板潃 /// </summary> - public string ZigbeeMacAddr; + [Newtonsoft.Json.JsonIgnore] + public string ZigbeeMacAddr; /// <summary> ///缃戝叧瀹卛d /// </summary> - public string HomeId; + [Newtonsoft.Json.JsonIgnore] + public string HomeId; /// <summary> ///鏄惁宸茬粡杩炴帴浜戠mqtt ///<para>0锛氬惁</para> ///<para>1锛氭槸</para> /// </summary> - public int IsConnectCloud; + [Newtonsoft.Json.JsonIgnore] + public int IsConnectCloud; /// <summary> ///锛堢敤浜庣綉鍏崇▼搴忚皟璇曪級 ///<para>https鐧婚檰浜戠鏃讹紝鏈�杩戜竴娆¤幏鍙栫殑鍝嶅簲鐘舵�佺爜銆傛牴鎹簯绔殑瀹氫箟锛屾湁濡備笅鐘舵�佺爜銆�</para> @@ -203,6 +177,7 @@ ///<para>(3)NoBind,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭痆鎮ㄦ墍鎻愪氦鐨刐GatewayUniqueId 缃戝叧鍞竴Id(MAC)]鍜孾浣忓畢涓婚敭Id]涓嶅瓨鍦ㄧ粦瀹氱殑鍏崇郴]</para> ///<para>(4)YouDataNoIsLocalRegion,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭痆鎮ㄧ殑鐨勬暟鎹苟涓嶅湪姝DL鍖哄煙鏈嶅姟鍣�, 璇烽噸瀹氬悜鍒板涓婬DL鍖哄煙鏈嶅姟鍣ㄨ繘琛屽鐞�.]</para> /// </summary> + [Newtonsoft.Json.JsonIgnore] public string StateCode; /// <summary> ///Linux缃戝叧绫诲瀷 @@ -227,12 +202,12 @@ /// <summary> /// 缃戝叧闀滃儚绫诲瀷 /// </summary> - public int ZbImageType; - + public int ZbImageType; /// <summary> /// 铏氭嫙椹卞姩淇℃伅 /// </summary> - public List <DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>(); + [Newtonsoft.Json.JsonIgnore] + public List<DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>(); } public class DriveCodeListObj @@ -264,32 +239,15 @@ /// <summary> /// 淇敼缃戝叧鍚嶇О,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> - public GwReNameAllData gwReNameAllData; - /// <summary> - /// 淇敼缃戝叧鍚嶇О,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> [System.Serializable] - public class GwReNameAllData + public class GwReNameAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 淇敼缃戝叧鍚嶇О /// </summary> public GwReNameData gwReNameData; } - /// <summary> - /// 淇敼缃戝叧鍚嶇О - /// </summary> - public GwReNameData gwRename; /// <summary> /// 淇敼缃戝叧鍚嶇О /// </summary> @@ -307,32 +265,15 @@ /// <summary> /// 缃戝叧浣忓畢id鏁版嵁,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> - public GwSetHomeIdAllData gwSetHomeIdAllData; - /// <summary> - /// 缃戝叧浣忓畢id鏁版嵁,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> [System.Serializable] - public class GwSetHomeIdAllData + public class GwSetHomeIdAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 缃戝叧浣忓畢id鏁版嵁 /// </summary> public GwSetHomeIdData gwSetHomeIdData; } - /// <summary> - /// 缃戝叧浣忓畢id鏁版嵁 - /// </summary> - public GwSetHomeIdData gwSetHomeId; /// <summary> /// 缃戝叧浣忓畢id鏁版嵁 /// </summary> @@ -346,11 +287,11 @@ } /// <summary> - /// 骞挎挱鍙戠幇鍗忚 + /// 骞挎挱鍙戠幇鍗忚(灞忚斀鎺変簡涓�浜涚洰鍓嶄笉鐢ㄧ殑鍙橀噺) /// </summary> - public GatewayBaseInfo getGatewayBaseInfo = new GatewayBaseInfo { }; + public GatewayBaseInfo getGatewayBaseInfo = new GatewayBaseInfo(); /// <summary> - /// 骞挎挱鍙戠幇鍗忚 + /// 骞挎挱鍙戠幇鍗忚(灞忚斀鎺変簡涓�浜涚洰鍓嶄笉鐢ㄧ殑鍙橀噺) /// </summary> [System.Serializable] public class GatewayBaseInfo @@ -362,10 +303,11 @@ /// <summary> /// 浣忓畢id锛�4瀛楄妭鏁村瀷銆傦紙灏忕缁撴瀯锛夊鏋滅綉鍏充笉璁剧疆瀹卛d锛屽皢榛樿涓�0 /// </summary> - public string HomeId = string.Empty; + public string HomeId = string.Empty; /// <summary> /// 缃戝叧褰撳墠鏃堕棿鎴筹紙灏忕缁撴瀯锛� /// </summary> + [Newtonsoft.Json.JsonIgnore] public int Time; /// <summary> /// 鏄惁涓轰富缃戝叧 @@ -376,30 +318,11 @@ /// </summary> public string GwName; /// <summary> - /// RSA鍏挜 - /// </summary> - //public string PubKey; - //string id; - /// <summary> /// 缃戝叧ID /// </summary> public string gwID; - //{ - // get{ - // return id; - // } - // set{ - // id = value; - // //System.Console.WriteLine("===========123456"); - // } - //} - } - /// <summary> - /// 缃戝叧鎴愪负涓荤綉鍏虫椂骞挎挱閫氱煡 - /// </summary> - public MainGatewayBaseInfo getMainGatewayBaseInfo; /// <summary> /// 缃戝叧鎴愪负涓荤綉鍏虫椂骞挎挱閫氱煡 /// </summary> @@ -447,22 +370,9 @@ /// <summary> /// 缃戝叧鎭㈠鍑哄巶璁剧疆杩斿洖鐨勬暟鎹�. /// </summary> - public GwLinuxResetResponData gwLinuxResetResponData; - /// <summary> - /// 缃戝叧鎭㈠鍑哄巶璁剧疆杩斿洖鐨勬暟鎹�. - /// </summary> [System.Serializable] - public class GwLinuxResetResponData + public class GwLinuxResetResponData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>缃戝叧鎭㈠鍑哄巶璁剧疆</para> - /// </summary> - public ErrorResponData errorResponData; ///<summary > /// <para>0锛氬懡浠ゅ凡鎺ユ敹锛岀郴缁熷嵆灏嗘仮澶嶅嚭鍘傚苟閲嶅惎銆�</para> /// </summary> @@ -475,32 +385,15 @@ /// <summary> /// 閲嶅惎缃戝叧绯荤粺杩斿洖鏁版嵁 /// </summary> - public GwRebootResponAllData gwRebootResponAllData; - /// <summary> - /// 閲嶅惎缃戝叧绯荤粺杩斿洖鏁版嵁 - /// </summary> [System.Serializable] - public class GwRebootResponAllData + public class GwRebootResponAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; ///<summary > /// <para>杩斿洖鍊兼槸0:鍛戒护宸叉帴鏀讹紝绯荤粺鍗冲皢閲嶅惎銆�</para> /// </summary> public int Result = 999; } - /// <summary> - /// 閲嶅惎缃戝叧绯荤粺杩斿洖鏁版嵁 - /// </summary> - public GwRebootResponData gwRebootResponData; /// <summary> /// 閲嶅惎缃戝叧绯荤粺杩斿洖鏁版嵁 /// </summary> @@ -519,32 +412,15 @@ /// <summary> /// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭�,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> - public SaveNVFileResponseAllData saveNVFileResponseData; - /// <summary> - /// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭�,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> [System.Serializable] - public class SaveNVFileResponseAllData + public class SaveNVFileResponseAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭� /// </summary> public SaveNVFileResponseData saveNVFileResponseData; } - /// <summary> - /// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭� - /// </summary> - public SaveNVFileResponseData zbGwOperationSaveNVFileData; /// <summary> /// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭� /// </summary> @@ -565,32 +441,15 @@ /// <summary> /// 鍗忚皟鍣ㄦ仮澶嶇粍缃戜俊鎭�,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> - public RestoreNVAllDtta restoreNVAllDtta; - /// <summary> - /// 鍗忚皟鍣ㄦ仮澶嶇粍缃戜俊鎭�,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> [System.Serializable] - public class RestoreNVAllDtta + public class RestoreNVAllDtta : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 鍗忚皟鍣ㄦ仮澶嶇粍缃戜俊鎭� /// </summary> public RestoreNVDtta restoreNVDtta; } - /// <summary> - /// 鍗忚皟鍣ㄦ仮澶嶇粍缃戜俊鎭� - /// </summary> - public RestoreNVDtta restoreNVDtta; /// <summary> /// 鍗忚皟鍣ㄦ仮澶嶇粍缃戜俊鎭� /// </summary> @@ -609,25 +468,24 @@ #endregion #region 鍗忚皟鍣ㄥ崌绾� + /// <summary> - /// 鍗忚皟鍣ㄥ崌绾�,缃戝叧鍙嶉鍏蜂綋淇℃伅 + /// 涓嬭浇杩涘害 + /// </summary + [Newtonsoft.Json.JsonIgnore] + public CommonDevice.DownloadFileProgressResponData downloadFileProgressResponData = null; + /// <summary> + /// 鍚姩鍗囩骇 /// </summary> - public ZbGwOperationUpgradeAllData zbGwOperationUpgradeAllData; + [Newtonsoft.Json.JsonIgnore] + public CommonDevice.OTAScheduleResponData oTAScheduleResponData = null; + /// <summary> /// 鍗忚皟鍣ㄥ崌绾�,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> [System.Serializable] - public class ZbGwOperationUpgradeAllData + public class ZbGwOperationUpgradeAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 鍗忚皟鍣ㄥ崌绾� /// </summary> @@ -637,6 +495,7 @@ /// <summary> /// 鍗忚皟鍣ㄥ崌绾� /// </summary> + [Newtonsoft.Json.JsonIgnore] public ZbGwOperationUpgradeData zbGwOperationUpgradeData; /// <summary> /// 鍗忚皟鍣ㄥ崌绾� @@ -667,22 +526,9 @@ /// <summary> /// 鍗囩骇铏氭嫙椹卞姩璁惧,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> - public VirtualDriveUpgradeResponseAllData virtualDriveUpgradeResponseAllData; - /// <summary> - /// 鍗囩骇铏氭嫙椹卞姩璁惧,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> [System.Serializable] - public class VirtualDriveUpgradeResponseAllData + public class VirtualDriveUpgradeResponseAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 鍗囩骇铏氭嫙椹卞姩璁惧 /// </summary> @@ -691,7 +537,11 @@ /// <summary> /// 鍗囩骇铏氭嫙椹卞姩璁惧 /// </summary> + [Newtonsoft.Json.JsonIgnore] public VirtualDriveUpgradeResponData virtualDriveUpgradeResponData; + /// <summary> + /// 鍗囩骇铏氭嫙椹卞姩璁惧 + /// </summary> [System.Serializable] public class VirtualDriveUpgradeResponData { @@ -720,22 +570,9 @@ /// <summary> /// 鏌ョ湅缃戝叧璁板綍鐨勮櫄鎷熼┍鍔�,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> - public CheckVDDriveCodeResponseAllData checkVDDriveCodeResponseAllData; - /// <summary> - /// 鏌ョ湅缃戝叧璁板綍鐨勮櫄鎷熼┍鍔�,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> [System.Serializable] - public class CheckVDDriveCodeResponseAllData + public class CheckVDDriveCodeResponseAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 鏌ョ湅缃戝叧璁板綍鐨勮櫄鎷熼┍鍔� /// </summary> @@ -744,7 +581,6 @@ /// <summary> /// 鏌ョ湅缃戝叧璁板綍鐨勮櫄鎷熼┍鍔� /// </summary> - public VDriveDriveCodeResponData vDriveDriveCodeResponData; [System.Serializable] public class VDriveDriveCodeResponData { @@ -786,22 +622,9 @@ /// <summary> /// 缃戝叧绯荤粺鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> - public LinuxUpgradeAllData linuxUpgradeAllData; - /// <summary> - /// 缃戝叧绯荤粺鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> [System.Serializable] - public class LinuxUpgradeAllData + public class LinuxUpgradeAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 0锛氭甯革紙榛樿鍥炲锛� ///<para>1锛氭壘涓嶅埌鍗囩骇鍥轰欢锛岃矾寰勬垨鍗囩骇鍥轰欢鍚嶇О閿欒銆�</para> @@ -817,22 +640,9 @@ /// <summary> /// 鑾峰彇鍗忚皟鍣ㄥ綋鍓嶄俊閬�,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> - public GwGetChannelResponData zbGwGetChannelResponData; - /// <summary> - /// 鑾峰彇鍗忚皟鍣ㄥ綋鍓嶄俊閬�,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> [System.Serializable] - public class GwGetChannelResponData + public class GwGetChannelResponData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 鍗忚皟鍣ㄥ綋鍓嶄俊閬� /// </summary> @@ -845,32 +655,15 @@ /// <summary> /// 鏇存敼鍗忚皟鍣ㄥ綋鍓嶄俊閬�,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> - public ChangeChannelResponAllData changeChannelResponAllData; - /// <summary> - /// 鏇存敼鍗忚皟鍣ㄥ綋鍓嶄俊閬�,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> [System.Serializable] - public class ChangeChannelResponAllData + public class ChangeChannelResponAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 鏇存敼鍗忚皟鍣ㄥ綋鍓嶄俊閬撴暟鎹� /// </summary> public ChangeChannelResponData changeChannelResponData; } - /// <summary> - /// 鏇存敼鍗忚皟鍣ㄥ綋鍓嶄俊閬撴暟鎹� - /// </summary> - public ChangeChannelResponData changeChannelResponData; /// <summary> /// 鏇存敼鍗忚皟鍣ㄥ綋鍓嶄俊閬撴暟鎹� /// </summary> @@ -891,25 +684,13 @@ } #endregion - /// <summary> - /// 璇诲彇鍗忚皟鍣∕AC鍦板潃,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> - public GetMacResponData getMacResponData; + #region 璇诲彇鍗忚皟鍣∕AC鍦板潃 /// <summary> /// 璇诲彇鍗忚皟鍣∕AC鍦板潃,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> [System.Serializable] - public class GetMacResponData + public class GetMacResponData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 鍗忚皟鍣╩ac鍦板潃 /// </summary> @@ -927,28 +708,15 @@ public string MacAddr; } - //#endregion + #endregion #region 鍚敤鎴栧叧闂�忎紶鏁版嵁涓婁紶鎺ュ彛 /// <summary> /// 閫忎紶鏁版嵁涓婁紶鎺ュ彛,缃戝叧鍙嶉淇℃伅 /// </summary> - public PassthroughAllData passthroughAllData; - /// <summary> - /// 閫忎紶鏁版嵁涓婁紶鎺ュ彛,缃戝叧鍙嶉淇℃伅 - /// </summary> [System.Serializable] - public class PassthroughAllData + public class PassthroughAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 宸茬粡杞崲鎴愬瓧绗︽牸寮忕殑16杩涘埗鐨勯�忎紶鏁版嵁 /// </summary> @@ -961,17 +729,8 @@ /// 瀹㈡埛绔彂閫佹枃浠舵祦鍒扮綉鍏� /// </summary> [System.Serializable] - public class SendFileResponseAllData + public class SendFileResponseAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 0: 鏁版嵁鍐欏叆鎴愬姛,璇锋眰鍙戦�佷笅涓�涓暟鎹寘 ///<para>1锛氭暟鎹啓鍏ュけ璐�</para> @@ -988,61 +747,31 @@ /// <summary> /// 瀹㈡埛绔彂閫佸垱寤烘枃浠跺懡浠�,缃戝叧鍙嶉淇℃伅 /// </summary> - public CreateFileResponseAllData createFileResponseAllData; - /// <summary> - /// 瀹㈡埛绔彂閫佸垱寤烘枃浠跺懡浠�,缃戝叧鍙嶉淇℃伅 - /// </summary> [System.Serializable] - public class CreateFileResponseAllData + public class CreateFileResponseAllData : CommonDevice.ErrorResponCommon { /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; - /// <summary> /// 0锛氬垱寤烘垚鍔� ///<para>1锛氬け璐ワ紝鏃犳硶鍒涘缓鏂囦欢</para> ///<para>2锛氬け璐ワ紝璇ュ鎴风鏈夋枃浠惰繕娌′笂浼犲畬鎴愶紝璇风瓑寰呮枃浠朵笂浼犲畬姣曪紙涓�涓鎴风鍙兘鍚屾椂涓婁紶涓�涓枃浠讹級</para> /// </summary> public int Result = 999; - } + } #endregion #region 鏌ョ湅缃戝叧鐩綍鏂囦欢淇℃伅 /// <summary> /// 鏌ョ湅缃戝叧鐩綍鏂囦欢淇℃伅,缃戝叧鍙嶉淇℃伅 /// </summary> - public FileTransferLsDiResponseAllData fileTransferLsDiResponseAllData; - /// <summary> - /// 鏌ョ湅缃戝叧鐩綍鏂囦欢淇℃伅,缃戝叧鍙嶉淇℃伅 - /// </summary> [System.Serializable] - public class FileTransferLsDiResponseAllData + public class FileTransferLsDiResponseAllData : CommonDevice.ErrorResponCommon { /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; - /// <summary> /// 鏌ョ湅缃戝叧鐩綍鏂囦欢淇℃伅 /// </summary> public FileTransferLsDiResponseData fileTransferLsDiResponseData; } - /// <summary> - /// 鏌ョ湅缃戝叧鐩綍鏂囦欢淇℃伅,缃戝叧鍙嶉淇℃伅 - /// </summary> - public FileTransferLsDiResponseData fileTransferLsDiResponseData; /// <summary> /// 瀹㈡埛绔彂閫佸垱寤烘枃浠跺懡浠�,缃戝叧鍙嶉淇℃伅 /// </summary> @@ -1087,32 +816,15 @@ /// <summary> /// 瀹㈡埛绔瀹氳涓嬭浇鐨勬枃浠跺悕绉板拰璺緞,缃戝叧鍙嶉淇℃伅 /// </summary> - public SetDownloadFileResponseAllData setDownloadFileResponseAllData; - /// <summary> - /// 瀹㈡埛绔瀹氳涓嬭浇鐨勬枃浠跺悕绉板拰璺緞,缃戝叧鍙嶉淇℃伅 - /// </summary> [System.Serializable] - public class SetDownloadFileResponseAllData + public class SetDownloadFileResponseAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 瀹㈡埛绔瀹氳涓嬭浇鐨勬枃浠跺悕绉板拰璺緞 /// </summary> public SetDownloadFileResponseData setDownloadFileResponseData; } - /// <summary> - /// 瀹㈡埛绔瀹氳涓嬭浇鐨勬枃浠跺悕绉板拰璺緞,缃戝叧鍙嶉淇℃伅 - /// </summary> - public SetDownloadFileResponseData setDownloadFileResponseData; /// <summary> /// 瀹㈡埛绔瀹氳涓嬭浇鐨勬枃浠跺悕绉板拰璺緞,缃戝叧鍙嶉淇℃伅 /// </summary> @@ -1142,32 +854,15 @@ /// <summary> /// 鏌ョ湅鍗曚釜鏂囦欢淇℃伅鏁版嵁 /// </summary> - public FileTransferGetFileInfoResponseAllData fileTransferGetFileInfoResponseAllData; - /// <summary> - /// 鏌ョ湅鍗曚釜鏂囦欢淇℃伅鏁版嵁 - /// </summary> [System.Serializable] - public class FileTransferGetFileInfoResponseAllData + public class FileTransferGetFileInfoResponseAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 鏌ョ湅鍗曚釜鏂囦欢淇℃伅杩斿洖鐨勬暟鎹� /// </summary> public FileTransferGetFileInfoResponseData fileTransferGetFileInfoResponseData; } - /// <summary> - /// 鏌ョ湅鍗曚釜鏂囦欢淇℃伅杩斿洖鐨勬暟鎹� - /// </summary> - public FileTransferGetFileInfoResponseData fileTransferGetFileInfoResponseData; /// <summary> /// 鏌ョ湅鍗曚釜鏂囦欢淇℃伅杩斿洖鐨勬暟鎹� /// </summary> @@ -1198,22 +893,9 @@ /// <summary> /// 瀹㈡埛绔帴鏀跺埌缃戝叧鍙戣壊鏁版嵁鏍煎紡鍚庡簲鍙嶉缁欑綉鍏冲埌鏍煎紡鏁版嵁 /// </summary> - public DownloadFileResponseAllData downloadFileResponseAllData; - /// <summary> - /// 瀹㈡埛绔帴鏀跺埌缃戝叧鍙戣壊鏁版嵁鏍煎紡鍚庡簲鍙嶉缁欑綉鍏冲埌鏍煎紡鏁版嵁 - /// </summary> [System.Serializable] - public class DownloadFileResponseAllData + public class DownloadFileResponseAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 0: 鏁版嵁鍐欏叆鎴愬姛,璇锋眰鍙戦�佷笅涓�涓暟鎹寘 ///<para>1锛氱粓姝笅杞姐�傚綋涓嬭浇鍑虹幇閿欒锛屾垨鑰呬笅杞藉凡缁忓畬鎴愬彲浠ュ彂閫佽鍊笺��</para> @@ -1221,10 +903,6 @@ public int Result = -1; } - /// <summary> - /// 瀹㈡埛绔帴鏀跺埌缃戝叧鍙戣壊鏁版嵁鏍煎紡鍚庡簲鍙嶉缁欑綉鍏� - /// </summary> - public FileTransferDownloadFileRespon fileTransferDownloadFileRespon; /// <summary> /// 瀹㈡埛绔帴鏀跺埌缃戝叧鍙戣壊鏁版嵁鏍煎紡鍚庡簲鍙嶉缁欑綉鍏� /// </summary> @@ -1243,32 +921,15 @@ /// <summary> /// 鍒犻櫎鏂囦欢鎴栫洰褰�,缃戝叧鍙嶉淇℃伅 /// </summary> - public DelFileOrDirResponseAllData delFileOrDirResponseAllData; - /// <summary> - /// 鍒犻櫎鏂囦欢鎴栫洰褰�,缃戝叧鍙嶉淇℃伅 - /// </summary> [System.Serializable] - public class DelFileOrDirResponseAllData + public class DelFileOrDirResponseAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 鍒犻櫎鏂囦欢鎴栫洰褰� /// </summary> public DelFileOrDirResponseData delFileOrDirResponseData; } - /// <summary> - /// 鍒犻櫎鏂囦欢鎴栫洰褰�,缃戝叧鍙嶉淇℃伅 - /// </summary> - public DelFileOrDirResponseData delFileOrDirResponseData; /// <summary> /// 鍒犻櫎鏂囦欢鎴栫洰褰�,缃戝叧鍙嶉淇℃伅 /// </summary> @@ -1293,32 +954,15 @@ /// <summary> /// 鍒涘缓涓�涓洰褰�,缃戝叧鍙嶉淇℃伅 /// </summary> - public CreateDirResponseAllData createDirResponseAllData; - /// <summary> - /// 鍒涘缓涓�涓洰褰�,缃戝叧鍙嶉淇℃伅 - /// </summary> [System.Serializable] - public class CreateDirResponseAllData + public class CreateDirResponseAllData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 鍒涘缓涓�涓洰褰� /// </summary> public CreateDirResponseData createDirResponseData; } - /// <summary> - /// 鍒涘缓涓�涓洰褰�,缃戝叧鍙嶉淇℃伅 - /// </summary> - public CreateDirResponseData createDirResponseData; /// <summary> /// 鍒涘缓涓�涓洰褰�,缃戝叧鍙嶉淇℃伅 /// </summary> @@ -1342,22 +986,9 @@ /// <summary> /// 瀹㈡埛绔彂閫丏ES瀵嗛挜鍒扮綉鍏�,缃戝叧鍙嶉鍏蜂綋淇℃伅 /// </summary> - public SendKeyResponData sendDESKeyResponData; - /// <summary> - /// 瀹㈡埛绔彂閫丏ES瀵嗛挜鍒扮綉鍏�,缃戝叧鍙嶉鍏蜂綋淇℃伅 - /// </summary> [System.Serializable] - public class SendKeyResponData + public class SendKeyResponData : CommonDevice.ErrorResponCommon { - /// <summary> - /// 閿欒淇℃伅 - /// </summary> - public string errorMessageBase; - /// <summary> - /// 缃戝叧淇℃伅閿欒鍙嶉 - /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para> - /// </summary> - public ErrorResponData errorResponData; /// <summary> /// 0锛氭垚鍔� ///<para>1锛氬け璐ワ紝RSA绉侀挜瑙e瘑澶辫触</para> -- Gitblit v1.8.0