20200928

wxr

2020-09-29 51cb254cbd616e84b7a466b195eb43ab097c3897

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -20,6 +20,10 @@
        /// </summary>
        FrameLayout topView;
        /// <summary>
        /// 连接状态提示
        /// </summary>
        Button btnLinkStateTip;
        /// <summary>
        ///住宅名称显示
        /// </summary>
        Button btnResidenceName;
@@ -101,9 +105,20 @@
                };
                topView.AddChidren(btnTop);

                btnResidenceName = new Button()
                btnLinkStateTip = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = Application.GetRealHeight(46),
                    Width = Application.GetRealWidth(6),
                    Height = Application.GetRealWidth(6),
                    BackgroundColor = CSS_Color.MainColor,
                    Radius = (uint)Application.GetRealWidth(3),
                };
                topView.AddChidren(btnLinkStateTip);

                btnResidenceName = new Button()
                {
                    X = Application.GetRealWidth(26),
                    Y = Application.GetRealHeight(32),
                    Width = Application.GetRealWidth(400),
                    Height = Application.GetRealHeight(33),
@@ -115,12 +130,16 @@
                };
                topView.AddChidren(btnResidenceName);

#if DEBUG11
                btnResidenceName.MouseUpEventHandler = (sender, e) =>
                {
                    System.Threading.Tasks.Task.Run(
                        async () => { await DAL.Net.MqttCommon.StartMqtt();
                    });
#if DEBUG
                //启动a网关mqtt
                //btnResidenceName.MouseUpEventHandler = (sender, e) =>
                //{
                //    System.Threading.Tasks.Task.Run(
                //        async () => { await Mqtt_A_Protocol.StartMqtt();
                //    });
                //};
                btnResidenceName.MouseUpEventHandler = (sender, e) => {
                    Control.SearchLocalGateway();
                };
#endif

@@ -188,7 +207,7 @@
                btnPm25Values = new Button()
                {
                    X = btnPm25Icon.Right + Application.GetRealWidth(4),
                    Width = Application.GetRealWidth(30),
                    Width = Application.GetRealWidth(130),
                    Gravity = Gravity.CenterVertical,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
@@ -320,7 +339,6 @@
                contentView.PageIndex = 0;

                #endregion
                bodyView.AddChidren(new Button() { Y = changeView.Bottom, Height = Application.GetRealHeight(4), BackgroundColor = 0xAAF2F3F7 });

                LoadEvent_ChangeShowedFunctionType();
            }
@@ -371,11 +389,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)
                    {
@@ -840,6 +858,9 @@
              
                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);

                btnSettingIcon.MouseUpEventHandler = (sender, e) => {

                };
            }
            catch (Exception ex)
            {