From 3532db3610381f37eca1a6ac783d882517847c91 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 31 三月 2021 15:28:49 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
index b38522d..fea81eb 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
@@ -19,7 +19,7 @@
Loading loading = new Loading();
frameLayout.AddChidren(loading);
loading.Start();
- List<ESVideoInfo> listESVideoInfo = new List<ESVideoInfo>();
+ List<VideoMethod.FlVideo> listESVideoInfo = new List<VideoMethod.FlVideo>();
List<CallView> listCall = new List<CallView>();
new System.Threading.Thread(() =>
{
@@ -203,12 +203,23 @@
}
-
+ /// <summary>
+ /// 闅忔満瀵嗙爜6浣�
+ /// </summary>
+ /// <returns></returns>
public static string getCode()
{
Random rand = new Random();
string code = "";
for (int ctr = 0; ctr < 6; ctr++)
{
code += rand.Next(10).ToString();
}
return code;
}
+ /// <summary>
/// 鑾峰彇褰撳墠鏃堕棿鎴�
/// </summary>
/// <returns></returns>
public static string GetCurrentTimeStamp()
{
//TimeSpan ts = DateTime.Now - new DateTime(1970, 1, 1, 0, 0, 0, 0);
//return Convert.ToInt64(ts.TotalSeconds).ToString();
System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
+
+ return ((long)(DateTime.Now - startTime).TotalSeconds).ToString(); // 鐩稿樊绉掓暟
+
}
+ /// <summary>
/// 鑾峰彇褰撳墠鏃堕棿鎴�
/// </summary>
/// <returns></returns>
public static string GetTomorrowTimeStamp()
{
//褰撳墠鏃堕棿鐨勫悗涓�澶�
//TimeSpan ts = DateTime.Now.AddDays(1) - new DateTime(1970, 1, 1, 0, 0, 0, 0);
//return Convert.ToInt64(ts.TotalSeconds).ToString();
+ System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
+ return ((long)(DateTime.Now.AddDays(1) - startTime).TotalSeconds).ToString(); // 鐩稿樊绉掓暟
+ }
[Serializable]
public class VideoClouds
- {
+ {
/// <summary>
- /// 涓版灄缁戝畾id锛坒lBindId锛�
+ /// 涓版灄缁戝畾id锛坒lBindId锛�(userKey)
/// </summary>
public string id = string.Empty;
/// <summary>
@@ -296,6 +307,19 @@
public List<Call> callList = new List<Call>();
}
-
+ [Serializable]
+ public class FlVideo
+ {
+ /// <summary>
+ /// 璁惧鍚嶇О
+ /// </summary>
+ public string aliasName = string.Empty;
+ /// <summary>
+ /// 璁惧绫诲瀷锛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠＄悊鏈�,5浜屾纭鏈�)
+ /// </summary>
+ public string devType = string.Empty;
+ public string uuid = string.Empty;
+ }
+
}
}
--
Gitblit v1.8.0