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;
@@ -344,6 +344,16 @@
                };
                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>
@@ -458,6 +469,6 @@
                devicename.MouseUpEventHandler += devicclick;
            }
        }

        
    }
}