From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
index ea700d3..4b5ea8d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
@@ -191,7 +191,7 @@
btnShortCut.UnSelectedImagePath = "Safeguard/SafetyShortcut.png";
btnShortCut.SelectedImagePath = "Safeguard/SafetyShortcutSelected.png";
- if (UserCenterResourse.UserInfo.AuthorityNo == 1 || UserCenterResourse.UserInfo.AuthorityNo == 2)
+ if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 1 || HdlUserCenterResourse.ResidenceOption.AuthorityNo == 2)
{
//蹇嵎鏂瑰紡鍚戝乏绉诲姩
btnShortCut.X = Application.GetRealWidth(855);
@@ -251,7 +251,7 @@
topFrameLayout.AddChidren(btnShortCut);
btnShortCut.InitControl();
- if (UserCenterResourse.ResidenceOption.SafetyShortcut == true)
+ if (HdlUserCenterResourse.ResidenceOption.SafetyShortcut == true)
{
//浣跨敤蹇嵎鏂瑰紡
btnShortCut.IsSelected = true;
@@ -263,8 +263,8 @@
//纭畾鍙栨秷涓婚〉鐨勩�屽畨闃层�嶆嵎寰勶紵
this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uCancelSafetyShortcutMsg), () =>
{
- UserCenterResourse.ResidenceOption.SafetyShortcut = false;
- UserCenterResourse.ResidenceOption.Save();
+ HdlUserCenterResourse.ResidenceOption.SafetyShortcut = false;
+ HdlUserCenterResourse.ResidenceOption.Save();
btnShortCut.IsSelected = false;
//鍙栨秷涓婚〉鐨勩�屽畨闃层�嶆嵎寰勭殑璇�,涓婚〉闇�瑕侀噸鏂板埛鏂�
UserView.UserPage.Instance.RefreshAllForm = true;
@@ -275,8 +275,8 @@
//纭畾鍒涘缓銆屽畨闃层�嶆嵎寰勫埌涓婚〉锛�
this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.uCreatSafetyShortcutMsg), () =>
{
- UserCenterResourse.ResidenceOption.SafetyShortcut = true;
- UserCenterResourse.ResidenceOption.Save();
+ HdlUserCenterResourse.ResidenceOption.SafetyShortcut = true;
+ HdlUserCenterResourse.ResidenceOption.Save();
btnShortCut.IsSelected = true;
//鍒涘缓涓婚〉鐨勩�屽畨闃层�嶆嵎寰勭殑璇�,涓婚〉闇�瑕侀噸鏂板埛鏂�
UserView.UserPage.Instance.RefreshAllForm = true;
@@ -438,7 +438,7 @@
this.AddSensorStatuRow(listView, zoneId, Info);
//鏀堕泦浼犳劅鍣�
- var tempDevice = Common.LocalDevice.Current.GetDevice(Info.MacAddr, Info.Epoint);
+ var tempDevice = HdlDeviceCommonLogic.Current.GetDevice(Info.MacAddr, Info.Epoint);
if (tempDevice != null)
{
listDevice.Add(tempDevice);
@@ -463,7 +463,7 @@
/// <param name="sensorInfo">浼犳劅鍣ㄧ殑淇℃伅</param>
private void AddSensorStatuRow(VerticalFrameControl listView, int zoneID, Safeguard.ZoneDeviceListData sensorInfo)
{
- CommonDevice device = Common.LocalDevice.Current.GetDevice(sensorInfo.MacAddr, sensorInfo.Epoint);
+ CommonDevice device = HdlDeviceCommonLogic.Current.GetDevice(sensorInfo.MacAddr, sensorInfo.Epoint);
if (device == null)
{
return;
@@ -476,7 +476,7 @@
//娣诲姞闃村奖鐗规晥
frameDevice.SetViewShadow(true);
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
this.dicSensorStatuView[mainkeys] = frameDevice;
}
@@ -499,7 +499,7 @@
}
//浼犳劅鍣ㄧ姸鎬�
- string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkey = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
if (this.dicSensorStatuView.ContainsKey(mainkey) == false)
{
return;
@@ -554,7 +554,7 @@
//鐣岄潰鍏抽棴
return;
}
- var deviceInfo = Common.LocalDevice.Current.ReadDeviceEpointDeviceInfo(device);
+ var deviceInfo = HdlDeviceCommonLogic.Current.ReadDeviceEpointDeviceInfo(device);
if (deviceInfo != null)
{
//璁剧疆璁惧鍦ㄧ嚎鐘舵��
@@ -576,10 +576,10 @@
//鐣岄潰鍏抽棴
return;
}
- string mainkeys = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkeys = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
if (this.dicSensorStatuView.ContainsKey(mainkeys) == true)
{
- CommonDevice Loacldevice = Common.LocalDevice.Current.GetDevice(mainkeys);
+ CommonDevice Loacldevice = HdlDeviceCommonLogic.Current.GetDevice(mainkeys);
if (Loacldevice == null)
{
return;
@@ -597,7 +597,7 @@
HdlThreadLogic.Current.RunMain(() =>
{
//璁剧疆鎺т欢鐨勫湪绾跨姸鎬佹枃鏈晥鏋�
- bool bolOnline = Common.LocalDevice.Current.CheckDeviceIsOnline(device);
+ bool bolOnline = HdlDeviceCommonLogic.Current.CheckDeviceIsOnline(device);
control?.SetOnlineStatu(bolOnline);
});
}
@@ -727,8 +727,8 @@
var info = HdlAlarmsLogic.Current.listSafetyAlarmInfo[0];
if (device != null)
{
- string mainkey1 = Common.LocalDevice.Current.GetDeviceMainKeys(info.DeviceAddr, info.DeviceEpoint);
- string mainkey2 = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkey1 = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(info.DeviceAddr, info.DeviceEpoint);
+ string mainkey2 = HdlDeviceCommonLogic.Current.GetDeviceMainKeys(device);
if (mainkey1 != mainkey2)
{
//涓嶆槸鍚屼竴涓笢瑗�
--
Gitblit v1.8.0