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

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

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

@@ -215,10 +215,10 @@
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextSize = CSS_FontSize.SubheadingFontSize,
                Text = UserInfo.Current.userName// string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
                Text = UserInfo.Current.userName // string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
            };
            personalInfoView.AddChidren(btnUserName);
            if (!string.IsNullOrEmpty( UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString)
            if (!string.IsNullOrEmpty(UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString)
            {
                btnUserName.Text = Language.StringByID(StringId.UsersWhoNameIsEmpty);
            }
@@ -229,7 +229,7 @@
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.TextualColor,
                TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
                Text =  UserInfo.Current.AccountString
                Text = UserInfo.Current.AccountString
            };
            personalInfoView.AddChidren(btnEmail);

@@ -240,7 +240,7 @@
                Width = Application.GetMinRealAverage(84),
                Height = Application.GetMinRealAverage(84),
                Radius = (uint)Application.GetMinRealAverage(42),
                ImagePath =  UserInfo.Current.headImagePagePath
                ImagePath = UserInfo.Current.headImagePagePath
            };
            bodyView.AddChidren(userHeadImageView);
            //if (  UserInfo.Current.headImagePageBytes==null)
@@ -254,7 +254,7 @@
            #endregion

            //体验模式
            if(MainPage.NoLoginMode)
            if (MainPage.NoLoginMode)
            {
                Button btnExit = new Button()
                {
@@ -271,7 +271,7 @@
                    BackgroundColor = CSS_Color.MainBackgroundColor,
                    SelectedBackgroundColor = CSS_Color.MainBackgroundColor,
                };
                if(Language.CurrentLanguage =="Chinese")
                if (Language.CurrentLanguage == "Chinese")
                {
                    btnExit.Text = "退出";
                }
@@ -376,7 +376,7 @@
                BackgroundImagePath = "PersonalCenter/UserTypebg.png",
            };
            residenceInfoView.AddChidren(userTypeView);
            if (Language.CurrentLanguage != "Chinese" )//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            if (Language.CurrentLanguage != "Chinese")//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                userTypeView.X = Application.GetRealWidth(200);
                userTypeView.Width = Application.GetRealWidth(180);
@@ -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 ---组合调光
@@ -932,7 +933,7 @@
            #endregion

            #region Siri
            #if __IOS__
#if __IOS__
            //if (Application.PhoneType >= 12)
            {
                supportViewCellCount++;
@@ -965,10 +966,11 @@
                    TextAlignment = TextAlignment.CenterLeft,
                    TextSize = CSS_FontSize.TextFontSize
                };
                if(Language.CurrentLanguage == "Chinese")
                if (Language.CurrentLanguage == "Chinese")
                {
                    btnSiriText.Text = "Siri快捷方式";
                }else
                }
                else
                {
                    btnSiriText.Text = "Siri Shortcut";
                }
@@ -976,8 +978,9 @@
                siriView.AddChidren(btnSiriText);


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

@@ -1001,7 +1004,7 @@
                };
                siriView.AddChidren(btnSmartSpeakerViewLine);
            }
            #endif
#endif
            #endregion

            #region 获取支持