From f5b46f80546aac860ade6e4c53821e43df833b39 Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:11:28 +0800
Subject: [PATCH] Revert "Merge remote-tracking branch 'origin/wxr4' into dev-tzy"
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index 109cdc4..3271e9e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -35,8 +35,8 @@
pageView.AddChidren(view1);
var view2 = new FrameLayout();
pageView.AddChidren(view2);
- ViewFrameLayout1(view1, listVideo, video);
- ViewFrameLayout2(view2, listCall, video);
+ View1(view1, listVideo, video);
+ View2(view2, listCall, video);
Button btn11 = new Button
{
X = Application.GetRealWidth(170),
@@ -113,10 +113,8 @@
/// <param name="view1">鐖舵帶浠�</param>
/// <param name="list">闂ㄥ彛鏈哄垪琛�</param>
/// <param name="videoClouds">褰撳墠鐨勫彲瑙嗗璁�</param>
- void ViewFrameLayout1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds)
+ void View1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds)
{
-
-
#region 甯冨眬鐣岄潰
var bjFl = new FrameLayout
{
@@ -222,16 +220,17 @@
#region
var fLayout = new FrameLayout
{
- Width = Application.GetRealWidth(96),
+ Width = Application.GetRealWidth(50),
Height = Application.GetRealWidth(48),
- X = Application.GetRealWidth(20 + (26 + 28 + 42) * j),
+ X = Application.GetRealWidth(31 + (58 + 50) * j),
Y = Application.GetRealHeight(20 + (48 + 24) * line),
+
};
fL.AddChidren(fLayout);
var iconBtn = new Button
{
- Gravity=Gravity.CenterHorizontal,
+ X = Application.GetRealWidth(11),
Width = Application.GetRealWidth(28),
Height = Application.GetRealWidth(28),
UnSelectedImagePath = "VideoIcon/weiqiangji.png",
@@ -241,8 +240,7 @@
var deviceNameBtn = new Button
{
Y = iconBtn.Bottom + Application.GetRealHeight(6),
- X = Application.GetRealWidth(6),
- Width = Application.GetRealWidth(96-12),
+ Width = Application.GetRealWidth(50),
Height = Application.GetRealHeight(14),
TextSize = TextSize.Text10,
TextColor = CSS.CSS_Color.TextualColor,
@@ -308,7 +306,7 @@
/// <param name="view2">鐖舵帶浠�</param>
/// <param name="listCall">閫氳瘽璁板綍鍒楄〃</param>
/// <param name="video">褰撳墠鐨勫彲瑙嗗璁�</param>
- void ViewFrameLayout2(FrameLayout view2, List<CallView> listCall, VideoClouds video)
+ void View2(FrameLayout view2, List<CallView> listCall, VideoClouds video)
{
var bjFl = new FrameLayout
--
Gitblit v1.8.0