Merge branch 'wjc' into Dev-Branch

wxr

2023-03-01 8e65391ab8d48285f9049f2747fb420f3ad1b852

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -64,13 +64,13 @@
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.CurtainRoller:
                        var rollingShutterView = new VenetianBlindsPage(function);
                        var rollingShutterView = new RollingShutterPage(function);
                        MainPage.BasePageView.AddChidren(rollingShutterView);
                        rollingShutterView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.CurtainShades:
                        var curtainShadesView = new RollingShutterPage(function);
                        var curtainShadesView = new VenetianBlindsPage(function);
                        MainPage.BasePageView.AddChidren(curtainShadesView);
                        curtainShadesView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -233,6 +233,8 @@
                        doorLockPage.AddForm(function, btnCollectionIcon, btnName, btnFromFloor);
                        break;
                    case SPK.IpCam_Imou:
#if __IOS__
#else
                        FunctionList.List.GetIpCamImouList();
                        if (string.IsNullOrEmpty(Com.Utils.HdlToLcUtils.Instance.SubAccessToken))
                        {
@@ -254,9 +256,7 @@
                                                new PublicAssmebly().TipMsg(Language.StringByID(StringId.Tip), Language.StringByID(StringId.huoqushujushibao));
                                            });
                                        }
#if __ANDROID__
                                    Application.RunOnMainThread(() =>
                                        {
                                        Application.RunOnMainThread(() =>{
                                            try
                                            {
                                                Com.Utils.HdlToLcUtils.Instance.SubAccessToken = pack.Data.ToString();
@@ -267,8 +267,7 @@

                                            }
                                        });
#endif
                                }
                                    }
                                    else
                                    {
                                        Application.RunOnMainThread(() =>
@@ -306,6 +305,7 @@

                            }
                        }
#endif
                        break;
                }
            };