gxc
2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7
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);
            };
            //添加全部菜单
@@ -325,13 +315,8 @@
                btnRow.AddRightArrow();
                //底线
                btnRow.AddBottomLine();
                var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
                btnRow.ButtonClickEvent += (sender, e) =>
                {
                    var tempPage = new Shared.Phone.UserCenter.DoorLock.TimeSettignPage(doorLock, "DoorLockTime");
                    Shared.Phone.UserView.HomePage.Instance.AddChidren(tempPage);
                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
                    tempPage.Show();
                };
            }
        }
@@ -623,7 +608,7 @@
            {
                menuCount = 2;
            }
            var frame = new TopRightMenuControl(menuCount);
            var frame = new TopRightMenuControl(this, menuCount);
            if (canTest == true)
            {
                //定位