Merge branch 'NewFilePath'

wxr

2020-12-16 23ee4f8c373f9abecf079ef9d4297d8b6cd8d5e6

 HDL_ON/UI/UI2/FuntionControlView/Light/RelayPage.cs

@@ -120,7 +120,7 @@
                Height = Application.GetMinRealAverage(40),
                SelectedImagePath = "Collection/CollectionIcon.png",
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = light.collection
                IsSelected = light.collect
            };
            controlView.AddChidren(btnCollection);
            
@@ -128,12 +128,11 @@
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(102),
                Width = Application.GetRealWidth(168-40),
                Width = Application.GetRealWidth(168),
                Height = Application.GetRealHeight(288),
                BackgroundColor = CSS_Color.PromptingColor2,
                SelectedBackgroundColor= CSS_Color.AuxiliaryColor1,
                Radius = (uint)Application.GetRealWidth(40),
                IsSelected = light.on_off == "on"
                UnSelectedImagePath = "FunctionIcon/Light/RelayBg.png",
                SelectedImagePath = "FunctionIcon/Light/RelayOnBg.png",
                IsSelected = light.trait_on_off.curValue.ToString() == "on"
            };
            controlView.AddChidren(btnSwitchIcon);

@@ -145,14 +144,18 @@
                Height = Application.GetMinRealAverage(40),
                UnSelectedImagePath = "Public/PowerClose.png",
                SelectedImagePath = "Public/PowerOpen.png",
                IsSelected = light.on_off == "on"
                IsSelected = light.trait_on_off.curValue.ToString() == "on"
            };
            controlView.AddChidren(btnSwitch);

            LoadEventList();

            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView(light, actionRefresh);

            new TopViewDiv(bodyView, Language.StringByID(StringId.Lights)).LoadTopView_FunctionTop(light, actionRefresh);
            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(light);
            })
            { IsBackground = true }.Start();
        }
    }
}