From 0087dd7734e71dfcfd1bb54db394ad7855021ffd Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 24 七月 2020 10:18:08 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
index 35fc675..0917329 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
@@ -77,7 +77,7 @@
this.ShowTipMsg(msg);
return false;
}
- var mainWayId = HdlGatewayLogic.Current.GetGatewayId(mainGateway);
+ var mainWayId = mainGateway.GwId;
//涓婚鏁板浐瀹�5+3+1
int topicCount = 9;
@@ -104,7 +104,7 @@
{
var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.Safeguard.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp != null)
{
string msg = HdlCheckLogic.Current.CheckCommonErrorCode(temp.Error);
@@ -1154,10 +1154,10 @@
}
else if (data.Type == "1")
{
- var scene = Common.SceneRoomUI.AllSceneRoomUIList.Find((obj) => obj.sceneUI.Id == data.ScenesId);
+ var scene = HdlSceneLogic.Current.GetSceneUIBySceneId(data.ScenesId);
if (scene != null)
{
- string msg = scene.sceneUI.Name + "\r\n";
+ string msg = scene.Name + "\r\n";
//鐩爣鍦烘櫙涓嶅瓨鍦�
msg += Language.StringByID(R.MyInternationalizationString.uTargetSceneIsNotExsit);
this.ShowTipMsg(msg);
@@ -1366,7 +1366,7 @@
if (this.UserPassword == null)
{
- var data = Global.ReadFileByDirectory(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardUserPassword);
+ var data = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.SafeguardUserPassword);
if (data != null)
{
this.UserPassword = System.Text.Encoding.UTF8.GetString(data);
@@ -1384,7 +1384,7 @@
if (result != GarrisonMode.None && result != GarrisonMode.RemoveGarrison)
{
//淇濆瓨鍔犲瘑鐨勫瘑鐮佸埌鏈湴
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardUserPassword, System.Text.Encoding.UTF8.GetBytes(this.UserPassword));
+ HdlFileLogic.Current.SaveTextToFile(DirNameResourse.SafeguardUserPassword, this.UserPassword);
}
return result;
}
@@ -1473,7 +1473,7 @@
if (result2 != GarrisonMode.None && result2 != GarrisonMode.RemoveGarrison)
{
//淇濆瓨鍔犲瘑瀵嗙爜鍒版湰鍦�
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardUserPassword, System.Text.Encoding.UTF8.GetBytes(this.UserPassword));
+ HdlFileLogic.Current.SaveTextToFile(DirNameResourse.SafeguardUserPassword, this.UserPassword);
}
return result2;
}
@@ -1588,7 +1588,7 @@
if (result2 != -1)
{
//淇濆瓨鍒板姞瀵嗗瘑鐮佹湰鍦�
- Global.WriteFileToDirectoryByBytes(DirNameResourse.LocalMemoryDirectory, DirNameResourse.SafeguardUserPassword, System.Text.Encoding.UTF8.GetBytes(this.UserPassword));
+ HdlFileLogic.Current.SaveTextToFile(DirNameResourse.SafeguardUserPassword, this.UserPassword);
}
return result2;
}
@@ -1707,11 +1707,6 @@
if (flage == false)
{
return false;
- }
-
- if (zoneId > 3)
- {
- zoneId = 3;
}
//鐘舵�佸彉鏇�
var result = await Safeguard.DisablePushMessageAsync(zoneId, statu);
@@ -2154,7 +2149,7 @@
bool success = false;
//瓒呮椂鏃堕棿
int TimeOut = 0;
- string checkTopic = HdlGatewayLogic.Current.GetGatewayId(realWay) + "/Security/AdminSetNewPassword_Respon";
+ string checkTopic = realWay.GwId + "/Security/AdminSetNewPassword_Respon";
Action<string, string> getResultAction = (topic, message) =>
{
try
--
Gitblit v1.8.0