From 813aee559e544e6bf7777404612a4712cad184c8 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 01 四月 2021 16:31:38 +0800
Subject: [PATCH] 2021-04-01 1.更新丰林iOS最新SDK
---
DLL/FL/iOS/Shared.IOS.ESVideoOnSDK.dll | 0
HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs | 480 +++++++++++++++++++--------------------
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 11
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs | 172 ++++++++-----
.vs/HDL_APP_Project/xs/UserPrefs.xml | 56 ----
5 files changed, 354 insertions(+), 365 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index b97ce74..06251d9 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.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>
- </Node>
- </Node>
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True" />
+ <Node name="HDL_ON" expanded="True" />
+ <Node name="HDL-ON_iOS" expanded="True" selected="True">
+ <Node name="References" 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>
\ No newline at end of file
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/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index d23f3b4..38d8966 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/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;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
index 9ec50bf..329407c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/MainView.cs
@@ -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,196 +105,191 @@
/// <param name="view1">鐖舵帶浠�</param>
/// <param name="list">闂ㄥ彛鏈哄垪琛�</param>
/// <param name="videoClouds">褰撳墠鐨勫彲瑙嗗璁�</param>
- void View1(FrameLayout view1)
+ void View1(FrameLayout view1, List<VideoMethod.FlVideo> list, VideoClouds videoClouds)
{
-
- new System.Threading.Thread(() =>
+ #region 甯冨眬鐣岄潰
+ var bjFl = new FrameLayout
{
- var list = VideoSend.GetVideoInfoList(FunctionList.List.videoIntercom);
- Application.RunOnMainThread(() =>
+ Y = Application.GetRealHeight(24),
+ X = Application.GetRealWidth(24),
+ Height = Application.GetRealHeight(526),
+ Width = Application.GetRealWidth(327),
+ BackgroundImagePath = "MusicIcon/playBj.png",
+ };
+ view1.AddChidren(bjFl);
+ /// <summary>
+ /// 姹夊瓧
+ /// </summary>
+ Button nameBtn = new Button
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(16),
+ Width = Application.GetRealWidth(100),
+ Height = Application.GetRealHeight(33),
+ TextColor = MusicColor.MusicTxet14Color,
+ TextSize = TextSize.Text24,
+ TextAlignment = TextAlignment.CenterLeft,
+ //Text = "鍙瀵硅",
+ TextID = StringId.keshiduijiang,
+ };
+ bjFl.AddChidren(nameBtn);
+ /// <summary>
+ /// 鍖哄煙鍚嶇О
+ /// </summary>
+ Button regionBtn = new Button
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(53),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealHeight(17),
+ TextColor = MusicColor.MusicNoTxetColor,
+ TextSize = TextSize.Text12,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = "123456"
+ };
+ // bjFl.AddChidren(regionBtn);
+ /// <summary>
+ ///鏀惰棌鍥炬爣
+ /// </summary>
+ Button collectIconBtn = new Button
+ {
+ X = Application.GetRealWidth(273),
+ Y = Application.GetRealHeight(14),
+ Width = Application.GetRealWidth(40),
+ Height = Application.GetRealWidth(40),
+ UnSelectedImagePath = "MusicIcon/collect.png",
+ SelectedImagePath = "MusicIcon/collectSelected.png",
+ };
+ // bjFl.AddChidren(collectIconBtn);
+ ///鍙瀵硅鍥炬爣
+ Button intercomBtnIcon = new Button
+ {
+ X = Application.GetRealWidth(84),
+ Y = Application.GetRealHeight(118),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealWidth(160),
+ UnSelectedImagePath = "VideoIcon/keshiduijiang.png",
+
+ };
+ bjFl.AddChidren(intercomBtnIcon);
+
+ var vv = new VerticalScrolViewLayout
+ {
+ Y = Application.GetRealHeight(306),
+ Height = Application.GetRealHeight(220),
+ Width = Application.GetRealWidth(327),
+ };
+ bjFl.AddChidren(vv);
+ if (list.Count > 0)
+ {
+ //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�,铏氭嫙涓�涓嚭鏉�
+ list.Add(new VideoMethod.FlVideo { aliasName = Language.StringByID(StringId.menjinerweima), devType = "100" });
+ }
+ //鏁扮粍涓暟
+ //int value = 15;
+ //鍏堣绠楁暟鎹墍闇�瑕佺殑寰堥珮搴︼紱
+ int l = 0;
+ if (list.Count % 3 == 0)
+ {
+ l = list.Count / 3;
+ }
+ else
+ {
+
+ l = (list.Count / 3) + 1;
+ }
+ var fL = new FrameLayout
+ {
+ Height = Application.GetRealHeight((48 + 24) * l),
+
+ };
+ vv.AddChidren(fL);
+ int line = 0;
+ #endregion
+ for (int i = 1, j = 0; i <= list.Count; i++, j++)
+ {
+ var video = list[i - 1];
+ #region
+ var fLayout = new FrameLayout
{
- #region 甯冨眬鐣岄潰
- var bjFl = new FrameLayout
- {
- Y = Application.GetRealHeight(24),
- X = Application.GetRealWidth(24),
- Height = Application.GetRealHeight(526),
- Width = Application.GetRealWidth(327),
- BackgroundImagePath = "MusicIcon/playBj.png",
- };
- view1.AddChidren(bjFl);
- /// <summary>
- /// 姹夊瓧
- /// </summary>
- Button nameBtn = new Button
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(16),
- Width = Application.GetRealWidth(100),
- Height = Application.GetRealHeight(33),
- TextColor = MusicColor.MusicTxet14Color,
- TextSize = TextSize.Text24,
- TextAlignment = TextAlignment.CenterLeft,
- //Text = "鍙瀵硅",
- TextID = StringId.keshiduijiang,
- };
- bjFl.AddChidren(nameBtn);
- /// <summary>
- /// 鍖哄煙鍚嶇О
- /// </summary>
- Button regionBtn = new Button
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(53),
- Width = Application.GetRealWidth(270),
- Height = Application.GetRealHeight(17),
- TextColor = MusicColor.MusicNoTxetColor,
- TextSize = TextSize.Text12,
- TextAlignment = TextAlignment.CenterLeft,
- Text = "123456"
- };
- bjFl.AddChidren(regionBtn);
- /// <summary>
- ///鏀惰棌鍥炬爣
- /// </summary>
- Button collectIconBtn = new Button
- {
- X = Application.GetRealWidth(273),
- Y = Application.GetRealHeight(14),
- Width = Application.GetRealWidth(40),
- Height = Application.GetRealWidth(40),
- UnSelectedImagePath = "MusicIcon/collect.png",
- SelectedImagePath = "MusicIcon/collectSelected.png",
- };
- bjFl.AddChidren(collectIconBtn);
- ///鍙瀵硅鍥炬爣
- Button intercomBtnIcon = new Button
- {
- X = Application.GetRealWidth(84),
- Y = Application.GetRealHeight(118),
- Width = Application.GetRealWidth(160),
- Height = Application.GetRealWidth(160),
- UnSelectedImagePath = "VideoIcon/keshiduijiang.png",
+ Width = Application.GetRealWidth(50),
+ Height = Application.GetRealWidth(48),
+ X = Application.GetRealWidth(31 + (58 + 50) * j),
+ Y = Application.GetRealHeight(20 + (48 + 24) * line),
- };
- bjFl.AddChidren(intercomBtnIcon);
+ };
+ fL.AddChidren(fLayout);
- var vv = new VerticalScrolViewLayout
+ var iconBtn = new Button
+ {
+ X = Application.GetRealWidth(11),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
+ UnSelectedImagePath = "VideoIcon/weiqiangji.png",
+ };
+ fLayout.AddChidren(iconBtn);
+
+ var deviceNameBtn = new Button
+ {
+ Y = iconBtn.Bottom + Application.GetRealHeight(6),
+ Width = Application.GetRealWidth(50),
+ Height = Application.GetRealHeight(14),
+ TextSize = TextSize.Text10,
+ TextColor = CSS.CSS_Color.TextualColor,
+ TextAlignment = TextAlignment.Center,
+ Text = video.aliasName,
+ };
+ fLayout.AddChidren(deviceNameBtn);
+
+ var clickBtn = new Button { Tag = video };
+
+ fLayout.AddChidren(clickBtn);
+ if (i % 3 == 0)
+ {
+ //婊′竴琛岄噸缃甹=0鍊�;
+ j = -1;
+ line += 1;
+ }
+ getIconAndText(video, iconBtn);
+ #endregion
+ //闂ㄥ彛鏈虹殑鐐瑰嚮浜嬩欢
+ clickBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ var flVideo = clickBtn.Tag as FlVideo;
+ if (flVideo.devType == "100")
{
- Y = Application.GetRealHeight(306),
- Height = Application.GetRealHeight(220),
- Width = Application.GetRealWidth(327),
- };
- bjFl.AddChidren(vv);
- if (list.Count > 0)
- {
- //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�,铏氭嫙涓�涓嚭鏉�
- list.Add(new VideoMethod.FlVideo { aliasName = Language.StringByID(StringId.menjinerweima), devType = "100" });
- }
- //鏁扮粍涓暟
- //int value = 15;
- //鍏堣绠楁暟鎹墍闇�瑕佺殑寰堥珮搴︼紱
- int l = 0;
- if (list.Count % 3 == 0)
- {
- l = list.Count / 3;
+ //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�
+ VideoSend.GetQRcode(this, videoClouds, (tag, paw) =>
+ {
+ if (tag)
+ {
+ //娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥
+ View.ShowDialog showDialog = new View.ShowDialog();
+ showDialog.QRcode(paw);
+ }
+ });
}
else
{
- l = (list.Count / 3) + 1;
- }
- var fL = new FrameLayout
- {
- Height = Application.GetRealHeight((48 + 24) * l),
- };
- vv.AddChidren(fL);
- int line = 0;
- #endregion
- for (int i = 1, j = 0; i <= list.Count; i++, j++)
- {
- var video = list[i - 1];
- #region
- var fLayout = new FrameLayout
+ if (string.IsNullOrEmpty(flVideo.uuid))
{
- Width = Application.GetRealWidth(50),
- Height = Application.GetRealWidth(48),
- X = Application.GetRealWidth(31 + (58 + 50) * j),
- Y = Application.GetRealHeight(20 + (48 + 24) * line),
-
- };
- fL.AddChidren(fLayout);
-
- var iconBtn = new Button
- {
- X = Application.GetRealWidth(11),
- Width = Application.GetRealWidth(28),
- Height = Application.GetRealWidth(28),
- UnSelectedImagePath = "VideoIcon/weiqiangji.png",
- };
- fLayout.AddChidren(iconBtn);
-
- var deviceNameBtn = new Button
- {
- Y = iconBtn.Bottom + Application.GetRealHeight(6),
- Width = Application.GetRealWidth(50),
- Height = Application.GetRealHeight(14),
- TextSize = TextSize.Text10,
- TextColor = CSS.CSS_Color.TextualColor,
- TextAlignment = TextAlignment.Center,
- Text = video.aliasName,
- };
- fLayout.AddChidren(deviceNameBtn);
-
- var clickBtn = new Button { Tag = video };
-
- fLayout.AddChidren(clickBtn);
- if (i % 3 == 0)
- {
- //婊′竴琛岄噸缃甹=0鍊�;
- j = -1;
- line += 1;
+ new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.peizhicanshuyouyichang));
}
- getIconAndText(video, iconBtn);
- #endregion
- //闂ㄥ彛鏈虹殑鐐瑰嚮浜嬩欢
- clickBtn.MouseUpEventHandler += (sender, e) =>
+ ESVideoInfo eSVideoInfo = new ESVideoInfo
{
- var flVideo = clickBtn.Tag as VideoMethod.FlVideo;
- if (flVideo.devType == "100")
- {
- //闂ㄧ浜岀淮鐮佸浐瀹氭湁鐨�
- VideoSend.GetQRcode(this, FunctionList.List.videoIntercom, (tag, paw) =>
- {
- if (tag)
- {
- //娉ㄦ剰锛氬瘑鐮佹湁鍙兘寤舵椂1鍒嗛挓鐢熸晥
- View.ShowDialog showDialog = new View.ShowDialog();
- showDialog.QRcode(paw);
- }
- });
- }
- else
- {
- if (string.IsNullOrEmpty(flVideo.uuid))
- {
- new Intelligence.Automation.LogicView.TipPopView().FlashingBox(Language.StringByID(StringId.peizhicanshuyouyichang));
- }
- ESVideoInfo eSVideoInfo = new ESVideoInfo
- {
- ESVideoUUID = getUuid(flVideo.uuid),
- DeviceName = flVideo.aliasName,
- roomno = FunctionList.List.videoIntercom.flRoomId,
- unitno = FunctionList.List.videoIntercom.flBuildingId,
- };
- ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo);
- }
-
-
+ ESVideoUUID = getUuid(flVideo.uuid),
+ DeviceName = flVideo.aliasName,
+ roomno = videoClouds.flRoomId,
+ unitno = videoClouds.flBuildingId,
};
+ ESOnVideo.Current.ShowESVideoMonitor(eSVideoInfo);
}
- });
- })
- { IsBackground = true }.Start();
+
+
+ };
+ }
+
+
}
/// <summary>
/// 绗簩涓晫闈�
@@ -305,73 +297,67 @@
/// <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),
- X = Application.GetRealWidth(24),
- Height = Application.GetRealHeight(526),
- Width = Application.GetRealWidth(327),
- BackgroundImagePath = "MusicIcon/playBj.png",
- };
- view2.AddChidren(bjFl);
- /// <summary>
- /// 姹夊瓧
- /// </summary>
- Button nameBtn = new Button
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(16),
- Width = Application.GetRealWidth(100),
- Height = Application.GetRealHeight(33),
- TextColor = MusicColor.MusicTxet14Color,
- TextSize = TextSize.Text24,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.tonghuajilu,
- };
- bjFl.AddChidren(nameBtn);
- /// <summary>
- /// 浜戠鐓х墖鍙繚鐣�30澶�
- /// </summary>
- Button regionBtn = new Button
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(53),
- Width = Application.GetRealWidth(270),
- Height = Application.GetRealHeight(17),
- TextColor = MusicColor.SelectedColor,
- TextSize = TextSize.Text12,
- TextAlignment = TextAlignment.CenterLeft,
- TextID = StringId.baolu30,
- };
- bjFl.AddChidren(regionBtn);
- var vv = new VerticalRefreshLayout
- {
- X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(58),
- Height = Application.GetRealHeight(458),
- Width = Application.GetRealWidth(295),
- };
- bjFl.AddChidren(vv);
- vv.BeginHeaderRefreshingAction += () =>
- {
- VideoMethod videoMethod = new VideoMethod();
- var list = videoMethod.getCall(FunctionList.List.videoIntercom.id);
- RefreshView(vv, list);
- //鍏抽棴鍒锋柊View锛�
- vv.EndHeaderRefreshing();
- };
- //RefreshView(vv, listCall);
- });
- })
- { IsBackground = true }.Start();
+ var bjFl = new FrameLayout
+ {
+ Y = Application.GetRealHeight(24),
+ X = Application.GetRealWidth(24),
+ Height = Application.GetRealHeight(526),
+ Width = Application.GetRealWidth(327),
+ BackgroundImagePath = "MusicIcon/playBj.png",
+ };
+ view2.AddChidren(bjFl);
+ /// <summary>
+ /// 姹夊瓧
+ /// </summary>
+ Button nameBtn = new Button
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(16),
+ Width = Application.GetRealWidth(100),
+ Height = Application.GetRealHeight(33),
+ TextColor = MusicColor.MusicTxet14Color,
+ TextSize = TextSize.Text24,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = StringId.tonghuajilu,
+ };
+ bjFl.AddChidren(nameBtn);
+ /// <summary>
+ /// 浜戠鐓х墖鍙繚鐣�30澶�
+ /// </summary>
+ Button regionBtn = new Button
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(53),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealHeight(17),
+ TextColor = MusicColor.SelectedColor,
+ TextSize = TextSize.Text12,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = StringId.baolu30,
+ };
+ bjFl.AddChidren(regionBtn);
+
+ var vv = new VerticalRefreshLayout
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(58),
+ Height = Application.GetRealHeight(458),
+ Width = Application.GetRealWidth(295),
+ };
+ bjFl.AddChidren(vv);
+ vv.BeginHeaderRefreshingAction += () =>
+ {
+ VideoMethod videoMethod = new VideoMethod();
+ var list = videoMethod.GetCall(video.id);
+ RefreshView(vv, list);
+ //鍏抽棴鍒锋柊View锛�
+ vv.EndHeaderRefreshing();
+ };
+ RefreshView(vv, listCall);
+
}
/// <summary>
/// 閫氳瘽璁板綍鍒锋柊鐣岄潰
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
index 3b5bcd8..e7b3272 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMethod.cs
@@ -8,71 +8,77 @@
{
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">鏄惁瑕佹樉绀簂og(榛樿鏄剧ず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
{
-
+
List<Call> listCall = new List<Call>();
var responsePackNew = VideoSend.GetCall(id);
if (responsePackNew != null && responsePackNew.Code == "0" && responsePackNew.Data.ToString() != "")
@@ -137,9 +143,8 @@
/// <param name="frame">log鐖舵帶浠�</param>
/// <param name="dialog">log鐖舵帶浠�</param>
/// <param name="tag">鏄惁瑕佹樉绀簂og</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,10 +207,47 @@
}
-
-
-
- [Serializable]
+ /// <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>
@@ -294,7 +336,7 @@
/// </summary>
public string year = string.Empty;
- public List<Call> callList = new List<Call>();
+ public List<Call> callList = new List<Call>();
}
[Serializable]
@@ -305,7 +347,7 @@
/// </summary>
public string aliasName = string.Empty;
/// <summary>
- /// 璁惧绫诲瀷锛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠＄悊鏈�,5浜屾纭鏈�)
+ /// 璁惧绫诲瀷锛�(1瀹ゅ唴鏈�,2瀹ゅ鏈猴紝3鍥村鏈猴紝4绠＄悊鏈�,5浜屾纭鏈�)
/// </summary>
public string devType = string.Empty;
public string uuid = string.Empty;
--
Gitblit v1.8.0