From adc150efb13a0506f45a3c344c3ee2ef2dba8e90 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 01 七月 2021 15:19:13 +0800 Subject: [PATCH] 合并嘉乐lc代码 --- HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs index d983758..d497488 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs +++ b/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, @@ -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 { -- Gitblit v1.8.0