Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-02 e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d

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

@@ -34,15 +34,15 @@
        /// <summary>
        /// 当前温度信息
        /// </summary>
        Button btnTempValues;
        TextButton btnTempValues;
        /// <summary>
        /// 当前湿度信息
        /// </summary>
        Button btnHumidityValues;
        TextButton btnHumidityValues;
        /// <summary>
        /// 当前pm2.5状态
        /// </summary>
        Button btnPm25Values;
        TextButton btnPm25Values;
        /// <summary>
        /// 切换显示功能类型区域
        /// </summary>
@@ -78,6 +78,13 @@
        /// 当前显示对控制类型是否是设备功能控制
        /// </summary>
        bool CurShowTypeIsFunction = true;
        #endregion

        #region 报警信息
        Button btnMsgBg;
        Button btnMsgTime;
        Button btnMsg;
        Button btnMsgIcon;
        #endregion

        public HomePage()
@@ -136,7 +143,9 @@
                {
                    System.Threading.Tasks.Task.Run(() =>
                        {
                            DriverLayer.Control.Ins.SearchLoaclGateway();
                            //DriverLayer.Control.Ins.SearchLoaclGateway();
                            //MainPage.GetRoomList();
                            MainPage.GetDeviceList();
                        });
                };
#endif
@@ -158,7 +167,7 @@
                };
                environmentalView.AddChidren(btnTempIcon);

                btnTempValues = new Button()
                btnTempValues = new TextButton()
                {
                    X = btnTempIcon.Right + Application.GetRealWidth(4),
                    Width = Application.GetRealWidth(30),
@@ -180,7 +189,7 @@
                };
                environmentalView.AddChidren(btnHumidityIcon);

                btnHumidityValues = new Button()
                btnHumidityValues = new TextButton()
                {
                    X = btnHumidityIcon.Right + Application.GetRealWidth(4),
                    Width = Application.GetRealWidth(30),
@@ -202,7 +211,7 @@
                };
                environmentalView.AddChidren(btnPm25Icon);

                btnPm25Values = new Button()
                btnPm25Values = new TextButton()
                {
                    X = btnPm25Icon.Right + Application.GetRealWidth(4),
                    Width = Application.GetRealWidth(130),
@@ -226,14 +235,14 @@
                };
                topView.AddChidren(msgView);

                var btngb = new Button()
                btnMsgBg = new Button()
                {
                    BackgroundColor = CSS_Color.MainColor,//0x3F4484F4,
                    Alpha = 0.4f,
                };
                msgView.AddChidren(btngb);
                msgView.AddChidren(btnMsgBg);

                Button btnMsgIcon;
              
                btnMsgIcon = new Button()
                {
                    X = Application.GetRealWidth(12),
@@ -245,7 +254,7 @@
                };
                msgView.AddChidren(btnMsgIcon);

                Button btnMsg;
               
                btnMsg = new Button()
                {
                    X = Application.GetRealWidth(10) + btnMsgIcon.Right,
@@ -257,7 +266,7 @@
                };
                msgView.AddChidren(btnMsg);

                Button btnMsgTime;
             
                btnMsgTime = new Button()
                {
                    X = Application.GetRealWidth(299),
@@ -267,6 +276,9 @@
                    TextAlignment = TextAlignment.CenterLeft,
                };
                msgView.AddChidren(btnMsgTime);

                LoadEvent_GotoMessageCenterPage();

                #endregion

                #endregion