合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

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

@@ -35,8 +35,13 @@
            pageView.AddChidren(view1);
            var view2 = new FrameLayout();
            pageView.AddChidren(view2);
<<<<<<< HEAD
            ViewFrameLayout1(view1, listVideo, video);
            ViewFrameLayout2(view2, listCall, video);
=======
            View1(view1, videoList);
            View2(view2, listCall, videoList);
>>>>>>> origin/CJL-LC
            Button btn11 = new Button
            {
                X = Application.GetRealWidth(170),
@@ -112,9 +117,17 @@
        /// 第一个界面
        /// </summary>
        /// <param name="view1">父控件</param>
<<<<<<< HEAD
        /// <param name="list">门口机列表</param>
        /// <param name="videoClouds">当前的可视对讲</param>
        void ViewFrameLayout1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds)
=======
        /// <param name="video">可视对讲对象</param>
        void View1(FrameLayout view1, List<Video> videoList)
>>>>>>> origin/CJL-LC
        {


            #region 布局界面
            var bjFl = new FrameLayout
            {
@@ -222,17 +235,16 @@
                #region
                var fLayout = new FrameLayout
                {
                    Width = Application.GetRealWidth(50),
                    Width = Application.GetRealWidth(96),
                    Height = Application.GetRealWidth(48),
                    X = Application.GetRealWidth(31 + (58 + 50) * j),
                    X = Application.GetRealWidth(20 + (26 + 28 + 42) * j),
                    Y = Application.GetRealHeight(20 + (48 + 24) * line),

                };
                fL.AddChidren(fLayout);

                var iconBtn = new Button
                {
                    X = Application.GetRealWidth(11),
                    Gravity=Gravity.CenterHorizontal,
                    Width = Application.GetRealWidth(28),
                    Height = Application.GetRealWidth(28),
                    UnSelectedImagePath = "VideoIcon/weiqiangji.png",
@@ -242,7 +254,8 @@
                var deviceNameBtn = new Button
                {
                    Y = iconBtn.Bottom + Application.GetRealHeight(6),
                    Width = Application.GetRealWidth(50),
                    X = Application.GetRealWidth(6),
                    Width = Application.GetRealWidth(96-12),
                    Height = Application.GetRealHeight(14),
                    TextSize = TextSize.Text10,
                    TextColor = CSS.CSS_Color.TextualColor,
@@ -265,11 +278,11 @@
                //门口机的点击事件
                clickBtn.MouseUpEventHandler += (sender, e) =>
                {
                    var video = clickBtn.Tag as Video;
                    if (video.devType == "100")
                    var video2 = clickBtn.Tag as Video;
                    if (video2.devType == "100")
                    {
                        //门禁二维码固定有的
                        VideoSend.GetQRcode(this, video, (tag, paw) =>
                        VideoSend.GetQRcode(this, video2, (tag, paw) =>
                        {
                            if (tag)
                            {
@@ -316,8 +329,13 @@
        /// </summary>
        /// <param name="view2">父控件</param>
        /// <param name="listCall">通话记录列表</param>
<<<<<<< HEAD
        /// <param name="video">当前的可视对讲</param>
        void ViewFrameLayout2(FrameLayout view2, List<CallView> listCall, VideoClouds video) 
=======
        /// <param name="videoList">可视对讲列表</param>
        void View2(FrameLayout view2, List<CallView> listCall, List<Video> videoList)
>>>>>>> origin/CJL-LC
        {
            var bjFl = new FrameLayout
            {