From 0c0a436a30bc24d4cd470eea7ba980ee418018ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 四月 2021 16:36:41 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
DLL/FL/iOS/Shared.IOS.ESVideoOnSDK.dll | 0
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs | 38 +++++++++++++++++++++++++++++++++-----
2 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/DLL/FL/iOS/Shared.IOS.ESVideoOnSDK.dll b/DLL/FL/iOS/Shared.IOS.ESVideoOnSDK.dll
index 7bda3d7..4dbcfa9 100644
--- a/DLL/FL/iOS/Shared.IOS.ESVideoOnSDK.dll
+++ b/DLL/FL/iOS/Shared.IOS.ESVideoOnSDK.dll
Binary files differ
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
index b08335b..72536fd 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
@@ -77,7 +77,7 @@
List<CallView> callViewList = new List<CallView>();
try
{
-
+
List<Call> listCall = new List<Call>();
var responsePackNew = VideoSend.GetCall(id);
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
@@ -209,12 +209,40 @@
/// <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)); // 褰撳湴鏃跺尯
+ /// <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();
+
+ }
+ /// <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(); // 鐩稿樊绉掓暟
}
--
Gitblit v1.8.0