wxr
2020-11-24 a5ba89efa83d0a4afd0d25dbeba5989e4944b5b8
HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -111,7 +111,7 @@
                    Y = Application.GetRealHeight(46),
                    Width = Application.GetRealWidth(6),
                    Height = Application.GetRealWidth(6),
                    BackgroundColor = CSS_Color.MainColor,
                    BackgroundColor = CSS_Color.LinkTipFail,
                    Radius = (uint)Application.GetRealWidth(3),
                };
                topView.AddChidren(btnLinkStateTip);
@@ -131,13 +131,15 @@
                topView.AddChidren(btnResidenceName);
#if DEBUG
                //启动a网关mqtt
                //btnResidenceName.MouseUpEventHandler = (sender, e) =>
                //{
                //    System.Threading.Tasks.Task.Run(
                //        async () => { await Mqtt_A_Protocol.StartMqtt();
                //    });
                //};
                //搜索网关
                btnResidenceName.MouseUpEventHandler = (sender, e) =>
                {
                    System.Threading.Tasks.Task.Run(() =>
                        {
                            DB_ResidenceData.residenceData.GatewayType = 0;
                            DriverLayer.Control.Ins.SearchLoaclGateway();
                        });
                };
#endif
                environmentalView = new FrameLayout()
@@ -343,6 +345,13 @@
            {
                MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
            }
            System.Threading.Tasks.Task.Run(() =>
            {
                DB_ResidenceData.residenceData.GatewayType = 0;
                DriverLayer.Control.Ins.SearchLoaclGateway();
            });
        }
        /// <summary>
@@ -386,11 +395,11 @@
                    {
                        if (!function.collection)
                            continue;
                        if (function.roomIdList.Count == 0)//如何在房间已经移除了这个功能,则收藏界面也不会再显示
                        {
                            function.collection = false;
                            continue;
                        }
                        //if (function.roomIdList.Count == 0)//如何在房间已经移除了这个功能,则收藏界面也不会再显示
                        //{
                        //    function.collection = false;
                        //    continue;
                        //}
                    }
                    if (index % 2 == 0)
                    {
@@ -856,7 +865,18 @@
                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);
                btnSettingIcon.MouseUpEventHandler = (sender, e) => {
                    Action backAction = () => {
                        //LoadSceneFunctionControlZone();
                    };
                    Action refreshAction = () => {
                        btnName.Text = function.name;
                        btnZone.Text = function.GetRoomListName();
                        view.BackgroundImagePath = (function as Scene).ImagePath;
                    };
                    var aep = new SceneEditPage(function as Scene, backAction);
                    MainPage.BasePageView.AddChidren(aep);
                    aep.LoadPage(StringId.EditScene, refreshAction);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                };
            }
            catch (Exception ex)