Merge branch 'Dev-Branch-2024' into wjc

mac

2024-07-25 16bea1d248f0010049bceaa562939297fa26b130

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

@@ -444,7 +444,7 @@
                    SelectedImagePath = "Collection/DefenseStatusIcon.png",
                    UnSelectedImagePath = "Collection/DisarmStatusIcon.png"
                };
                if (DB_ResidenceData.Instance.GatewayType == 1)
                if (DB_ResidenceData.Instance.GatewayType == 1 && !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
                {
                        
                    topView.AddChidren(btnSecurityStatus);
@@ -502,6 +502,10 @@
                    UnSelectedImagePath = "Collection/MsgIcon.png",
                    SelectedImagePath = "Collection/MsgIconTip.png",
                };
                if(btnSecurityStatus.Parent == null)
                {
                    btnMsgIcon.X = Application.GetRealWidth(329);
                }
                topView.AddChidren(btnMsgIcon);


@@ -549,6 +553,17 @@
                LoadContentView();

                #endregion

#if DEBUG
                btnResidenceName.MouseUpEventHandler = (envent, ee) => {
                    MainPage.Log("sss");
                    new System.Threading.Thread(async() =>
                    {
                        await Common.AliyunLog.AliyunLogClient.PostLogs("告警测试", "测试信息测试信息测试信息测试信息测试信息测试信息测试信息测试信息测试信息测试信息测试信息测试信息测试信息");
                    })
                    { IsBackground = true }.Start();
                };
#endif
            }
            catch (Exception ex)
            {