From 108b3cd44e9e2a36748cae8dccd22eff0c8cf989 Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期三, 13 十一月 2019 16:16:58 +0800
Subject: [PATCH] 2019-11-13-1
---
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 20 +++++---------------
1 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index d2b5697..b472ed0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -42,15 +42,6 @@
public void ShowForm(string deviceMac)
{
this.listNewDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
- //鎺掑簭
- this.listNewDevice.Sort((obj1, obj2) =>
- {
- if (obj1.DeviceEpoint > obj2.DeviceEpoint)
- {
- return 1;
- }
- return -1;
- });
this.listDeviceType.Clear();
foreach (var device in listNewDevice)
@@ -104,14 +95,14 @@
btnNote.txtInput.FinishInputEvent += () =>
{
string oldName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
- if (btnNote.Text.Trim() == string.Empty)
+ if (btnNote.Text == string.Empty)
{
btnNote.Text = oldName;
}
- if (oldName != btnNote.Text.Trim())
+ if (oldName != btnNote.Text)
{
//淇敼鍚嶅瓧
- this.DeviceReName(btnNote.Text.Trim(), false);
+ this.DeviceReName(btnNote.Text, false);
}
};
@@ -137,9 +128,6 @@
{
foreach (var device in this.listNewDevice)
{
- //淇濆瓨杩欎釜璁惧灞炰簬鍝釜鍖哄煙
- device.DeviceRoomId = roomKeys;
- device.ReSave();
var room = Room.CurrentRoom.GetRoomByDevice(device);
string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
if (room == null)
@@ -154,6 +142,8 @@
Room.CurrentRoom.ChangedRoom(device, roomKeys);
}
}
+ //淇濆瓨璁惧鎴块棿绱㈠紩
+ Common.LocalDevice.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
};
//娣诲姞鍏ㄩ儴鑿滃崟
--
Gitblit v1.8.0