2021-12-01-01

xm

2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f

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

@@ -30,21 +30,39 @@
        /// </summary>
        public static void LoadEvent_RefreshSecurityStatus()
        {
            Application.RunOnMainThread(() =>
            try
            {
                if (bodyView != null)
                Application.RunOnMainThread(() =>
                {
                    //foreach(var temp in FunctionList.List.securities)
                    //{
                    //    if(temp.status == "enable")
                    //    {
                    //        bodyView.btnSecurityStatus.IsSelected = true;
                    //        return;
                    //    }
                    //}
                    bodyView.btnSecurityStatus.IsSelected = SecurityCenter.Ins.InDefense;
                }
            });
                    if (bodyView != null)
                    {
                        lock (FunctionList.List.securities)
                        {
                            bodyView.btnSecurityStatus.IsSelected = false;
                            foreach (var temp in FunctionList.List.securities)
                            {
                                if (temp.status == "enable")
                                {
                                    if (temp.alarm)
                                    {
                                        bodyView.btnSecurityStatus.SelectedImagePath = "Collection/DefenseAlarmIcon.png";
                                    }
                                    else
                                    {
                                        bodyView.btnSecurityStatus.SelectedImagePath = "Collection/DefenseStatusIcon.png";
                                    }
                                    bodyView.btnSecurityStatus.IsSelected = true;
                                    return;
                                }
                            }
                        }
                    }
                });
            }
            catch (Exception ex)
            {
                MainPage.Log($"安防主页更新异常：{ex.Message}");
            }
        }

        /// <summary>
@@ -203,7 +221,7 @@
            btn.MouseUpEventHandler += (sender, e) =>
            {
                function.collect = false;
                if (function.Spk_Prefix == FunctionCategory.Music)//处理音乐主从关系
                if (SPK.MusicSpkList().Contains(function.spk))//处理音乐主从关系
                {
                    if ((function as Music.A31MusicModel).ServerClientType == 1)
                    {
@@ -248,7 +266,6 @@
                btnChangeScene.IsBold = false;
                CurShowTypeIsFunction = true;
                contentView.PageIndex = 0;

            };

            //var client = new BlufiClient();
@@ -280,7 +297,6 @@
                    btnChangeScene.TextSize = CSS.CSS_FontSize.TextFontSize;
                    btnChangeScene.IsSelected = false;
                    btnChangeScene.IsBold = false;
                    CurShowTypeIsFunction = true;
                }
                else
                {
@@ -290,7 +306,6 @@
                    btnChangeFunction.TextSize = CSS.CSS_FontSize.TextFontSize;
                    btnChangeFunction.IsSelected = false;
                    btnChangeFunction.IsBold = false;
                    CurShowTypeIsFunction = false;
                }
            };
        }
@@ -314,7 +329,15 @@
                                if (function.spk == SPK.CurtainRoller || function.spk == SPK.CurtainShades || function.spk == SPK.CurtainTrietex ||
                                function.spk == SPK.CurtainSwitch)//窗帘设备根据百分比判断开关状态
                                {
                                    state = function.GetAttrState(FunctionAttributeKey.Percent) != "0";
                                    if (function.GetAttribute(FunctionAttributeKey.Percent) != null)
                                    {
                                        state = function.GetAttrState(FunctionAttributeKey.Percent) != "0";
                                    }else
                                    {
                                        if (function.GetAttrState(FunctionAttributeKey.OnOff) == "stop")
                                            return;
                                        state = function.trait_on_off.curValue.ToString() == "on";
                                    }
                                }
                                else
                                {
@@ -328,7 +351,7 @@
                                        btn.IsSelected = state;
                                        if (btn.Tag != null && btn.Tag.ToString() == "state")
                                        {
                                            if (function.Spk_Prefix == FunctionCategory.Music)
                                            if (SPK.MusicSpkList().Contains(function.spk))
                                            {
                                                btn.Text = (function as Music.A31MusicModel).A31PlayStatus.Title;
                                            }
@@ -618,12 +641,12 @@
                    {
                        //未读的消息列表
                        var unreadList = new List<PushMessageInfo>();
                       
                        var pushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageInfoList>(result.Data.ToString());

                        var pushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());

                        if (pushMessageInfoList != null && pushMessageInfoList.Count > 0)
                        if (pushMessageInfoList != null && pushMessageInfoList.list != null && pushMessageInfoList.list.Count > 0)
                        {
                            foreach (var info in pushMessageInfoList)
                            foreach (var info in pushMessageInfoList.list)
                            {
                                if (!info.isRead)
                                {
@@ -643,7 +666,7 @@
                            {
                                Application.RunOnMainThread(() =>
                                {
                                    ShowMesBtnState(pushMessageInfoList[0], true);
                                    ShowMesBtnState(pushMessageInfoList.list[0], true);
                                });
                            }
                        }