Merge branch 'Dev-Branch' into wxr1215

wxr

2022-05-18 46719b11d11b6544b57cf966cf498fbedf9b613e

 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs

@@ -38,7 +38,9 @@
            var view1 = new FrameLayout();
            pageView.AddChidren(view1);
            var view2 = new FrameLayout();
            pageView.AddChidren(view2);
            if (!Entity.DB_ResidenceData.Instance.SupportFVDevice) {//非全视通展示通话记录
                pageView.AddChidren(view2);
            }
            View1(view1, videoList);
            View2(view2, listCall, videoList);
            Button btn11 = new Button
@@ -50,7 +52,7 @@
                BackgroundColor = MusicColor.SelectedColor,
                Radius = (uint)Application.GetRealHeight(4),
            };
            view1.AddChidren(btn11);
            //view1.AddChidren(btn11);

            Button btn12 = new Button
            {
@@ -61,7 +63,13 @@
                BackgroundColor = 0x404484F4,
                Radius = (uint)Application.GetRealHeight(4),
            };
            view1.AddChidren(btn12);
            //view1.AddChidren(btn12);
            if (!Entity.DB_ResidenceData.Instance.SupportFVDevice)
            {//非全视通展示下方选择按钮
                view1.AddChidren(btn11);
                view1.AddChidren(btn12);
            }

            Button btn21 = new Button
            {
                X = Application.GetRealWidth(170),
@@ -330,8 +338,10 @@
                            Lc_Psk = video.deviceId,//2021-10-15 PSK字段不能取deviceName
                            Lc_PlayToken = video.playToken,
                            deviceSipAccount = video.deviceSipAccount,
                            HomeId = video.homeId
                            HomeId = video.homeId,
                            deviceCode=video.deviceCode
                        };
                        
                        ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo, video.interphoneType);
                    }
                };
@@ -585,7 +595,7 @@


        /// <summary>
        /// 加载提示弹窗
        /// 获取门禁二维码
        /// </summary>
        public void ChooseVideoShowQRCode()
        {
@@ -730,58 +740,59 @@
        /// </summary>
        public void ChooseAlarmShow()
        {
            Dialog dialog = new Dialog()
            {
                BackgroundColor = CSS_Color.DialogTransparentColor1,
            };

            FrameLayout dialogView = new FrameLayout();
            dialog.AddChidren(dialogView);
            dialogView.MouseUpEventHandler = (sender, e) => {
                dialog.Close();
            };

            var contentView = new FrameLayout()
            {
                Gravity = Gravity.Center,
                Width = Application.GetRealWidth(270),
                Height = Application.GetRealHeight(280),
                BackgroundColor = CSS_Color.MainBackgroundColor,
                BorderColor = 0x00000000,
                BorderWidth = 0,
                Radius = (uint)Application.GetMinRealAverage(10),
            };
            dialogView.AddChidren(contentView);

            var btnTitle = new Button()
            {
                Height = Application.GetRealHeight(64),
                TextAlignment = TextAlignment.Center,
                TextColor = CSS_Color.FirstLevelTitleColor,
                TextID = StringId.menjinerweima,
                TextSize = CSS_FontSize.SubheadingFontSize,
            };
            contentView.AddChidren(btnTitle);

            var listView = new VerticalScrolViewLayout()
            {
                Gravity = Gravity.CenterHorizontal,
                Y = Application.GetRealHeight(70),
                Width = Application.GetRealWidth(230),
                Height = Application.GetRealHeight(200),
            };
            contentView.AddChidren(listView);

            if (ximoVideoList.Count == 1)
            {
                var wanderingAlarmPage = new WanderingAlarmPage();
                var wanderingAlarmPage = new WanderingAlarmPage(ximoVideoList[0].deviceId);
                MainPage.BasePageView.AddChidren(wanderingAlarmPage);
                wanderingAlarmPage.LoadPage(ximoVideoList[0].deviceId);
                wanderingAlarmPage.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

            }
            else
            {
                Dialog dialog = new Dialog()
                {
                    BackgroundColor = CSS_Color.DialogTransparentColor1,
                };

                FrameLayout dialogView = new FrameLayout();
                dialog.AddChidren(dialogView);
                dialogView.MouseUpEventHandler = (sender, e) =>
                {
                    dialog.Close();
                };

                var contentView = new FrameLayout()
                {
                    Gravity = Gravity.Center,
                    Width = Application.GetRealWidth(270),
                    Height = Application.GetRealHeight(280),
                    BackgroundColor = CSS_Color.MainBackgroundColor,
                    BorderColor = 0x00000000,
                    BorderWidth = 0,
                    Radius = (uint)Application.GetMinRealAverage(10),
                };
                dialogView.AddChidren(contentView);

                var btnTitle = new Button()
                {
                    Height = Application.GetRealHeight(64),
                    TextAlignment = TextAlignment.Center,
                    TextColor = CSS_Color.FirstLevelTitleColor,
                    TextID = StringId.WanderingAlarm,
                    TextSize = CSS_FontSize.SubheadingFontSize,
                };
                contentView.AddChidren(btnTitle);

                var listView = new VerticalScrolViewLayout()
                {
                    Gravity = Gravity.CenterHorizontal,
                    Y = Application.GetRealHeight(70),
                    Width = Application.GetRealWidth(230),
                    Height = Application.GetRealHeight(200),
                };
                contentView.AddChidren(listView);


                foreach (var v in ximoVideoList)
                {
@@ -806,16 +817,16 @@
                    {


                        var wanderingAlarmPage = new WanderingAlarmPage();
                        var wanderingAlarmPage = new WanderingAlarmPage(v.deviceId);
                        MainPage.BasePageView.AddChidren(wanderingAlarmPage);
                        wanderingAlarmPage.LoadPage(v.deviceId);
                        wanderingAlarmPage.LoadPage();
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

                        dialog.Close();
                    };
                }
                dialog.Show();
            }
            dialog.Show();

        }