From 160785587667cc0d927f85e44c139ec9dde13a9e Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期一, 25 十一月 2019 14:30:13 +0800 Subject: [PATCH] 原来的 IOS 工程舍弃(注:没有合并其他组员的代码) --- ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs | 174 +-------------------------------------------------------- 1 files changed, 4 insertions(+), 170 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs index 1a2bc3b..0c42986 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs @@ -7,18 +7,18 @@ namespace Shared.Phone.UserCenter { /// <summary> - /// 璁惧灞炴�т笂鎶ョ殑閫昏緫绫� + /// 璁惧灞炴�х殑閫昏緫绫� /// </summary> - public class HdlDeviceAttributeLogic : ZigBee.Common.IStatus + public class HdlDeviceAttributeLogic { #region 鈻� 鍙橀噺澹版槑___________________________ /// <summary> - /// 灞炴�т笂鎶ョ殑閫昏緫 + /// 灞炴�х殑閫昏緫 /// </summary> private static HdlDeviceAttributeLogic m_Current = null; /// <summary> - /// 灞炴�т笂鎶ョ殑閫昏緫 + /// 灞炴�х殑閫昏緫 /// </summary> public static HdlDeviceAttributeLogic Current { @@ -34,172 +34,6 @@ { m_Current = value; } - } - - /// <summary> - /// 浜嬩欢闆嗗悎 - /// </summary> - private Dictionary<string, Action<CommonDevice>> dicEvent = new Dictionary<string, Action<CommonDevice>>(); - /// <summary> - /// 鍛戒护鍖哄垎 - /// </summary> - private Dictionary<string, string> dicCommandDiv = new Dictionary<string, string>(); - - #endregion - - #region 鈻� 娣诲姞浜嬩欢___________________________ - - /// <summary> - /// 娣诲姞鑾峰彇璁惧灞炴�х殑浜嬩欢(鎺ㄩ�佸凡缁忓己鍒舵寚瀹氳繍琛屼簬涓荤嚎绋嬶紝灞炴�т笂鎶ョ殑瀵硅薄锛歞evice.DeviceStatusReport) - /// </summary> - /// <param name="mainKeys">鏍囪瘑浜嬩欢鐨勪富閿�(鍙互闅忎究濉�,涓昏鏄拡瀵瑰涓晫闈竴璧蜂娇鐢ㄧ殑鎯呭喌)</param> - /// <param name="comand">鍛戒护鍖哄垎,姣斿锛欴eviceStatusReport,IASInfoReport绛夌瓑</param> - /// <param name="action">褰撴帴鏀跺埌缃戝叧鍥炲涔嬪悗鐨勫洖璋冨嚱鏁�,灞炴�т笂鎶ョ殑瀵硅薄锛歞evice.DeviceStatusReport</param> - public void AddAttributeEvent(string mainKeys, string comand, Action<CommonDevice> action) - { - lock (this.dicEvent) - { - if (this.dicEvent.Count == 0) - { - ZbGateway.StatusList.Add(this); - } - this.dicEvent[mainKeys] = action; - this.dicCommandDiv[mainKeys] = comand; - } - } - - #endregion - - #region 鈻� 绉婚櫎鐩戝惉___________________________ - - /// <summary> - /// 绉婚櫎浜嬩欢 - /// </summary> - /// <param name="mainKeys">鏍囪瘑浜嬩欢鐨勪富閿�(鍙互闅忎究濉�,涓昏鏄拡瀵瑰涓晫闈竴璧蜂娇鐢ㄧ殑鎯呭喌)</param> - public void RemoveEvent(string mainKeys) - { - lock (this.dicEvent) - { - if (this.dicEvent.ContainsKey(mainKeys) == true) - { - var action = this.dicEvent[mainKeys]; - this.dicEvent.Remove(mainKeys); - this.dicCommandDiv.Remove(mainKeys); - - action = null; - } - if (this.dicEvent.Count == 0) - { - ZbGateway.StatusList.Remove(this); - } - } - } - - /// <summary> - /// 绉婚櫎鍏ㄩ儴鐨勪簨浠� - /// </summary> - public void RemoveAllEvent() - { - lock (this.dicEvent) - { - var list = new HashSet<string>(); - foreach (var keys in this.dicEvent.Keys) - { - list.Add(keys); - } - foreach (var keys in list) - { - //闇�瑕佹參鎱竴涓竴涓殑閲婃斁Action,鍚 - this.RemoveEvent(keys); - } - } - } - - #endregion - - #region 鈻� 瀹炵幇鎺ュ彛___________________________ - - /// <summary> - /// 璁惧鐘舵�侀�氱煡 - /// </summary> - /// <param name="common"></param> - /// <param name="typeTag"></param> - public void DeviceInfoChange(CommonDevice common, string typeTag) - { - if (common == null || string.IsNullOrEmpty(common.DeviceAddr) == true) - { - //鎴戜篃涓嶇煡閬撹繖鏈夋病鏈夊彲鑳� - return; - } - - lock (this.dicEvent) - { - var list = new List<Action<CommonDevice>>(); - foreach (string keys in this.dicEvent.Keys) - { - if (this.dicCommandDiv[keys] != typeTag) - { - //鍛戒护鍖哄垎涓嶄竴鑷达紝鍒欎笉璋冪敤鍥炶皟鍑芥暟 - continue; - } - //鍛戒护鍖哄垎涓�鑷存椂锛屽垯璋冪敤鍥炶皟鍑芥暟 - list.Add(this.dicEvent[keys]); - } - //鏈夊彲鑳藉湪鍥炶皟鍑芥暟涓Щ闄や簡浜嬩欢锛屽鑷存姤閿欙紝鎵�浠ュ厛鏀堕泦锛屽啀璋冪敤 - Application.RunOnMainThread(() => - { - foreach (var action in list) - { - try - { - action?.Invoke(common); - } - catch (Exception ex) - { - //Log鍑哄姏 - string msg = "褰撳墠婵�娲荤殑鐣岄潰[" + UserCenterResourse.NowActionFormID + "]"; - HdlLogLogic.Current.WriteLog(-1, msg); - HdlLogLogic.Current.WriteLog(ex); - } - - } - }); - } - } - - /// <summary> - /// 涓嶄娇鐢� - /// </summary> - /// <param name="common"></param> - public void Changed(CommonDevice common) - { - } - - /// <summary> - /// 涓嶄娇鐢� - /// </summary> - public void ChangedILogicStatus(ZigBee.Device.Logic logic) - { - } - - /// <summary> - /// 涓嶄娇鐢� - /// </summary> - public void ChangedISceneStatus(Scene scene) - { - } - #endregion - - #region 鈻� 涓�鑸柟娉昣__________________________ - - /// <summary> - /// 鏄惁瀛樺湪鎸囧畾鐨勪簨浠� - /// </summary> - /// <param name="mainkeys"></param> - /// <returns></returns> - public bool IsEsixt(string mainkeys) - { - return this.dicCommandDiv.ContainsKey(mainkeys); } #endregion -- Gitblit v1.8.0