From 9f326f4000847e6167d8166fa2f6a66f53cb3734 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 09:07:13 +0800
Subject: [PATCH] 新云端Ver1.3
---
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index 726615a..23166b7 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -85,7 +85,7 @@
localDeviceList.Clear();
scList.Clear();
//鑾峰彇鏈湴璁惧鍒楄〃
- foreach (var dev in Shared.Common.LocalDevice.Current.listAllDevice)
+ foreach (var dev in HdlDeviceCommonLogic.Current.listAllDevice)
{
localDeviceList.Add(dev);
}
@@ -457,7 +457,7 @@
}
if (isExistScene)
{
- curSceneUI = HdlSceneLogic.Current.GetSceneUIBySceneId(bindDevice.BindScenesId);
+ curSceneUI = HdlSceneLogic.Current.GetSceneUIBySceneId(bindDevice.BindScenesId);
devicePic.UnSelectedImagePath = "Scene/SceneIcon.png";
if (curSceneUI == null)
{
@@ -517,13 +517,13 @@
btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
}
}
- }
+ }
else
{
btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
}
-
- devicePic.UnSelectedImagePath = tempDev.IconPath;
+
+ devicePic.UnSelectedImagePath = tempDev.IconPath;
devicePic.Text = "";
if (string.IsNullOrEmpty(tempDev.DeviceEpointName))
@@ -550,8 +550,8 @@
rowLayout.frameTable.AddBottomLine();
var btnDel = rowLayout.AddDeleteControl();
btnDel.ButtonClickEvent += (sender, e) =>
- {
- RemoveTargets(bindDevice, btnDel);
+ {
+ RemoveTargets(bindDevice, btnDel);
};
#endregion
}
@@ -622,7 +622,7 @@
btnDel.ButtonClickEvent += async (sender, e) =>
{
string msg = Language.StringByID(R.MyInternationalizationString.ClearAllTargets).Replace("{0}", "\r\n");
- var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
+ var alert = new ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
alert.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alert.ConfirmClickEvent += () =>
@@ -996,7 +996,7 @@
/// <param name="btnDel"></param>
/// <returns></returns>
private int RemoveTargets(BindListResponseObj bindDevice, Button btnDel)
- {
+ {
int result = -1;
var delDevice = new DelDeviceBindData();
delDevice.DeviceAddr = currentKey.DeviceAddr;
--
Gitblit v1.8.0