Merge branch 'feature/v2.5_极光推送' into feature/V2.6.0_google

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs

@@ -603,7 +603,8 @@
                    residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
                    #endregion

                    if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
                    bool needShow = false;
                    if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl || needShow)
                    {
                        residenceFunctionCount++;
                        #region ---组合调光
@@ -968,7 +969,8 @@
                if(Language.CurrentLanguage == "Chinese")
                {
                    btnSiriText.Text = "Siri快捷方式";
                }else
                }
                else
                {
                    btnSiriText.Text = "Siri Shortcut";
                }
@@ -976,7 +978,8 @@
                siriView.AddChidren(btnSiriText);


                btnSiriText.MouseUpEventHandler = (sender, e) => {
                btnSiriText.MouseUpEventHandler = (sender, e) =>
                {
                    var ddd =new Other.SkipControl();
                    ddd.SkipSiriView();
                };