2019.12.24

gxc

2019-12-24 ff3cfcf62632bf43e51a6b6098c203bf0f5cddbc

 ZigbeeApp/Shared/Phone/Device/Category/Category.cs

@@ -1072,9 +1072,9 @@
                                    var deviceRow = new CategoryFunctionRow(0, 35);
                                    deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                                    deviceRow.SetOnLineStatu(light.IsOnline == 1);
                                    //deviceRow.SetOnLineStatu(light.IsOnline == 1);
                                    deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                    deviceRow.SetStatu(light.OnOffStatus == 1);
                                    deviceRow.IsSelected = light.OnOffStatus == 1;
                                    deviceTypeRowLayout.AddChidren(deviceRow);

                                    deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1193,8 +1193,8 @@
                                    var deviceRow = new CategoryFunctionRow(0, 35);
                                    deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                                    deviceRow.SetOnLineStatu(airSwitch.IsOnline == 1);
                                    deviceRow.SetStatu(airSwitch.OnOffStatus == 1);
                                    //deviceRow.SetOnLineStatu(airSwitch.IsOnline == 1);
                                    deviceRow.IsSelected = airSwitch.OnOffStatus == 1;
                                    deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                    deviceTypeRowLayout.AddChidren(deviceRow);

@@ -1204,8 +1204,8 @@
                                        sendedControlCommand = false;
                                        zbGateway.ReportAction += UpdateDeviceControllStatu;
                                        AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);

                                        (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
                                        deviceRow.IsSelected = (send2 as Button).IsSelected;
                                        if ((send2 as Button).IsSelected)
                                        {
                                            airSwitch.SwitchControl(1);
@@ -1296,9 +1296,9 @@
                                    var deviceRow = new CategoryFunctionRow(0, 35);
                                    deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                                    deviceRow.SetOnLineStatu(dimmableLight.IsOnline == 1);
                                    //deviceRow.SetOnLineStatu(dimmableLight.IsOnline == 1);
                                    deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                    deviceRow.SetStatu(dimmableLight.OnOffStatus == 1);
                                    deviceRow.IsSelected = dimmableLight.OnOffStatus == 1;
                                    deviceTypeRowLayout.AddChidren(deviceRow);

                                    deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1307,8 +1307,8 @@
                                        sendedControlCommand = false;
                                        zbGateway.ReportAction += UpdateDeviceControllStatu;
                                        AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);

                                        (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
                                        deviceRow.IsSelected = (send2 as Button).IsSelected;
                                        if ((send2 as Button).IsSelected)
                                        {
                                            dimmableLight.SwitchControl(1);
@@ -1401,9 +1401,9 @@
                                    var deviceRow = new CategoryFunctionRow(0, 35);
                                    deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                                    deviceRow.SetOnLineStatu(ac.IsOnline == 1);
                                    //deviceRow.SetOnLineStatu(ac.IsOnline == 1);
                                    deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                    deviceRow.SetStatu(ac.currentSystemMode != 1);
                                    deviceRow.IsSelected = ac.currentSystemMode != 1;
                                    deviceTypeRowLayout.AddChidren(deviceRow);

                                    deviceRow.SwitchBtn.MouseUpEventHandler += (send2, e2) =>
@@ -1414,6 +1414,7 @@
                                        AddZbGateway(zbGatewayList, zbGateway, commonDeviceList, deviceUI.CommonDevice);

                                        (send2 as Button).IsSelected = !(send2 as Button).IsSelected;
                                        deviceRow.IsSelected = (send2 as Button).IsSelected;
                                        if ((send2 as Button).IsSelected)
                                        {
                                            ac.Open();
@@ -1505,7 +1506,7 @@
                                    var deviceRow = new CategoryFunctionForWinRow(0, 35);
                                    deviceRow.Init(deviceUI);
                                    deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                                    deviceRow.SetOnLineStatu(rollerShade.IsOnline == 1);
                                    //deviceRow.SetOnLineStatu(rollerShade.IsOnline == 1);
                                    deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                    deviceRow.IsSelected = rollerShade.WcdCurrentPositionLiftPercentage != 0;
                                    deviceRow.SetRollerShadeIcon(rollerShade.WcdType);
@@ -1570,7 +1571,7 @@
                                var deviceRow = new CategoryFunctionRow(0, 35);
                                deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                                deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
                                //deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                deviceRow.HideSwitchBtn(true);
                                deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1612,7 +1613,8 @@
                                var deviceRow = new CategoryFunctionRow(0, 35);
                                deviceRow.Init(deviceUI.IconPath, deviceUI.OnlineIconPath);
                                deviceRow.SetTitle(deviceUI.CommonDevice.DeviceEpointName);
                                deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);
                                //deviceRow.SetOnLineStatu(deviceUI.CommonDevice.IsOnline == 1);

                                deviceRow.SetStatuText(deviceUI.GetDeviceStatu());
                                deviceRow.HideSwitchBtn(true);
                                deviceTypeRowLayout.AddChidren(deviceRow);
@@ -1667,32 +1669,21 @@
            };
            functionSceneAutoBodyView.AddChidren(functionSceneBodyView);

            Button curBtn = new Button();
            RoomButton curBtn = new RoomButton(0,0);
            foreach (var room in Common.Room.CurrentRoom.GetRoomsByCurrentFloorIdAppendLoveRoom())
            {
                var row = new FrameLayout()
                {
                    Width = Application.GetRealWidth(187 + 50),
                    Width = Application.GetRealWidth(255),
                    Height = Application.GetRealHeight(167)
                };
                roomFL.AddChidren(row);

                var roomBtn = new Button()
                {
                    Width = Application.GetRealWidth(187),
                    Height = Application.GetRealHeight(78),
                    Radius = (uint)Application.GetRealHeight(78 / 2),
                    Gravity = Gravity.Center,
                    Text = room.Name,
                    TextColor = ZigbeeColor.Current.GXCTextGrayColor,
                    SelectedTextColor = ZigbeeColor.Current.GXCTextWhiteColor,
                    BackgroundColor = ZigbeeColor.Current.GXCButtonUnSelectedColor3,
                    SelectedBackgroundColor = ZigbeeColor.Current.GXCButtonSelectedColor,
                    BorderColor = ZigbeeColor.Current.GXCBorderUnSelectedColor,
                    BorderWidth = 1
                };
                RoomButton roomBtn = new RoomButton(0, 0);
                roomBtn.Gravity = Gravity.Center;
                roomBtn.Init();
                roomBtn.SetTitle(room.Name);
                row.AddChidren(roomBtn);
                roomBtn.SetViewShadow(true,5);

                if (room.IsLove)
                {
@@ -1707,17 +1698,16 @@
                    {
                        RefreshFunction(room);
                    }

                }
                roomBtn.MouseUpEventHandler += (sender, e) =>
                roomBtn.ButtonClickEvent += (sender, e) =>
                {
                    if ((sender as Button) == curBtn)
                    if (sender  == curBtn)
                    {
                        return;
                    }
                    (sender as Button).IsSelected = true;
                    sender.IsSelected = true;
                    curBtn.IsSelected = false;
                    curBtn = sender as Button;
                    curBtn = sender;
                    this.curRoom = room;
                    if (sceneBtn.IsSelected)
                    {