Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

mac

2023-08-29 2d5cd35af7437ad4015d38594d8c721dc6166b11

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

@@ -60,6 +60,7 @@
        /// 门锁状态
        /// </summary>
        private Button btnDoorLockIcon;
            Button btnDoorlockStatus;
        /// <summary>
        /// 实时视频
        /// </summary>
@@ -239,7 +240,6 @@

            this.CalculatedPosition();//重新计算宽度

            Button btnDoorlockStatus;
            btnDoorlockStatus = new Button()
            {
                Width = Application.GetRealWidth(200),
@@ -378,14 +378,27 @@
                CommonMethod.Current.SkipRTVActivity(this.device.sid, this.device.deviceId, this.device.spk, false);

            });
            var lastClickTime = DateTime.MinValue;
            //临时密码
            this.pswFL.SetClickListener((fl, btnStateImage, btnStateText) =>
            {
                if (lastClickTime.AddSeconds(3) > DateTime.Now)
                {
                    return;
                }
                lastClickTime = DateTime.Now;
                CommonMethod.Current.SkipPSWActivity(this.device.deviceId);
            });

            //历史记录
            this.recordFL.SetClickListener((fl, btnStateImage, btnStateText) =>
            {
                if (lastClickTime.AddSeconds(3) > DateTime.Now)
                {
                    return;
                }
                lastClickTime = DateTime.Now;

                //VideoDoorlockHistoryPage historyPage = new VideoDoorlockHistoryPage(device);
                //MainPage.BasePageView.AddChidren(historyPage);
                //historyPage.LoadPage();
@@ -434,7 +447,18 @@
                        //this.cellDiyArcSeekBar.Progress = i;
                        //更新电量值
                        this.btnCell.Text = cellInfo.remain + "%";
                        this.btnDoorLockIcon.IsSelected = videoDoorLockInfo.doorStatus == "open";
                        if(videoDoorLockInfo.doorStatus == "open")
                        {
                            this.btnDoorLockIcon.IsSelected = true;
                            this.btnDoorlockStatus.TextID = StringId.DoorlockOpen;
                            this.btnDoorlockStatus.TextColor = CSS_Color.WarningColor;
                        }
                        else
                        {
                            this.btnDoorLockIcon.IsSelected = false;
                            this.btnDoorlockStatus.TextID = StringId.DoorlockClose;
                            this.btnDoorlockStatus.TextColor = 0xFF000000;
                        }
                    });
                }
                catch { }