2020-03-23-2

WJC

2020-03-23 1f6f024bddf48dea1c17c54ade1535a10ef7b39b

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

@@ -2334,9 +2334,16 @@
                    refresview.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
                }
            }
          
            foreach (var logic in Common.Logic.LogicList)
            {

                var fLayout = new FrameLayout
                {
                    Height = Application.GetRealHeight(190 + 30),
                    Width = Application.GetRealWidth(1080 - 58),
                    BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
                };
                refresview.AddChidren(fLayout);

                var logicRowlayout = new RowLayout
                {
@@ -2347,9 +2354,7 @@
                    SubViewWidth = Application.GetRealWidth(184),//改变编辑控件宽度多少；

                };
                refresview.AddChidren(logicRowlayout);


                fLayout.AddChidren(logicRowlayout);

                var logicnameBtn = new Button
                {
@@ -2364,11 +2369,10 @@
                };
                logicRowlayout.AddChidren(logicnameBtn);


                var logicswitchBtn = new Button
                {
                    Width = Application.GetRealWidth(104),
                    Height = Application.GetRealHeight(63),
                    Width = Application.GetMinRealAverage(104),
                    Height = Application.GetMinRealAverage(63),
                    UnSelectedImagePath = "ZigeeLogic/logicclose.png",
                    SelectedImagePath = "ZigeeLogic/logicopen.png",
                    X = logicRowlayout.Width - Application.GetRealWidth(104 + 58),
@@ -2376,8 +2380,6 @@

                };
                logicRowlayout.AddChidren(logicswitchBtn);



                logicswitchBtn.MouseUpEventHandler += (sender1, e1) =>
                {
@@ -2425,7 +2427,6 @@

                };


                ///删除
                var del = new Button
                {
@@ -2452,13 +2453,13 @@
                };
                var line = new Button
                {
                    Y = Application.GetRealHeight(215),
                    Height = Application.GetRealHeight(5),
                    Y = fLayout.Height-1,
                    Height =1,
                    X = Application.GetRealWidth(58),
                    Width = Application.GetRealWidth(1080 - 58),
                    BackgroundColor = ZigbeeColor.Current.LogicRowLayoutLineColor,
                    X = Application.GetRealWidth(58),
                };
                logicRowlayout.AddChidren(line);
                fLayout.AddChidren(line);
            }

        }
@@ -2522,7 +2523,7 @@
                    Height = Application.GetMinRealAverage(82),
                    X = Application.GetRealWidth(58) + Application.GetRealWidth(12 + (12 + 82 + 45 + 12) * i),
                    Y = Application.GetRealHeight(58 + 30 + 30),
                    Radius = (uint)Application.GetRealHeight(41),
                    Radius = (uint)Application.GetMinRealAverage(41),
                    BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
                };
                logicRowlayout.AddChidren(typebjBtn);