From e63d7efbe2a41783989bdaea94d37bb6f16deb22 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期日, 06 六月 2021 16:41:19 +0800
Subject: [PATCH] 兆观传感器
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index e70db56..3271e9e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -4,7 +4,6 @@
using Shared;
using HDL_ON.Stan;
using ZXing.QrCode.Internal;
-using static HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod;
namespace HDL_ON.UI.UI2.FuntionControlView.Video
{
@@ -348,13 +347,13 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = StringId.baolu30,
};
- bjFl.AddChidren(regionBtn);
+ //bjFl.AddChidren(regionBtn);
var vv = new VerticalRefreshLayout
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(58 + 17),
- Height = Application.GetRealHeight(458 - 17),
+ Y = Application.GetRealHeight(58),
+ Height = Application.GetRealHeight(458),
Width = Application.GetRealWidth(295),
};
bjFl.AddChidren(vv);
@@ -394,7 +393,6 @@
frameLayout60.btnTime.Text = getTime(call.callTime);
///鍛煎彨鐘舵�侊紙0锛氭湭鎺ワ紱1锛氬凡鎺ワ紱2锛氭嫆鎺ワ級锛涙槸鍚﹀紑閿侊紱
frameLayout60.btnStateText.Text = getStateText(call.callStatus) + "," + getUnlockText(call.isUnlock);
-
}
}
@@ -461,7 +459,10 @@
{
var utcTime = Convert.ToDateTime(str);
var dateTime = TimeZoneInfo.ConvertTimeFromUtc(utcTime, TimeZoneInfo.Local);
- return dateTime.ToString("HH") + ":" + dateTime.ToString("mm");
+ // var monday = dateTime.ToString("MM") + Language.StringByID(StringId.month) + dateTime.ToString("dd") + Language.StringByID(StringId.day);
+ var monday = dateTime.ToString("MM") + "/" + dateTime.ToString("dd");
+ var time = dateTime.ToString("HH") + ":" + dateTime.ToString("mm");
+ return monday + " " + time;
}
/// <summary>
/// 鑾峰彇鍛煎彨鐘舵�佹枃鏈�
@@ -498,16 +499,14 @@
/// <returns></returns>
private string getUnlockText(bool if_bool)
{
- string s = "";
if (if_bool)
{
- s = Language.StringByID(StringId.yikaisuo);
+ return Language.StringByID(StringId.yikaisuo);
}
else
{
- s = Language.StringByID(StringId.weikaisuo);
+ return Language.StringByID(StringId.weikaisuo);
}
- return s;
}
/// <summary>
/// 鑾峰彇uuid
--
Gitblit v1.8.0