2020-04-02-2

WJC

2020-04-02 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7

 ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFunctionSettionForm.cs

@@ -198,7 +198,7 @@
            rowBeloneArea.SelectRoomEvent += (roomKeys) =>

            {

                //变更房间

                Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, roomKeys);

                HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);

            };



            //添加功能类型行

@@ -407,19 +407,19 @@
            if (listSort.Count == 8)

            {

                //八按键面板

                btnPic.UnSelectedImagePath = "Device/PanelFangyueEightButtonTable.png";

                btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueEightButtonTable.png";

                this.InitEightButtonPanelIcon(frameBorder, listSort);

            }

            else if (listSort.Count == 4)

            {

                //四按键面板

                btnPic.UnSelectedImagePath = "Device/PanelFangyueFourButtonTable.png";

                btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueFourButtonTable.png";

                this.InitFourButtonPanelIcon(frameBorder, listSort);

            }

            else

            {

                //二按键面板

                btnPic.UnSelectedImagePath = "Device/PanelFangyueTwoButtonTable.png";

                btnPic.UnSelectedImagePath = "DeviceItem/PanelFangyueTwoButtonTable.png";

                this.InitTwoButtonPanelIcon(frameBorder, listSort);

            }

        }

@@ -636,7 +636,7 @@
                    return;

                }

                //不选择状态

                nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor;

                nowSelectControl.TextColor = UserCenterColor.Current.TextGrayColor1;

                //记录它的名字

                dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();

            }