From e0cea373fd5cda37421407a41453286469ac1145 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:16:11 +0800
Subject: [PATCH] Merge branch 'WJC' into MergeFL
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 12 +++++++-----
1 files changed, 7 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..de7c61b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -115,6 +115,8 @@
/// <param name="video">鍙瀵硅瀵硅薄</param>
void View1(FrameLayout view1, List<Video> videoList)
{
+
+
#region 甯冨眬鐣岄潰
var bjFl = new FrameLayout
{
@@ -222,17 +224,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 +243,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,
--
Gitblit v1.8.0