| .vs/HDL_APP_Project/xs/UserPrefs.xml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| DLL/FL/iOS/Shared.IOS.ESVideoOnSDK.dll | 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,55 +1,15 @@ <Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default"> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" /> <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/ApiUtlis.cs"> <Files> <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="214" Column="44" /> <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" /> <File FileName="../../Library/Containers/com.tencent.WeWorkMac/Data/Library/Application Support/WXWork/Data/1688852687634638/Cache/File/2021-03/DeviceTemperatureHistoryForm(1).cs" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage_AddIrButton.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/AcControlPage.cs" Line="488" Column="50" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Energy/EnergyMainPage.cs" Line="20" Column="16" /> <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="508" Column="1" /> <File FileName="HDL_ON/DAL/Server/IMessageCommon.cs" Line="213" Column="43" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddDevciePage.cs" Line="44" Column="1" /> <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="262" Column="14" /> <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPage.cs" Line="1" Column="1" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs" Line="366" Column="55" /> <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="284" Column="1" /> <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2244" Column="95" /> <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="101" Column="1" /> <File FileName="HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs" Line="209" Column="22" /> </Files> <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" /> <MonoDevelop.Ide.Workbench> <Pads> <Pad Id="ProjectPad"> <State name="__root__"> <Node name="HDL_APP_Project" expanded="True"> <Node name="HDL_ON" expanded="True"> <Node name="Common" expanded="True"> <Node name="ApiUtlis.cs" selected="True" /> </Node> <Node name="DAL" expanded="True"> <Node name="Server" expanded="True" /> </Node> <Node name="Entity" expanded="True" /> <Node name="UI" expanded="True"> <Node name="UI1-Login" expanded="True" /> <Node name="UI2" expanded="True"> <Node name="2-Classification" expanded="True" /> <Node name="FuntionControlView" expanded="True"> <Node name="Video" expanded="True" /> <Node name="HDL_ON" expanded="True" /> <Node name="HDL-ON_iOS" expanded="True" selected="True"> <Node name="References" expanded="True" /> </Node> </Node> </Node> </Node> <Node name="HDL-ON_iOS" expanded="True"> <Node name="Resources" expanded="True" /> </Node> </Node> </State> </Pad> <Pad Id="MonoDevelop.Debugger.WatchPad"> <State> <Value>apiPath</Value> </State> </Pad> </Pads> @@ -61,11 +21,9 @@ <String>Shared.IOS/Shared.IOS.csproj</String> </DisabledProjects> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" /> <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" /> <MonoDevelop.Ide.DebuggingService.Breakpoints> <BreakpointStore> <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Common/ApiUtlis.cs" relfile="HDL_ON/Common/ApiUtlis.cs" line="284" column="1" /> </BreakpointStore> <BreakpointStore /> </MonoDevelop.Ide.DebuggingService.Breakpoints> <MultiItemStartupConfigurations /> </Properties> DLL/FL/iOS/Shared.IOS.ESVideoOnSDK.dllBinary files differ
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -808,10 +808,13 @@ btnFunctionViewBg.MouseUpEventHandler = (sender, e) => { var mainView = new HDL_ON.UI.UI2.FuntionControlView.Video.MainView(); MainPage.BasePageView.AddChidren(mainView); mainView.Show(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; var videoMethod = new UI2.FuntionControlView.Video.VideoMethod(); videoMethod.MianView(this, FunctionList.List.videoIntercom); //var mainView = new HDL_ON.UI.UI2.FuntionControlView.Video.MainView(); //MainPage.BasePageView.AddChidren(mainView); //mainView.Show(); //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; break;
@@ -5,7 +5,6 @@ using HDL_ON.Stan; using ZXing.QrCode.Internal; using static HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod; using HDL_ON.Entity; namespace HDL_ON.UI.UI2.FuntionControlView.Video { @@ -17,10 +16,8 @@ /// <param name="listVideo">门口机列表</param> /// <param name="listCall">通话记录列表</param> /// <param name="video">当前的可视对讲</param> //public void Show(List<VideoMethod.FlVideo> listVideo, List<CallView> listCall, VideoClouds video) public void Show() public void Show(List<VideoMethod.FlVideo> listVideo, List<CallView> listCall, VideoClouds video) { #region 布局界面 this.BackgroundColor = MusicColor.ViewColor; var topView = new TopView(); @@ -42,8 +39,8 @@ pageView.AddChidren(view1); var view2 = new FrameLayout(); pageView.AddChidren(view2); View1(view1); View2(view2); View1(view1, listVideo, video); View2(view2, listCall, video); Button btn11 = new Button { X = Application.GetRealWidth(170), @@ -108,13 +105,7 @@ /// <param name="view1">父控件</param> /// <param name="list">门口机列表</param> /// <param name="videoClouds">当前的可视对讲</param> void View1(FrameLayout view1) { new System.Threading.Thread(() => { var list = VideoSend.GetVideoInfoList(FunctionList.List.videoIntercom); Application.RunOnMainThread(() => void View1(FrameLayout view1, List<VideoMethod.FlVideo> list, VideoClouds videoClouds) { #region 布局界面 var bjFl = new FrameLayout @@ -156,7 +147,7 @@ TextAlignment = TextAlignment.CenterLeft, Text = "123456" }; bjFl.AddChidren(regionBtn); // bjFl.AddChidren(regionBtn); /// <summary> ///收藏图标 /// </summary> @@ -169,7 +160,7 @@ UnSelectedImagePath = "MusicIcon/collect.png", SelectedImagePath = "MusicIcon/collectSelected.png", }; bjFl.AddChidren(collectIconBtn); // bjFl.AddChidren(collectIconBtn); ///可视对讲图标 Button intercomBtnIcon = new Button { @@ -204,11 +195,13 @@ } else { l = (list.Count / 3) + 1; } var fL = new FrameLayout { Height = Application.GetRealHeight((48 + 24) * l), }; vv.AddChidren(fL); int line = 0; @@ -262,11 +255,11 @@ //门口机的点击事件 clickBtn.MouseUpEventHandler += (sender, e) => { var flVideo = clickBtn.Tag as VideoMethod.FlVideo; var flVideo = clickBtn.Tag as FlVideo; if (flVideo.devType == "100") { //门禁二维码固定有的 VideoSend.GetQRcode(this, FunctionList.List.videoIntercom, (tag, paw) => VideoSend.GetQRcode(this, videoClouds, (tag, paw) => { if (tag) { @@ -286,8 +279,8 @@ { ESVideoUUID = getUuid(flVideo.uuid), DeviceName = flVideo.aliasName, roomno = FunctionList.List.videoIntercom.flRoomId, unitno = FunctionList.List.videoIntercom.flBuildingId, roomno = videoClouds.flRoomId, unitno = videoClouds.flBuildingId, }; ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo); } @@ -295,9 +288,8 @@ }; } }); }) { IsBackground = true }.Start(); } /// <summary> /// 第二个界面 @@ -305,13 +297,9 @@ /// <param name="view2">父控件</param> /// <param name="listCall">通话记录列表</param> /// <param name="video">当前的可视对讲</param> void View2(FrameLayout view2) void View2(FrameLayout view2, List<CallView> listCall, VideoClouds video) { new System.Threading.Thread(() => { var listCall = new HDL_ON.UI.UI2.FuntionControlView.Video.VideoMethod().getCall(FunctionList.List.videoIntercom.id); Application.RunOnMainThread(() => { var bjFl = new FrameLayout { Y = Application.GetRealHeight(24), @@ -363,15 +351,13 @@ vv.BeginHeaderRefreshingAction += () => { VideoMethod videoMethod = new VideoMethod(); var list = videoMethod.getCall(FunctionList.List.videoIntercom.id); var list = videoMethod.GetCall(video.id); RefreshView(vv, list); //关闭刷新View； vv.EndHeaderRefreshing(); }; //RefreshView(vv, listCall); }); }) { IsBackground = true }.Start(); RefreshView(vv, listCall); } /// <summary> /// 通话记录刷新界面 HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
@@ -8,66 +8,72 @@ { 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<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> /// <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 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> /// <param name="tag">是否要显示log(默认显示tag=true)</param> public void GetVideo(Action<VideoClouds> action, FrameLayout frame, bool tag) { VideoClouds videoObj = null; ThreadSend(null, (responsePackNew) => { try { var str = responsePackNew.Data.ToString(); videoObj = Newtonsoft.Json.JsonConvert.DeserializeObject<VideoClouds>(str); action(videoObj); } catch { action(videoObj); } }, "获取可视对讲", "fram", frame, null, tag); } /// <summary> /// 获取历史通话记录 /// </summary> /// <param name="id"></param> public List<CallView> getCall(string id) public List<CallView> GetCall(string id) { List<CallView> callViewList = new List<CallView>(); try @@ -137,9 +143,8 @@ /// <param name="frame">log父控件</param> /// <param name="dialog">log父控件</param> /// <param name="tag">是否要显示log</param> public void ThreadSend(VideoClouds videoObj, Action<ResponsePackNew> action, string str, string view, FrameLayout frame, Dialog dialog, bool tag = true) public static void ThreadSend(VideoClouds videoObj, Action<ResponsePackNew> action, string str, string view, FrameLayout frame, Dialog dialog, bool tag = true) { //加载log Loading loading = new Loading(); if (view == "dialog") @@ -202,9 +207,46 @@ } /// <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 {
