From 3aa397ab145382935492b11c1f18c9634e69910b Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期四, 10 十二月 2020 16:45:00 +0800
Subject: [PATCH] 请合并，门锁和晾衣架第一版代码
---
ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs | 381 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 323 insertions(+), 58 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
index f435350..3772876 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
@@ -171,7 +171,7 @@
/// </summary>
/// <param name="strData">妯℃澘鏂囦欢涓殑琛屾暟鎹�</param>
/// <param name="hadRoom">鏄惁宸茬粡鏈変簡鎴块棿</param>
- private bool AdjustTemplateBinFileContentOnLoadMemory(string strData,bool hadRoom)
+ private bool AdjustTemplateBinFileContentOnLoadMemory(string strData, bool hadRoom)
{
//鍦烘櫙瀵硅薄
if (strData == "#SceneTemplate END#")
@@ -366,7 +366,18 @@
else if (strData == "#DeviceInfo END#")
{
//鍙嶅簭鍒楀寲璁惧
- var device = CommonDevice.CommonDeviceByByteString(deviceType, this.strTempContentData);
+ CommonDevice device = null;
+ if (HdlCheckLogic.Current.CheckIsNumber(deviceType) == true)
+ {
+ //鏁板�煎瀷涓烘柊鏁版嵁,鐩存帴杞崲
+ device = CommonDevice.CommonDeviceByByteString(Convert.ToInt32(deviceType), this.strTempContentData);
+ }
+ else
+ {
+ //瀛楃涓插瀷涓烘棫鏁版嵁,闇�瑕佺壒娈婂鐞�
+ var myType = (DeviceType)Enum.Parse(typeof(DeviceType), deviceType);
+ device = CommonDevice.CommonDeviceByByteString((int)myType, this.strTempContentData);
+ }
if (device != null)
{
if (this.modelData.dicDeviceInfo.ContainsKey(device.DeviceAddr) == false)
@@ -510,9 +521,17 @@
{
modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelDeviceBindData>(fileData);
}
- else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�)
+ else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘浜害璋冭妭)
{
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPanelBackLightInfo>(fileData);
+ modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPanelBrightnessAdjustInfo>(fileData);
+ }
+ else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘鑺傝兘妯″紡)
+ {
+ modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPanelEnergyModeInfo>(fileData);
+ }
+ else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘鎸囩ず鐏�)
+ {
+ modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPanelIndicatorLightInfo>(fileData);
}
else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘)
{
@@ -581,7 +600,7 @@
{
fileName = model.FileName;
//澶囦唤鏁版嵁宸茬粡瀛樺湪,鏄惁瑕嗙洊?
- this.ShowMassage(ShowMsgType.Confirm, "澶囦唤鏁版嵁宸茬粡瀛樺湪,鏄惁瑕嗙洊?", () =>
+ this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.BackUpDataIsEsixtAndPickUp), () =>
{
//灏嗘ā鏉挎暟鎹繚瀛樺埌鍒版寚瀹氱殑鏂囦欢澶逛腑
this.SaveTemplateDataToLocation2(fileName, backupName);
@@ -617,8 +636,9 @@
else
{
//鏈湴澶囦唤淇濆瓨鎴愬姛
- this.ShowMassage(ShowMsgType.Tip, "鏈湴澶囦唤淇濆瓨鎴愬姛");
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.SaveLocalBackDataSuccess));
}
+ ProgressFormBar.Current.Close();
});
}
@@ -661,6 +681,9 @@
TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, Common.LocalDevice.Current.GetDeviceEpointName(device));
}
}
+ #endregion
+
+ #region 鈻� 鑾峰彇妯℃澘瀵硅薄鐩稿叧___________________
/// <summary>
/// 鑾峰彇鏈湴鍏ㄩ儴鐨勬ā鏉垮垪琛ㄧ殑鍩烘湰淇℃伅
@@ -700,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;
}
}
@@ -716,12 +740,274 @@
}
/// <summary>
+ /// 鑾峰彇浜戠鍏ㄩ儴鐨勬ā鏉垮垪琛ㄧ殑鍩烘湰淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public List<CloundModelBaseInfo> GetCloundAllModelList()
+ {
+ var pra = new
+ {
+ RequestVersion = Common.CommonPage.RequestVersion,
+ RequestSource = 5,
+ LoginAccessToken = Common.Config.Instance.Token
+ };
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ProjectTemplate/GetProTemplateList", false, pra);
+ if (result == null) { return new List<CloundModelBaseInfo>(); }
+
+ var dicData = new Dictionary<string, List<CloundModelBaseInfo>>();
+ var listTime = new List<string>();
+
+ var listCloundData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<CloundModelBaseInfo>>(result);
+ foreach (var data in listCloundData)
+ {
+ //鍙樻洿鏃堕棿鏍煎紡
+ data.CreatedOnUtc = UserCenterLogic.ConvertUtcTimeToLocalTime(data.CreatedOnUtc).ToString("yyyy.MM.dd HH:mm");
+ if (dicData.ContainsKey(data.CreatedOnUtc) == false)
+ {
+ dicData[data.CreatedOnUtc] = new List<CloundModelBaseInfo>();
+ listTime.Add(data.CreatedOnUtc);
+ }
+ dicData[data.CreatedOnUtc].Add(data);
+ }
+
+ //鎸夋椂闂存帓搴�
+ listTime.Sort();
+
+ var listData = new List<CloundModelBaseInfo>();
+ for (int i = listTime.Count - 1; i >= 0; i--)
+ {
+ listData.AddRange(dicData[listTime[i]]);
+ }
+ return listData;
+ }
+
+ /// <summary>
/// 鑾峰彇涓�涓柊鐨勬ā鏉夸繚瀛樻枃浠跺悕
/// </summary>
/// <returns></returns>
public string GetNewTemplateFileName()
{
- return "ModelData_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".bin";
+ 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
+
+ #region 鈻� 涓婁紶妯℃澘澶囦唤_______________________
+
+ /// <summary>
+ /// 涓婁紶妯℃澘澶囦唤(鍐呴儴浣跨敤绾跨▼鏉ユ墽琛�,鏈夎浆鍦堢殑鐣岄潰)
+ /// </summary>
+ /// <param name="i_localTemplate">鏈湴妯℃澘淇℃伅</param>
+ /// <param name="i_saveName">澶囦唤鍚嶅瓧</param>
+ public void UpLoadTemplateData(LocalModelBaseInfo i_localTemplate, string i_saveName)
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ ProgressBar.Show();
+
+ //鑾峰彇浜戠鐨勬ā鏉垮垪琛�
+ var listTemplate = this.GetCloundAllModelList();
+ foreach (var data in listTemplate)
+ {
+ if (data.TemplateName == i_saveName)
+ {
+ //妯℃澘鍚嶅瓧宸茬粡瀛樺湪
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.TheTemplateNameIsEsixt));
+ ProgressBar.Close();
+ return;
+ }
+ }
+ //杩欓噷淇敼鎺夋ā鏉挎枃浠堕噷闈㈣杞界殑妯℃澘鍚嶇О
+ string templateFile = System.IO.Path.Combine(DirNameResourse.AllResidenceTemplateDirectory, i_localTemplate.FileName);
+ string binFileData = HdlFileLogic.Current.ReadFileTextContent(templateFile);
+ var arryBinFile = binFileData.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
+ //鏇挎崲鐩爣 杩欓噷鏄ā鏉垮熀鏈俊鎭殑json鏁版嵁
+ string strFileData = arryBinFile[1];
+ var templateBaseInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<LocalModelBaseInfo>(strFileData);
+ templateBaseInfo.ModelName = i_saveName;//鏇存敼鎺夊悕瀛�
+ templateBaseInfo.EditorTime = DateTime.Now.ToString("yyyy.MM.dd HH:mm");//鏇存敼鎺夋椂闂�
+ //鏇挎崲瀵硅薄
+ string replaceDta = Newtonsoft.Json.JsonConvert.SerializeObject(templateBaseInfo);
+ binFileData = binFileData.Replace(strFileData, replaceDta);
+
+ var pra = new
+ {
+ RequestVersion = Common.CommonPage.RequestVersion,
+ RequestSource = 5,
+ LoginAccessToken = Common.Config.Instance.Token,
+ ProTemplateName = i_saveName,
+ ProTemplateDetails = new List<TemplateDetailsInfo>()
+ };
+ var detailsInfo = new TemplateDetailsInfo();
+ detailsInfo.DetailName = "ModelData_Cloud_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".bin";
+ detailsInfo.DetailContent = Encoding.UTF8.GetBytes(binFileData);
+ pra.ProTemplateDetails.Add(detailsInfo);
+
+ //娓呮帀杩欎釜瀛楃涓茬紦瀛�
+ binFileData = null;
+
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ProjectTemplate/AddProTemplate", false, pra);
+ if (result == true)
+ {
+ //涓婁紶妯℃澘鎴愬姛
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.UploadTemplateSuccess));
+ }
+ else
+ {
+ //涓婁紶妯℃澘澶辫触
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.UploadTemplateFail));
+ }
+ ProgressBar.Close();
+ });
+ }
+
+ /// <summary>
+ /// 涓婁紶妯℃澘鏂囦欢鐨勪俊鎭�
+ /// </summary>
+ private class TemplateDetailsInfo
+ {
+ /// <summary>
+ /// 鏂囦欢鍚嶅瓧
+ /// </summary>
+ public string DetailName = string.Empty;
+ /// <summary>
+ /// 妯℃澘鍐呭
+ /// </summary>
+ public byte[] DetailContent = null;
+ }
+
+ #endregion
+
+ #region 鈻� 涓嬭浇妯℃澘澶囦唤_______________________
+
+ /// <summary>
+ /// 涓嬭浇妯℃澘澶囦唤(鍐呴儴鏄娇鐢ㄧ嚎绋嬫墽琛�,鏈夌晫闈㈠瀷杩涘害鏉�)
+ /// </summary>
+ /// <param name="i_templateId">鏁版嵁搴撲富閿�</param>
+ /// <param name="i_SuccessAction">涓嬭浇瀹屽叏鎴愬姛涔嬪悗鐨勫洖璋冧簨浠�,鍙傛暟涓轰繚瀛樻ā鏉跨殑鍏ㄨ矾寰�(鍙傛暟null浠ｈ〃澶辫触)</param>
+ public void DownLoadTemplate(string i_templateId, Action<string> i_SuccessAction = null)
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ ProgressFormBar.Current.Start();
+ ProgressFormBar.Current.SetMsg("姝ｅ湪涓嬭浇妯℃澘鏁版嵁");
+ System.Threading.Thread.Sleep(1500);
+
+ var pra = new
+ {
+ RequestVersion = Common.CommonPage.RequestVersion,
+ RequestSource = 5,
+ LoginAccessToken = Common.Config.Instance.Token,
+ ProTemplateId = i_templateId
+ };
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ProjectTemplate/GetProTemplateDetailList", false, pra);
+ if (result == null)
+ {
+ //涓嬭浇妯℃澘澶辫触
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.DownloadTemplateFail));
+ ProgressFormBar.Current.Close();
+ i_SuccessAction?.Invoke(null);
+ return;
+ }
+ var fileListData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DownloadTemplateData>>(result);
+ if (fileListData.Count == 0)
+ {
+ //涓嬭浇妯℃澘澶辫触
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.DownloadTemplateFail));
+ ProgressFormBar.Current.Close();
+ i_SuccessAction?.Invoke(null);
+ return;
+ }
+ //瑙ｆ瀽杩欎釜妯℃澘鐨勫悕瀛�
+ var strFileData = this.GetDataFromFileContent(Encoding.UTF8.GetString(fileListData[0].DetailContent), "#START#", "#TemplateData END#");
+ var templateBaseInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<LocalModelBaseInfo>(strFileData);
+
+ //妫�娴嬫湰鍦扮殑妯℃澘鏄惁鏈夊悓鍚嶇殑
+ var listLocal = this.GetLocalAllModelList();
+ string fileName = fileListData[0].DetailName;
+ foreach (var localData in listLocal)
+ {
+ if (localData.ModelName == templateBaseInfo.ModelName)
+ {
+ //鏇挎崲,鐩存帴浣跨敤鏈湴鐨勬ā鏉挎枃浠跺悕瀛�
+ fileName = localData.FileName;
+ break;
+ }
+ }
+
+ //瀛樻垚鏂囦欢
+ string fileFullName = System.IO.Path.Combine(DirNameResourse.AllResidenceTemplateDirectory, fileName);
+ HdlFileLogic.Current.SaveByteToFile(fileFullName, fileListData[0].DetailContent);
+
+ //鑾峰彇鍗囩骇鍥轰欢鏂囦欢
+ var result2 = HdlFirmwareUpdateLogic.DownLoadTemplateDeviceFirmware(fileFullName, "姝ｅ湪鑾峰彇鍗囩骇鍥轰欢鏁版嵁");
+ if (result2 == -1)
+ {
+ this.ShowMassage(ShowMsgType.Tip, "鑾峰彇鍗囩骇鍥轰欢鏁版嵁澶辫触");
+ ProgressFormBar.Current.Close();
+ i_SuccessAction?.Invoke(null);
+ return;
+ }
+ ProgressFormBar.Current.Close();
+ i_SuccessAction?.Invoke(fileFullName);
+ });
+ }
+
+ /// <summary>
+ /// 涓嬭浇妯℃澘
+ /// </summary>
+ private class DownloadTemplateData
+ {
+ /// <summary>
+ /// 妯℃澘鏂囦欢鍚嶅瓧
+ /// </summary>
+ public string DetailName = string.Empty;
+ /// <summary>
+ /// 妯℃澘鏁版嵁
+ /// </summary>
+ public byte[] DetailContent = null;
+ }
+
+ #endregion
+
+ #region 鈻� 鍒犻櫎妯℃澘澶囦唤_______________________
+
+ /// <summary>
+ /// 鍒犻櫎浜戠妯℃澘澶囦唤
+ /// </summary>
+ /// <param name="i_templateId">妯℃澘涓婚敭</param>
+ /// <returns></returns>
+ public bool DeleteTemplateFromDb(string i_templateId)
+ {
+ var pra = new
+ {
+ RequestVersion = Common.CommonPage.RequestVersion,
+ RequestSource = 5,
+ LoginAccessToken = Common.Config.Instance.Token,
+ ProTemplateId = i_templateId
+ };
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ProjectTemplate/DeleteProTemplate", false, pra);
+ return result;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鏈湴妯℃澘澶囦唤
+ /// </summary>
+ /// <param name="i_baseInfo">鏈湴妯℃澘鐨勫熀鏈俊鎭�</param>
+ /// <returns></returns>
+ public void DeleteLocalTemplate(LocalModelBaseInfo i_baseInfo)
+ {
+ var fullFile = System.IO.Path.Combine(DirNameResourse.AllResidenceTemplateDirectory, i_baseInfo.FileName);
+ HdlFileLogic.Current.DeleteFile(fullFile);
}
#endregion
@@ -783,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;
//鍔熻兘鏁�
@@ -812,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";
@@ -849,7 +1135,7 @@
foreach (var device in listDevice)
{
//璁惧绔偣
- writeText += "#DeviceInfo START#" + device.Type.ToString() + "\r\n";
+ writeText += "#DeviceInfo START#" + (int)device.Type + "\r\n";
string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(device);
writeText += dataInfo + "\r\n";
writeText += "#DeviceInfo END#\r\n\r\n";
@@ -861,7 +1147,7 @@
var otaDevice = Common.LocalDevice.Current.GetOTADevice(device.DeviceAddr);
if (otaDevice != null)
{
- writeText += "#DeviceInfo START#" + otaDevice.Type.ToString() + "\r\n";
+ writeText += "#DeviceInfo START#" + (int)otaDevice.Type + "\r\n";
string dataInfo2 = Newtonsoft.Json.JsonConvert.SerializeObject(otaDevice);
writeText += dataInfo2 + "\r\n";
writeText += "#DeviceInfo END#\r\n\r\n";
@@ -1009,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)
{
@@ -1016,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);
@@ -1053,7 +1346,7 @@
}
}
//涓嶇濡備綍,閮介渶瑕佸垯閲嶆柊淇濆瓨鎴愭枃浠�
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
//杩樺師鍙婂彉鏇村満鏅殑鎵ц鐩爣
//this.RecoverAndChangedSceneAdjustTarget(device, targetMac);
}
@@ -1206,12 +1499,12 @@
HdlGatewayLogic.Current.ChangedGatewayRoom(sourceGwid, this.modelData.dicDeviceTemplateRealRoom[targetGwid]);
}
//鍙樻洿缃戝叧鍚嶅瓧
- if (this.modelData.dicGatewayInfo.ContainsKey(targetGwid) == true)
- {
- var localGateway = HdlGatewayLogic.Current.GetLocalGateway(sourceGwid);
- string gwName = HdlGatewayLogic.Current.GetGatewayName(this.modelData.dicGatewayInfo[targetGwid]);
- HdlGatewayLogic.Current.ReName(localGateway, gwName);
- }
+ //if (this.modelData.dicGatewayInfo.ContainsKey(targetGwid) == true)
+ //{
+ // var localGateway = HdlGatewayLogic.Current.GetLocalGateway(sourceGwid);
+ // string gwName = HdlGatewayLogic.Current.GetGatewayName(this.modelData.dicGatewayInfo[targetGwid]);
+ // HdlGatewayLogic.Current.ReName(localGateway, gwName);
+ //}
}
/// <summary>
@@ -1412,12 +1705,13 @@
#region 鈻� 淇濆瓨璁惧缂撳瓨_______________________
/// <summary>
- /// 淇濆瓨璁惧缂撳瓨
+ /// 淇濆瓨璁惧缂撳瓨(鑰冭檻鏈夌殑璁惧鐢ㄧ殑鏄�200绔偣,鎵�浠ヨ繖閲屾渶濂戒笉鐢ㄨ澶囧璞′綔涓哄弬鏁�)
/// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- public void SaveDeviceMemmoryData(CommonDevice device)
+ /// <param name="deviceMac">璁惧mac</param>
+ /// <param name="deviceEpoint">璁惧Epoint</param>
+ public void SaveDeviceMemmoryData(string deviceMac, int deviceEpoint)
{
- string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(deviceMac, deviceEpoint);
if (this.modelData.dicDeviceTemplateData.ContainsKey(mainkey) == false)
{
return;
@@ -1425,7 +1719,7 @@
//淇濆瓨璺緞
string saveFile = DirNameResourse.LocalTemplateDirectory;
- saveFile = System.IO.Path.Combine(saveFile, device.FilePath);
+ saveFile = System.IO.Path.Combine(saveFile, "Device_" + mainkey);
var listData = this.modelData.dicDeviceTemplateData[mainkey];
if (listData.Count == 0)
@@ -1791,14 +2085,14 @@
}
/// <summary>
- /// 鑾峰彇璁惧淇濆瓨鐨勬ā鏉垮璞�
+ /// 鑾峰彇璁惧淇濆瓨鐨勬ā鏉垮璞�(鑰冭檻鏈夌殑璁惧鐢ㄧ殑鏄�200绔偣,鎵�浠ヨ繖閲屾渶濂戒笉鐢ㄨ澶囧璞′綔涓哄弬鏁�)
/// </summary>
/// <param name="device"></param>
/// <param name="saveEnum"></param>
/// <returns></returns>
- public TemplateDeviceDataCommon GetDeviceModelDataClass(CommonDevice device, ModelDeviceSaveEnum saveEnum, TemplateDeviceDataCommon newClass)
+ public TemplateDeviceDataCommon GetDeviceModelDataClass(string deviceMac, int deviceEpoint, ModelDeviceSaveEnum saveEnum, TemplateDeviceDataCommon newClass)
{
- string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(deviceMac, deviceEpoint);
//鍒涘缓瀛樺偍绌洪棿
if (this.modelData.dicDeviceTemplateData.ContainsKey(mainkey) == false)
@@ -1815,8 +2109,8 @@
}
//鏂板缓涓�涓柊鐨勫璞�
newClass.DataSaveDiv = saveEnum;
- newClass.DeviceEpoint = device.DeviceEpoint;
- newClass.DeviceMac = device.DeviceAddr;
+ newClass.DeviceEpoint = deviceEpoint;
+ newClass.DeviceMac = deviceMac;
//榛樿鍒涘缓涓�涓储寮曚綅
newClass.ListReceiveResult.Add(string.Empty);
@@ -1837,36 +2131,7 @@
/// <param name="buttonText">鎸夐挳鐨勬枃鏈�</param>
private void ShowMassage(ShowMsgType msgType, string msg, Action action = null, string buttonText = null)
{
- //绌哄璞℃椂锛屼笉鏄剧ず
- if (string.IsNullOrEmpty(msg))
- {
- return;
- }
- Application.RunOnMainThread(() =>
- {
- var alert = new ShowMsgControl(msgType, msg, buttonText);
- if (action != null)
- {
- alert.ConfirmClickEvent += () =>
- {
- try
- {
- //鍥炶皟鍑芥暟
- action?.Invoke();
- }
- catch (Exception ex)
- {
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
-
- //Log鍑哄姏
- HdlLogLogic.Current.WriteLog(ex);
- }
- action = null;
- };
- }
- alert.Show();
- });
+ HdlMessageLogic.Current.ShowMassage(msgType, msg, action, buttonText);
}
#endregion
--
Gitblit v1.8.0