Merge branch 'dev--wxr' into LcSdkV1

wxr

2022-11-23 5b77d9d57a6cddb474a66ca54401ad5ab0892db3

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

@@ -189,8 +189,8 @@
                //更新链接状态icon颜色


                int ddd = 0;
#if DEBUG
                int ddd = 0;
                btnResidenceName.MouseUpEventHandler = (sender, e) =>
                {
                    //827a98c98da7469b8bc19bb6a3c7651906
@@ -702,7 +702,6 @@
                    }
                    else //其他设备
                    {

                        var btnbg = new Button()
                        {
                            UnSelectedImagePath = "Collection/Functionbg.png",
@@ -712,8 +711,6 @@
                        functionView.AddChidren(btnbg);
                        LoadDeviceFunctionDiv(functionView, function);



                        if (SPK.ArmSensorSpkList().Contains(function.spk))
                        {
                            btnbg.UnSelectedImagePath = "Collection/FunctionOnbg.png";
@@ -721,7 +718,6 @@
                        }
                    }
                    index++;

                }

                if (index == 0)
@@ -906,7 +902,7 @@
                };


                if (function.spk == SPK.SenesorMegahealth)
                if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
                {
                    btnIcon.UnSelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
                    btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
@@ -1119,7 +1115,7 @@

                }
                
                else if (function.spk == SPK.SenesorMegahealth)
                else if (function.spk == SPK.SenesorMegahealth || function.spk == SPK.SensorMmvPose)
                {
                    //btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}.png";
                    //btnIcon.SelectedImagePath = "FunctionIcon/Icon/HomeIcon/sensormegahealth.png";
@@ -1135,6 +1131,11 @@
                    btnName.SelectedTextColor = CSS_Color.MainBackgroundColor;
                    btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
                    btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_white.png";
                }
                else if (function.spk == SPK.IpCam_Imou)
                {
                    btnIcon.UnSelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
                    btnIcon.SelectedImagePath = $"FunctionIcon/Icon/HomeIcon/{function.IconName}_blue.png";
                }

                else
@@ -1178,7 +1179,7 @@
                btnIcon.MouseUpEventHandler = skipControlPageEvent;
                btnState.MouseUpEventHandler = skipControlPageEvent;
                //不需要更新状态的动能列表
                if(!SPK.NotStatusSpkList.Contains(function.spk))
                if(!SPK.NotStatusSpkList.Contains(function.spk) || function.spk != SPK.IpCam_Imou)
                {
                    UpdataFunctionStates(function);
                }
@@ -1236,11 +1237,11 @@

            var btnLogo = new Button()
            {
                Y = Application.GetRealWidth(85),
                Y = Application.GetRealHeight(65),
                UnSelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
                SelectedImagePath = "FunctionIcon/Acst/LvJianLogo.png",
                Width = Application.GetRealWidth(80),
                Height = Application.GetRealWidth(37),
                Height = Application.GetRealHeight(37),
            };
            view.AddChidren(btnLogo);