Merge branch 'dev-tzy' into DEV_GXC

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);

            };



            //添加全部菜单

@@ -250,8 +240,13 @@
                btnRow.AddRightArrow();

                //底线

                btnRow.AddBottomLine();

                var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;

                btnRow.ButtonClickEvent += (sender, e) =>

                {

                    var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);

                    Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);

                    Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;

                    userManagement.Show();

                };

            }

        }

@@ -278,10 +273,23 @@
                var btnswitch = btnRow.AddMostRightSwitchIcon();

                //底线

                btnRow.AddBottomLine();

                if (string.IsNullOrEmpty(ZigBee.Device.DoorLock.RemoteUnlockPassword) == false)

                {

                    btnswitch.IsSelected = true;

                }



               var doorLock= (ZigBee.Device.DoorLock)listNewDevice[0];

                btnswitch.ButtonClickEvent += (sender, e) =>

                {

                    btnswitch.IsSelected = !btnswitch.IsSelected;

                    if (btnswitch.IsSelected == true)

                    {

                        btnswitch.IsSelected = false;

                        ZigBee.Device.DoorLock.RemoteUnlockPassword = string.Empty;

                        return;

                    }

                    var frame = new DoorLock.DoorLockCommonLayout();

                    frame.RemotePasswordDialog((ZigBee.Device.DoorLock)listNewDevice[0], btnswitch.btnIcon);

                    frame = null;

                };

            }

        }