From dc6493db59dcb0893eac50b72122f94c24056b3f Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 12 十月 2020 14:35:39 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
index 6468fba..3772876 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
@@ -638,6 +638,7 @@
//鏈湴澶囦唤淇濆瓨鎴愬姛
this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.SaveLocalBackDataSuccess));
}
+ ProgressFormBar.Current.Close();
});
}
@@ -722,6 +723,7 @@
{
var homeInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<TemplateHomeInfo>(homeData);
myModel.ListUintContent.AddRange(homeInfo.ListUintContent);
+ myModel.ListUintName.AddRange(homeInfo.ListUintName);
myModel.ResidenceAddressName = homeInfo.ResidenceAddressName;
}
}
@@ -786,6 +788,15 @@
public string GetNewTemplateFileName()
{
return "ModelData_Local_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".bin";
+ }
+
+ /// <summary>
+ /// 鑾峰彇涓�涓柊鐨勬ā鏉夸繚瀛樻枃浠跺悕
+ /// </summary>
+ /// <returns></returns>
+ public string GetNewTemplateFileName(DateTime dateTime)
+ {
+ return "ModelData_Local_" + dateTime.ToString("yyyyMMdd_HHmmss") + ".bin";
}
#endregion
@@ -1058,7 +1069,6 @@
var modelData = new LocalModelBaseInfo();
modelData.EditorTime = DateTime.Now.ToString("yyyy.MM.dd HH:mm");
modelData.ModelName = backUpName;
- modelData.ListUintContent.AddRange(Common.Config.Instance.Home.ListUintContent);
modelData.FloorCount = Common.Config.Instance.Home.FloorDics.Count;
modelData.DeviceCount = this.modelData.dicDeviceTemplateData.Count;
//鍔熻兘鏁�
@@ -1087,6 +1097,7 @@
{
var homeData = new TemplateHomeInfo();
homeData.ResidenceAddressName = Common.Config.Instance.Home.ResidenceAddressName;
+ homeData.ListUintName.AddRange(Common.Config.Instance.Home.ListUintName);
homeData.ListUintContent.AddRange(Common.Config.Instance.Home.ListUintContent);
writeText += "#START#\r\n";
@@ -1284,6 +1295,12 @@
{
//鑾峰彇鏈湴鎸囧畾鐨凪ac鐨勫叏閮ㄨ澶�
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(sourceMac, false);
+ var otaDevice = Common.LocalDevice.Current.GetOTADevice(sourceMac);
+ if (otaDevice != null)
+ {
+ //杩欓噷ota璁惧涔熻鍔犺繘鍘�,閲嶄腑涔嬮噸
+ listDevice.Add(otaDevice);
+ }
foreach (var device in listDevice)
{
@@ -1291,7 +1308,8 @@
string localDeviceKey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
string templateDeviceKey = Common.LocalDevice.Current.GetDeviceMainKeys(targetMac, device.DeviceEpoint);
- if (this.modelData.dicDeviceTemplateRoom.ContainsKey(templateDeviceKey) == true)
+ if (this.modelData.dicDeviceTemplateRoom.ContainsKey(templateDeviceKey) == true
+ && (device is OTADevice) == false)
{
//濡傛灉妯℃澘閲岄潰,杩欎釜绔偣璁剧疆鏈夋埧闂寸殑璇�
HdlRoomLogic.Current.ChangedRoom(device, this.modelData.dicDeviceTemplateRoom[templateDeviceKey], false);
@@ -1701,7 +1719,7 @@
//淇濆瓨璺緞
string saveFile = DirNameResourse.LocalTemplateDirectory;
- saveFile = System.IO.Path.Combine(saveFile, mainkey);
+ saveFile = System.IO.Path.Combine(saveFile, "Device_" + mainkey);
var listData = this.modelData.dicDeviceTemplateData[mainkey];
if (listData.Count == 0)
--
Gitblit v1.8.0