From dc9a1b15bb69227e19afc070adf58156a362d2a2 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 30 九月 2024 17:07:58 +0800
Subject: [PATCH] 安卓可视对讲响铃，
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 44 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index d13882a..8597513 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -24,8 +24,46 @@
#region 甯冨眬鐣岄潰
this.BackgroundColor = MusicColor.ViewColor;
var topView = new TopView();
- this.AddChidren(topView.TopFLayoutView());
+ //this.AddChidren(topView.TopFLayoutView());
+
+
+
+#if __IOS__
+ // 鑾峰彇褰撳墠绯荤粺鐨勭増鏈彿
+ string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
+ // 灏嗙郴缁熺増鏈瓧绗︿覆杞崲涓� Version 瀵硅薄
+ System.Version currentVersion = new System.Version(systemVersion);
+ // 瀹氫箟 iOS 17 浣滀负姣旇緝鐨勭増鏈�
+ System.Version version17 = new System.Version(17, 0);
+ // 姣旇緝褰撳墠鐗堟湰鏄惁澶т簬 iOS 17
+ if (currentVersion.CompareTo(version17) > 0)
+ {
+ this.AddChidren(topView.TopFLayoutView());
+ }
+ else
+ {
+ if (xiMoVideoList.Count > 0)
+ {
+ this.AddChidren(topView.TopFLayoutView2());
+ }
+ else
+ {
+ this.AddChidren(topView.TopFLayoutView());
+ }
+ topView.topNameBtn.TextID = StringId.keshiduijiang;
+ }
+#else
+ if (xiMoVideoList.Count > 0)
+ {
+ this.AddChidren(topView.TopFLayoutView2());
+ }
+ else
+ {
+ this.AddChidren(topView.TopFLayoutView());
+ }
topView.topNameBtn.TextID = StringId.keshiduijiang;
+#endif
+
var pageView = new PageLayout()
{
@@ -126,8 +164,6 @@
/// <param name="video">鍙瀵硅瀵硅薄</param>
void View1(FrameLayout view1, List<Video> videoList)
{
-
-
#region 甯冨眬鐣岄潰
var bjFl = new FrameLayout
{
@@ -190,7 +226,6 @@
Width = Application.GetRealWidth(160),
Height = Application.GetRealWidth(160),
UnSelectedImagePath = "VideoIcon/keshiduijiang.png",
-
};
bjFl.AddChidren(intercomBtnIcon);
@@ -267,6 +302,7 @@
TextColor = CSS.CSS_Color.TextualColor,
TextAlignment = TextAlignment.Center,
Text = video.deviceName,
+ IsMoreLines = true,
};
fLayout.AddChidren(deviceNameBtn);
--
Gitblit v1.8.0