2020-12-03-1

陈嘉乐

2020-12-03 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7

 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>
@@ -80,6 +80,13 @@
        bool CurShowTypeIsFunction = true;
        #endregion

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

        public HomePage()
        {
            bodyView = this;
@@ -111,7 +118,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);
@@ -135,13 +142,8 @@
                btnResidenceName.MouseUpEventHandler = (sender, e) =>
                {
                    System.Threading.Tasks.Task.Run(() =>
                    {
                            DriverLayer.Control.ins.ChangeCommunicationMode(DriverLayer.CommunicationMode.local_BusUdp);
                            UdpSocket._BusSocket.SearchNetDeviceAction = (revIp) =>
                            {
                                MainPage.Log($"搜索到网络设备：{revIp}");
                            };
                            DriverLayer.Control.ins.myUdp.SearchLocalGateway();
                        {
                            DriverLayer.Control.Ins.SearchLoaclGateway();
                        });
                };
#endif
@@ -163,7 +165,7 @@
                };
                environmentalView.AddChidren(btnTempIcon);

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

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

                btnPm25Values = new Button()
                btnPm25Values = new TextButton()
                {
                    X = btnPm25Icon.Right + Application.GetRealWidth(4),
                    Width = Application.GetRealWidth(130),
@@ -231,14 +233,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),
@@ -250,7 +252,7 @@
                };
                msgView.AddChidren(btnMsgIcon);

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

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

                LoadEvent_GotoMessageCenterPage();

                #endregion

                #endregion
@@ -349,6 +354,12 @@
            {
                MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
            }


            System.Threading.Tasks.Task.Run(() =>
            {
                //DriverLayer.Control.Ins.SearchLoaclGateway();
            });
        }

        /// <summary>
@@ -382,7 +393,7 @@
                        }
                        else
                        {
                            if (!music.collection)
                            if (!music.collect)
                            {
                                continue;
                            }
@@ -390,7 +401,7 @@
                    }
                    else
                    {
                        if (!function.collection)
                        if (!function.collect)
                            continue;
                        //if (function.roomIdList.Count == 0)//如何在房间已经移除了这个功能，则收藏界面也不会再显示
                        //{
@@ -478,13 +489,13 @@
            try
            {
                int index = 0;
                foreach (var function in DB_ResidenceData.functionList.scenes)
                foreach (var scene in DB_ResidenceData.functionList.scenes)
                {
                    if (!function.collection)
                    if (!scene.collect)
                        continue;
                    if (function.roomIdList.Count == 0)//如何在房间已经移除了这个功能，则收藏界面也不会再显示
                    if (scene.roomIds.Count == 0)//如何在房间已经移除了这个功能，则收藏界面也不会再显示
                    {
                        function.collection = false;
                        scene.collect = false;
                        continue;
                    }
                    if (index % 2 == 0)
@@ -504,12 +515,12 @@
                        X = functionView_X,
                        Width = Application.GetRealWidth(164),
                        Height = Application.GetRealWidth(122),
                        Tag = function.sid,
                        BackgroundImagePath = (function as Scene).ImagePath,
                        Tag = scene.sid,
                        BackgroundImagePath = (scene as Scene).ImagePath,
                    };
                    rowView.AddChidren(functionView);

                    LoadSceneFunctionDiv( functionView, function);
                    LoadSceneFunctionDiv( functionView, scene);
                    index++;
                }

@@ -622,7 +633,7 @@
                    UnSelectedImagePath = "Collection/CollectionIcon.png",
                };
                view.AddChidren(btnCollection);
                LoadEvent_FunctionCollection(btnCollection, function, true);
                LoadEvent_FunctionCollection(btnCollection, function);

                if (function.functionCategory == FunctionCategory.Curtain)
                {
@@ -700,14 +711,14 @@
                            btnPower.IsSelected = false;
                            Music.SendMethod.Pause(a31player);
                            a31player.A31PlayStatus.status = "pause";
                            a31player.trait_on_off.value = "off";
                            a31player.trait_on_off.curValue = "off";
                        }
                        else
                        {
                            btnPower.IsSelected = true;
                            Music.SendMethod.Play(a31player);
                            a31player.A31PlayStatus.status = "play";
                            a31player.trait_on_off.value = "on";
                            a31player.trait_on_off.curValue = "on";
                        }
                        UpdataFunctionStates(a31player);
                    };
@@ -794,7 +805,7 @@
        /// <summary>
        /// 加载场景控制卡片
        /// </summary>
        void LoadSceneFunctionDiv(FrameLayout view, Function function)
        void LoadSceneFunctionDiv(FrameLayout view, Scene scene)
        {
            try
            {
@@ -811,7 +822,6 @@
                    Y = Application.GetRealWidth(4),
                    Height = Application.GetRealWidth(32),
                    Width = Application.GetRealWidth(32),
                    //UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png",
                    UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
                };
                view.AddChidren(btnSettingIcon);
@@ -823,7 +833,7 @@
                    Y = Application.GetRealWidth(68),
                    Width = Application.GetRealWidth(150),
                    Height = Application.GetRealHeight(24),
                    Text = function.name,
                    Text = scene.name,
                    TextSize = CSS_FontSize.TextFontSize,
                    TextColor = CSS_Color.MainBackgroundColor,
                    TextAlignment = TextAlignment.CenterLeft,
@@ -841,7 +851,7 @@
                    TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                    TextAlignment = TextAlignment.CenterLeft,
                    SelectedTextColor = CSS_Color.MainBackgroundColor,
                    Text = function.GetRoomListName(),
                    Text = scene.GetRoomListName(),
                };
                view.AddChidren(btnZone);

@@ -857,20 +867,20 @@
                    UnSelectedImagePath = "Collection/CollectionIcon.png",
                };
                view.AddChidren(btnCollection);
                LoadEvent_FunctionCollection(btnCollection, function, false);
                LoadEvent_SceneCollection(btnCollection, scene);
              
                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, function);
                LoadEvent_ControlScene(btnCoverd,btnName,btnZone, scene);

                btnSettingIcon.MouseUpEventHandler = (sender, e) => {
                    Action backAction = () => {
                        //LoadSceneFunctionControlZone();
                    };
                    Action refreshAction = () => {
                        btnName.Text = function.name;
                        btnZone.Text = function.GetRoomListName();
                        view.BackgroundImagePath = (function as Scene).ImagePath;
                        btnName.Text = scene.name;
                        btnZone.Text = scene.GetRoomListName();
                        view.BackgroundImagePath = (scene as Scene).ImagePath;
                    };
                    var aep = new SceneEditPage(function as Scene, backAction);
                    var aep = new SceneEditPage(scene as Scene, backAction);
                    MainPage.BasePageView.AddChidren(aep);
                    aep.LoadPage(StringId.EditScene, refreshAction);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;