From 1ebda09d954de4409c5a7f3ba3c3ee75626ec7c0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 01 四月 2021 16:08:16 +0800
Subject: [PATCH] 2021-4-1-6
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
similarity index 94%
rename from HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
rename to HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index 1fd2899..e70db56 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -8,7 +8,7 @@
namespace HDL_ON.UI.UI2.FuntionControlView.Video
{
- public class MainView : FrameLayout
+ public class VideoMainView : FrameLayout
{
/// <summary>
/// 鍔犺浇鍙瀵硅UI
@@ -16,17 +16,14 @@
/// <param name="listVideo">闂ㄥ彛鏈哄垪琛�</param>
/// <param name="listCall">閫氳瘽璁板綍鍒楄〃</param>
/// <param name="video">褰撳墠鐨勫彲瑙嗗璁�</param>
- public void Show(List<VideoMethod.FlVideo> listVideo, List<CallView> listCall, VideoClouds video)
+ public void Show(List<FlVideo> listVideo, List<CallView> listCall, VideoClouds video)
{
#region 甯冨眬鐣岄潰
this.BackgroundColor = MusicColor.ViewColor;
var topView = new TopView();
this.AddChidren(topView.TopFLayoutView());
topView.topNameBtn.TextID = StringId.keshiduijiang;
- topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
- {
- RemoveFromParent();
- };
+
var pageView = new PageLayout()
{
@@ -97,6 +94,18 @@
}
};
+ topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ if (pageView.PageIndex == 1)
+ {
+ pageView.PageIndex = 0;
+ }
+ else
+ {
+ RemoveFromParent();
+ }
+
+ };
#endregion
}
/// <summary>
@@ -105,7 +114,7 @@
/// <param name="view1">鐖舵帶浠�</param>
/// <param name="list">闂ㄥ彛鏈哄垪琛�</param>
/// <param name="videoClouds">褰撳墠鐨勫彲瑙嗗璁�</param>
- void View1(FrameLayout view1, List<VideoMethod.FlVideo> list, VideoClouds videoClouds)
+ void View1(FrameLayout view1, List<FlVideo> list, VideoClouds videoClouds)
{
#region 甯冨眬鐣岄潰
var bjFl = new FrameLayout
@@ -124,7 +133,7 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(16),
- Width = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(200),
Height = Application.GetRealHeight(33),
TextColor = MusicColor.MusicTxet14Color,
TextSize = TextSize.Text24,
@@ -147,7 +156,7 @@
TextAlignment = TextAlignment.CenterLeft,
Text = "123456"
};
- // bjFl.AddChidren(regionBtn);
+ // bjFl.AddChidren(regionBtn);
/// <summary>
///鏀惰棌鍥炬爣
/// </summary>
@@ -160,7 +169,7 @@
UnSelectedImagePath = "MusicIcon/collect.png",
SelectedImagePath = "MusicIcon/collectSelected.png",
};
- // bjFl.AddChidren(collectIconBtn);
+ // bjFl.AddChidren(collectIconBtn);
///鍙瀵硅鍥炬爣
Button intercomBtnIcon = new Button
{
@@ -183,7 +192,7 @@
if (list.Count > 0)
{
//闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�,铏氭嫙涓�涓嚭鏉�
- list.Add(new VideoMethod.FlVideo { aliasName =Language.StringByID(StringId.menjinerweima), devType = "100" });
+ list.Add(new FlVideo { aliasName = Language.StringByID(StringId.menjinerweima), devType = "100" });
}
//鏁扮粍涓暟
//int value = 15;
@@ -274,6 +283,7 @@
if (string.IsNullOrEmpty(flVideo.uuid))
{
new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.peizhicanshuyouyichang));
+ return;
}
ESVideoInfo eSVideoInfo = new ESVideoInfo
{
@@ -316,7 +326,7 @@
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(16),
- Width = Application.GetRealWidth(100),
+ Width = Application.GetRealWidth(200),
Height = Application.GetRealHeight(33),
TextColor = MusicColor.MusicTxet14Color,
TextSize = TextSize.Text24,
@@ -343,8 +353,8 @@
var vv = new VerticalRefreshLayout
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(58),
- Height = Application.GetRealHeight(458),
+ Y = Application.GetRealHeight(58 + 17),
+ Height = Application.GetRealHeight(458 - 17),
Width = Application.GetRealWidth(295),
};
bjFl.AddChidren(vv);
@@ -470,12 +480,12 @@
break;
case "1":
{
- Language.StringByID(StringId.yijieting);
+ s = Language.StringByID(StringId.yijieting);
}
break;
case "2":
{
- Language.StringByID(StringId.yijujue);
+ s = Language.StringByID(StringId.yijujue);
}
break;
}
--
Gitblit v1.8.0