From dee21bf452a8979d0515d13e534fbb69ed9715dd Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期二, 01 九月 2020 15:33:13 +0800 Subject: [PATCH] 上传一个版本 --- ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 47 insertions(+), 2 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs index ec0d985..65a7576 100755 --- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs +++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs @@ -110,6 +110,13 @@ { return 0; } + + /// <summary> + /// 鍙樻洿Mac缂撳瓨(鍦ㄧ綉鍏虫墽琛屽畬鎴愬鍏ヤ箣鍚庢墽琛�) + /// </summary> + public virtual void ChangedMacMemmory() + { + } } /// <summary> @@ -394,7 +401,7 @@ /// 缁戝畾鍒楄〃 /// </summary> public List<ZigBee.Device.BindObj.BindListResponseObj> BindList = new List<ZigBee.Device.BindObj.BindListResponseObj>(); - + /// <summary> /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗� /// </summary> @@ -471,6 +478,40 @@ { //鎵ц杩欎釜鍛戒护澶х害闇�瑕�15绉� return 15; + } + + /// <summary> + /// 鍙樻洿缁戝畾鐩爣鐨凪ac + /// </summary> + public override void ChangedMacMemmory() + { + //褰撳墠閫夋嫨鐨勬ā鏉垮璞� + var dicChangedMac = new Dictionary<string, string>(); + var dicNowSelect = TemplateCommonLogic.Current.modelData.dicDeviceTemplateSelect; + foreach (var localMac in dicNowSelect.Keys) + { + dicChangedMac[dicNowSelect[localMac]] = localMac; + } + foreach (var data in BindList) + { + //璁惧 + if (data.BindType != 2) + { + if (dicChangedMac.ContainsKey(data.BindMacAddr) == false) + { + //杩欎釜涓滆タ娌℃湁閫夋嫨妯℃澘,鍒欎笉鎵ц + continue; + } + //鏇挎崲mac + data.BindMacAddr = dicChangedMac[data.BindMacAddr]; + } + } + var localDevice = Common.LocalDevice.Current.GetDevice(this.DeviceMac, this.DeviceEpoint); + if (localDevice != null) + { + //鍙樻洿缂撳瓨 + TemplateCommonLogic.Current.SaveDeviceMemmoryData(localDevice); + } } } @@ -720,7 +761,11 @@ /// <summary> /// 瀵硅薄绫�:ModelPanelBackLightInfo /// </summary> - A闈㈡澘鑳屽厜鐏� = 15 + A闈㈡澘鑳屽厜鐏� = 15, + /// <summary> + /// ModelAutomaticTimingOffInfo + /// </summary> + A瀹氭椂鑷姩鍏抽棴 = 16, } /// <summary> -- Gitblit v1.8.0