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

wxr

2024-09-11 a3dfbcd5218270f9a75e6e32807b08215270b657

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -102,7 +102,7 @@
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.FloorHeatStandard:
                    case SPK.HvacFloorHeat:
                    case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                        var fhView = new FloorHeatingPage(function);
                        MainPage.BasePageView.AddChidren(fhView);
                        fhView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
@@ -289,7 +289,8 @@
                                                new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
                                            });
                                        }
                                        Application.RunOnMainThread(() =>{
                                        Application.RunOnMainThread(() =>
                                        {
                                            try
                                            {