Merge remote-tracking branch 'origin/wjc' into wxr0114

wxr

2022-03-11 4a9844ac95e2ff67b2a2b1082c30f15c561866c6

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

@@ -161,23 +161,9 @@
                };
                topView.AddChidren(btnTop);

                btnLinkStateTip = new Button()
                {
                    X = Application.GetRealWidth(16),
                    Y = Application.GetRealHeight(46),
                    Width = Application.GetRealWidth(6),
                    Height = Application.GetRealWidth(6),
                    BackgroundColor = CSS_Color.LinkTipFail,
                    Radius = (uint)Application.GetRealWidth(3),
                };
                topView.AddChidren(btnLinkStateTip);
                //更新链接状态icon颜色
                CheckLinkStatus();//2020-12-22
                

                btnResidenceName = new Button()
                {
                    X = Application.GetRealWidth(26),
                    X = Application.GetRealWidth(16),
                    Y = Application.GetRealHeight(32),
                    Width = Application.GetRealWidth(300),
                    Height = Application.GetRealHeight(33),
@@ -188,12 +174,38 @@
                    IsBold = true
                };
                topView.AddChidren(btnResidenceName);
                btnLinkStateTip = new Button()
                {
                    //X = Application.GetRealWidth(16),
                    Y = btnResidenceName.Bottom,
                    Height = Application.GetRealWidth(14),
                    BackgroundColor = CSS_Color.LinkTipFail,
                    TextAlignment = TextAlignment.Center,
                    TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                    TextColor = CSS_Color.MainBackgroundColor,
                };
                topView.AddChidren(btnLinkStateTip);
                //btnLinkStateTip.Width = btnLinkStateTip.GetTextWidth();
                //更新链接状态icon颜色



#if DEBUG
                int msdId = 111;
                btnResidenceName.MouseUpEventHandler = (sender, e) =>
                {
                    Control.Ins.AuthGateway();

                    if (UserInfo.Current.VerOpenDoorPw || string.IsNullOrEmpty(UserInfo.Current.doorPasswordString))
                    {
                        var page = new DoorLockUnlockPage(new Function());
                        MainPage.BasePageView.AddChidren(page);
                        page.LoadView();
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    }
                    else
                    {
                        Control.Ins.OneKeyUnlocking(new Function(), UserInfo.Current.doorPasswordString);
                    }

                };
#endif

@@ -203,6 +215,8 @@
                    Height = Application.GetRealHeight(32),
                };
                topView.AddChidren(environmentalView);
                CheckLinkStatus();//2020-12-22

                #region 环境数据
                var tempSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorTemperature);
                var humiSensorList = FunctionList.List.GetEnvirSensorsList().FindAll((obj) => obj.spk == SPK.SensorHumidity);
@@ -855,6 +869,7 @@
                    //音乐模块有主从关系，需要特殊处理
                    if (SPK.MusicSpkList().Contains( function.spk))
                    {
                        continue;
                        //var music = function as Music.A31MusicModel;
                        //var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid);
                        //if (music == null)
@@ -923,6 +938,12 @@
                    functionViews.Add(functionView);
                    LoadDeviceFunctionDiv(functionView, function);
                    index++;


                    if (!function.online)
                    {
                        btnbg.UnSelectedImagePath = "Collection/FunctionOfflineBg.png";
                    }
                }

                if (index == 0)
@@ -1305,6 +1326,23 @@
                {
                    UpdataFunctionStates(function);
                }


                if (!function.online)
                {
                    var btnOffline = new Button()
                    {
                        X = btnIcon.Right,
                        Y = Application.GetRealWidth(16),
                        Height = Application.GetMinRealAverage(32),
                        TextID = StringId.DeviceOffline,
                        TextColor = CSS_Color.WarningColor,
                        TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                        TextAlignment = TextAlignment.CenterLeft
                    };
                    view.AddChidren(btnOffline);

                }
            }
            catch (Exception ex)
            {