2020-04-02-2

WJC

2020-04-02 94e4e5b9fd3da964c44b7b14227d6fe2bbb426d7

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

@@ -59,14 +59,14 @@
        public void Show(string Name)
        {
            #region  上面的布局代码
            UserView.HomePage.Instance.ScrollEnabled = false;
            UserView.HomePage.Instance.ScrollEnabled = false;//锁住左滑
            this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
            TopView view = new TopView();
            this.AddChidren(view.TopRowView(true));
            view.toptitleNameBtn.Text = Name;
            view.clickBtn.MouseDownEventHandler += (sender, e) =>
            {
                UserView.HomePage.Instance.ScrollEnabled = true;
                UserView.HomePage.Instance.ScrollEnabled = true;//恢复左滑
                RemoveFromParent();
            };
            view.foolrnameBtn.Text = Config.Instance.Home.GetCurrentFloorName;
@@ -151,8 +151,8 @@

                        var btnfoolricon = new Button
                        {
                            Width = Application.GetRealWidth(81),
                            Height = Application.GetRealHeight(81),
                            Width = Application.GetMinRealAverage(81),
                            Height = Application.GetMinRealAverage(81),
                            UnSelectedImagePath = "Floor/Floor.png",
                            Gravity = Gravity.CenterVertical,
                        };
@@ -287,7 +287,7 @@
        /// <param name="devicelist">Devicelist.</param>
        void AllDeviceTypeView(List<CommonDevice> devicelist)
        {
            var devicetypelist = Method.GetDeviceTypeList(IfType, devicelist);
            var devicetypelist = Method.GetDeviceTypeList(devicelist);
            devicetypehorizontalScrol.RemoveAll();
            for (int i = 0; i < devicetypelist.Count; i++)
            {
@@ -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",
@@ -324,8 +324,8 @@

                var devicetypeicon = new Button
                {
                    Width = Application.GetRealWidth(84),
                    Height = Application.GetRealHeight(84),
                    Width = Application.GetMinRealAverage(84),
                    Height = Application.GetMinRealAverage(84),
                    X = Application.GetRealWidth(46),
                    Y = Application.GetRealHeight(30),
                    UnSelectedImagePath =Method.GetDeviceTypeIcon(devicetype),
@@ -390,18 +390,18 @@
                middle.AddChidren(deviceFramelayout);
                var bjFramelayout = new FrameLayout
                {
                    Width = Application.GetRealWidth(112),
                    Height = Application.GetRealHeight(112),
                    Width = Application.GetMinRealAverage(112),
                    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);
                var deviceIconBtn = new Button
                {
                    Width = Application.GetRealWidth(82),
                    Height = Application.GetRealHeight(82),
                    Width = Application.GetMinRealAverage(82),
                    Height = Application.GetMinRealAverage(82),
                    Gravity = Gravity.Center,
                };
                bjFramelayout.AddChidren(deviceIconBtn);
@@ -411,9 +411,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
@@ -425,6 +425,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;