Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-18 aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c

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

old mode 100644
new mode 100755
@@ -121,9 +121,14 @@
                Height = Application.GetMinRealAverage(40),
                SelectedImagePath = "Collection/CollectionIcon.png",
                UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
                IsSelected = light.collection
                IsSelected = light.collect
            };
            controlView.AddChidren(btnCollection);
            //controlView.AddChidren(btnCollection);
            //2020-12-16 如果是成员隐藏收藏功能
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            {
                controlView.AddChidren(btnCollection);
            }

            dimmerBar = new WaveSeekBarOn()
            {
@@ -241,7 +246,11 @@
            LoadEventList();

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

            new System.Threading.Thread(() =>
            {
                DriverLayer.Control.Ins.SendReadCommand(light);
            })
            { IsBackground = true }.Start();
        }