2020-11-30 1.增加极光推送。2.住宅相关接口增加签名校验。 3.增加消息中心页面。4.UI优化。5.裁剪选取图片优化。

JLChen

2020-11-30 8060dedbec31cc9dbc33adae91b94b8a977c7163

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

@@ -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);
@@ -131,13 +138,16 @@
                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(() =>
                        {
                            DriverLayer.Control.Ins.OpenUdp(6000);
                            //DB_ResidenceData.residenceData.GatewayType = 0;
                            //DriverLayer.Control.Ins.SearchLoaclGateway();
                        });
                };
#endif

                environmentalView = new FrameLayout()
@@ -225,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),
@@ -244,7 +254,7 @@
                };
                msgView.AddChidren(btnMsgIcon);

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

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

                LoadEvent_GotoMessageCenterPage();

                #endregion

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


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

        /// <summary>
@@ -386,11 +405,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)
                    {
@@ -694,14 +713,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);
                    };
@@ -856,7 +875,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)