2020-05-15-1

陈嘉乐

2020-05-15 d5b9ff8bf8cc36f5b13c46b66682f5988d3a6f36

 ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs

@@ -52,7 +52,7 @@
        {
            X = Application.GetRealWidth(58),
            Y = Application.GetRealHeight(184 + 200 + 280 + 40),
            Height = Application.GetRealHeight(1920 - 40 - 184 - 280 - 200),
            Height = Application.GetRealHeight(Method.H - 40 - 184 - 280 - 200),
            BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
        };

@@ -245,7 +245,7 @@
                };
                fra.AddChidren(roomnameBtn);

                if (i == 0)//
                if (i == 0)//默认选中第一个房间
                {
                    roombjButton.IsSelected = false;
                    roombjButton = roombjBtn;
@@ -313,8 +313,8 @@

                var backgroundColor = new Button
                {
                    Width = Application.GetRealWidth(156),
                    Height = Application.GetRealHeight(180),
                    Width = Application.GetMinRealAverage(156),
                    Height = Application.GetMinRealAverage(180),
                    X = Application.GetRealWidth(10),
                    UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
                    SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
@@ -343,7 +343,17 @@
                    TextSize = 10,
                };
                deviceRowLayout.AddChidren(devicetypename);
               


                //if (i == 0)//默认选中第一个设备类型
                //{
                //    devicetypeButton.IsSelected = false;
                //    devicetypeButton = backgroundColor;
                //    backgroundColor.IsSelected = true;
                //    var list = Method.GetDeviceType(devicetypename.Text);
                //    ConditionDeviceView(list, devicelist);
                //}

                EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
                {
                    devicetypeButton.IsSelected = false;
@@ -360,6 +370,7 @@
            }
            ///显示房间所有设备
            ConditionDeviceView(new List<DeviceType>(), devicelist);


        }
        /// <summary>
@@ -394,7 +405,7 @@
                    Height = Application.GetMinRealAverage(112),
                    X = Application.GetRealWidth(58),
                    Y = Application.GetRealHeight(30 + 9),
                    // Radius = (uint)Application.GetRealHeight(56),
                     Radius = (uint)Application.GetMinRealAverage(56),
                    BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                };
                deviceFramelayout.AddChidren(bjFramelayout);
@@ -411,8 +422,9 @@
                    Y = Application.GetRealHeight(30),
                    Width = Application.GetRealWidth(850),
                    Height = Application.GetRealHeight(130),
                    X = Application.GetRealWidth(176 + 10),
                    LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                    X = Application.GetRealWidth(176 + 25),
                    //LineColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                    LineColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
                };
                deviceFramelayout.AddChidren(deviceRow);
                var devicename = new Button
@@ -424,6 +436,16 @@
                    TextSize = 14,
                };
                deviceRow.AddChidren(devicename);

                var lineBtn = new Button
                {
                    Y = deviceFramelayout.Height-1,
                    Height = 1,
                    Width = Application.GetRealWidth(850),
                    X = Application.GetRealWidth(176 + 25),
                    BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                };
                deviceFramelayout.AddChidren(lineBtn);
                EventHandler<MouseEventArgs> devicclick = (sen, e) =>
                {
                    clickbutton.IsSelected = false;