From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs | 150 ++++++++++++-------------------------------------
1 files changed, 37 insertions(+), 113 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
index 4131181..c7d4797 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<VideoMethod.FlVideo> listESVideoInfo = new List<VideoMethod.FlVideo>();
+ List<FlVideo> listESVideoInfo = new List<FlVideo>();
List<CallView> listCall = new List<CallView>();
new System.Threading.Thread(() =>
{
@@ -37,7 +37,7 @@
Application.RunOnMainThread(() =>
{
loading.Hide();
- var mainView = new MainView();
+ var mainView = new VideoMainView();
MainPage.BasePageView.AddChidren(mainView);
mainView.Show(listESVideoInfo, listCall, video);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -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() != "")
@@ -189,7 +189,7 @@
}
else
{
- Method method = new Method();
+ PirMethod method = new PirMethod();
//鑷畾涔夐敊璇彁绀烘枃鏈�
string eorroText = "";
if (str == "鑾峰彇鍙瀵硅")
@@ -209,120 +209,44 @@
/// <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(); // 鐩稿樊绉掓暟
}
- [Serializable]
- public class VideoClouds
- {
- /// <summary>
- /// 涓版灄缁戝畾id锛坒lBindId锛�(userKey)
- /// </summary>
- public string id = string.Empty;
- /// <summary>
- /// 浣忓畢id
- /// </summary>
- public string homeId = string.Empty;
- /// <summary>
- /// 铏氭嫙鎵嬫満鍙�
- /// </summary>
- public string phone = string.Empty;
- /// <summary>
- /// 铏氭嫙韬唤璇佸彿鐮�
- /// </summary>
- public string idCard = string.Empty;
- /// <summary>
- /// 绀惧尯涓婚敭Id
- /// </summary>
- public string communtiyId = string.Empty;
- /// <summary>
- /// 涓版灄妤兼爧鍙�
- /// </summary>
- public string flBuildingId = string.Empty;
- /// <summary>
- /// 涓版灄妤兼爧鍚嶇О
- /// </summary>
- public string flBuildingName = string.Empty;
- /// <summary>
- /// 涓版灄鎴块棿鍚嶇О
- /// </summary>
- public string flRoomId = string.Empty;
- /// <summary>
- /// 涓版灄瀹夊叏瀵嗛挜
- /// </summary>
- public string flSecretKey = string.Empty;
- /// <summary>
- /// 涓版灄鐨勫皬鍖篒d
- /// </summary>
- public string flCmtId = string.Empty;
-
- }
- [Serializable]
- public class Call
- {
- /// <summary>
- ///璁板綍涓婚敭Id
- /// </summary>
- public string id = string.Empty;
- /// <summary>
- /// 浣忓畢id
- /// </summary>
- public string homeId = string.Empty;
- /// <summary>
- /// 鍛煎彨鏃堕棿
- /// </summary>
- public string callTime = string.Empty;
- /// <summary>
- /// 閫氳瘽鏃堕暱
- /// </summary>
- public string callDuration = string.Empty;
- /// <summary>
- /// 鍛煎彨鐘舵�侊紙0锛氭湭鎺ワ紱1锛氬凡鎺ワ紱2锛氭嫆鎺ワ級
- /// </summary>
- public string callStatus = string.Empty;
- /// <summary>
- /// 鏄惁寮�閿�
- /// </summary>
- public bool isUnlock;
- /// <summary>
- /// 鎴浘鍦板潃
- /// </summary>
- public string screenshotUrl = string.Empty;
- /// <summary>
- ///涓版灄缁戝畾涓婚敭id锛堥棬鍙ｆ満涓婚敭Id锛�
- /// </summary>
- public string flBindId = string.Empty;
- }
- [Serializable]
- public class CallView
- {
- /// <summary>
- ///骞�
- /// </summary>
- public string year = string.Empty;
-
- 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