From 19e762179bdc9efc23704bc471cf974ed282b43d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 31 三月 2021 17:42:30 +0800
Subject: [PATCH] 合并可视对讲代码
---
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs | 136 +++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 61 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
index b38522d..3b5bcd8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
@@ -8,62 +8,61 @@
{
public class VideoMethod
{
- /// <summary>
- /// 绋嬪簭涓诲叆鍙�
- /// </summary>
- /// <param name="frameLayout">log鐖舵帶浠�</param>
- /// <param name="video">鍙瀵硅瀵硅薄</param>
- public void MianView(FrameLayout frameLayout, VideoClouds video)
- {
- //鍔犺浇log
- Loading loading = new Loading();
- frameLayout.AddChidren(loading);
- loading.Start();
- List<ESVideoInfo> listESVideoInfo = new List<ESVideoInfo>();
- List<CallView> listCall = new List<CallView>();
- new System.Threading.Thread(() =>
- {
- try
- {
- listESVideoInfo = VideoSend.GetVideoInfoList(video);
- listCall = getCall(video.id);
- }
- catch
- {
-
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- loading.Hide();
- var mainView = new MainView();
- MainPage.BasePageView.AddChidren(mainView);
- mainView.Show(listESVideoInfo, listCall, video);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- });
- }
- })
- { IsBackground = true }.Start();
- }
- /// <summary>
- /// 鑾峰彇鍙瀵硅
- /// </summary>
- /// <param name="action">鍥炶皟鍑芥暟</param>
- /// <param name="frame">log鐖舵帶浠�</param>
- public void getVideo(Action<VideoClouds> action, FrameLayout frame, bool tag)
- {
- ThreadSend(null, (responsePackNew) =>
- {
- try
- {
- var str = responsePackNew.Data.ToString();
- var videoObj = Newtonsoft.Json.JsonConvert.DeserializeObject<VideoClouds>(str);
- action(videoObj);
- }
- catch { }
- }, "鑾峰彇鍙瀵硅", "fram", frame, null, tag);
- }
+ ///// <summary>
+ ///// 绋嬪簭涓诲叆鍙�
+ ///// </summary>
+ ///// <param name="frameLayout">log鐖舵帶浠�</param>
+ ///// <param name="video">鍙瀵硅瀵硅薄</param>
+ //public void MianView(FrameLayout frameLayout, VideoClouds video)
+ //{
+ // //鍔犺浇log
+ // Loading loading = new Loading();
+ // frameLayout.AddChidren(loading);
+ // loading.Start();
+ // List<VideoMethod.FlVideo> listESVideoInfo = new List<VideoMethod.FlVideo>();
+ // List<CallView> listCall = new List<CallView>();
+ // new System.Threading.Thread(() =>
+ // {
+ // try
+ // {
+ // listESVideoInfo = VideoSend.GetVideoInfoList(video);
+ // listCall = getCall(video.id);
+ // }
+ // catch
+ // {
+ // }
+ // finally
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // loading.Hide();
+ // var mainView = new HDL_ON.UI.UI2.FuntionControlView.Video.MainView();
+ // MainPage.BasePageView.AddChidren(mainView);
+ // mainView.Show();
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ // });
+ // }
+ // })
+ // { IsBackground = true }.Start();
+ //}
+ ///// <summary>
+ ///// 鑾峰彇鍙瀵硅
+ ///// </summary>
+ ///// <param name="action">鍥炶皟鍑芥暟</param>
+ ///// <param name="frame">log鐖舵帶浠�</param>
+ //public void getVideo(Action<VideoClouds> action, FrameLayout frame, bool tag)
+ //{
+ // ThreadSend(null, (responsePackNew) =>
+ // {
+ // try
+ // {
+ // var str = responsePackNew.Data.ToString();
+ // var videoObj = Newtonsoft.Json.JsonConvert.DeserializeObject<VideoClouds>(str);
+ // action(videoObj);
+ // }
+ // catch { }
+ // }, "鑾峰彇鍙瀵硅", "fram", frame, null, tag);
+ //}
/// <summary>
/// 鑾峰彇鍘嗗彶閫氳瘽璁板綍
/// </summary>
@@ -138,7 +137,7 @@
/// <param name="frame">log鐖舵帶浠�</param>
/// <param name="dialog">log鐖舵帶浠�</param>
/// <param name="tag">鏄惁瑕佹樉绀簂og</param>
- public static void ThreadSend(VideoClouds videoObj, Action<ResponsePackNew> action, string str, string view, FrameLayout frame, Dialog dialog, bool tag = true)
+ public void ThreadSend(VideoClouds videoObj, Action<ResponsePackNew> action, string str, string view, FrameLayout frame, Dialog dialog, bool tag = true)
{
//鍔犺浇log
@@ -203,12 +202,14 @@
}
-
+
+
+
[Serializable]
public class VideoClouds
- {
+ {
/// <summary>
- /// 涓版灄缁戝畾id锛坒lBindId锛�
+ /// 涓版灄缁戝畾id锛坒lBindId锛�(userKey)
/// </summary>
public string id = string.Empty;
/// <summary>
@@ -296,6 +297,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