Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into De...

Davin

2023-07-26 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2

 HDL_ON/UI/UI2/FuntionControlView/VideoDoorLock/VideoDoorLockPage.cs

@@ -284,6 +284,8 @@
            recordFL.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/HistoryList.png";
            recordFL.GetTextButton().TextID = StringId.lishijilu;

            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
            //用户管理
            CustomFrameLayout userManagerView = new CustomFrameLayout(CustomFrameLayout.widthFrameLayout, CustomFrameLayout.heightFrameLayout);
            whiteFl.AddChidren(userManagerView);
@@ -294,14 +296,15 @@
            userManagerView.GetImageButton().UnSelectedImagePath = "FunctionIcon/DoorLock/DoorlockUserManager.png";
            userManagerView.GetTextButton().TextID = StringId.UserManagement;

            userManagerView.SetClickListener((fl, btnImage, btnText) => {
                userManagerView.SetClickListener((fl, btnImage, btnText) =>
                {
                var page = new VideoDoorlockUserListPage(device);
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

            });

            }
            #endregion


@@ -387,8 +390,30 @@
                //MainPage.BasePageView.AddChidren(historyPage);
                //historyPage.LoadPage();
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                var waitPage = new Loading();
                this.AddChidren(waitPage);
                waitPage.Start("");
                new System.Threading.Thread(() =>
                {
                    try
                    {
                        Application.RunOnMainThread(() =>
                        {
                CommonMethod.Current.SkipRecordActivity(this.device.deviceId);
            });
                    }catch(Exception ex)
                    {

                    }
                    finally
                    {
                        Application.RunOnMainThread(() => {
                            waitPage.Hide();
                        });
                    }
                })
                { IsBackground = true }.Start();
            });


        }