From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01
---
ZigbeeApp/Home.Ios/AppDelegate.cs | 1 -
ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml | 18 ++++++++++--------
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 2 +-
ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide | 0
ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs | 9 ++++++++-
5 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
index e322e8d..b628aa1 100644
--- a/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
+++ b/ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml
@@ -1,23 +1,23 @@
锘�<Properties StartupConfiguration="{F1296E2C-3777-4385-85B2-DA77617E3178}|Default">
<MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.5c86e4357d63" />
<MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
- <MonoDevelop.Ide.Workbench>
+ <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/VideoIntercom/VideoMachine.cs">
<Files>
- <File FileName="Shared/Phone/Device/VideoIntercom/VideoMachine.cs" Line="233" Column="23" IsPinned="True" />
+ <File FileName="Shared/Phone/Device/VideoIntercom/VideoMachine.cs" Line="114" Column="10" IsPinned="True" />
<File FileName="Shared/Common/CommonPage.cs" IsPinned="True" />
<File FileName="Shared/Phone/Category/CategoryMainForm.cs" />
- <File FileName="Shared/Phone/Device/Logic/Send.cs" />
+ <File FileName="Shared/Phone/Device/Logic/Send.cs" Line="1236" Column="55" />
<File FileName="Shared/Phone/MainPage/HomeMainPageForm.cs" />
<File FileName="Home.Ios/ESVideo.cs" Line="50" Column="66" />
- <File FileName="Home.Ios/AppDelegate.cs" Line="237" Column="47" />
+ <File FileName="Home.Ios/AppDelegate.cs" Line="68" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="GateWay" expanded="True">
<Node name="Home.IOS" expanded="True">
+ <Node name="References" expanded="True" />
<Node name="Resources" expanded="True" />
- <Node name="ESVideo.cs" selected="True" />
</Node>
<Node name="Shared" expanded="True">
<Node name="Common" expanded="True" />
@@ -26,7 +26,9 @@
<Node name="CommonForm" expanded="True" />
<Node name="Device" expanded="True">
<Node name="Logic" expanded="True" />
- <Node name="VideoIntercom" expanded="True" />
+ <Node name="VideoIntercom" expanded="True">
+ <Node name="VideoMachine.cs" selected="True" />
+ </Node>
</Node>
<Node name="MainPage" expanded="True" />
<Node name="SmartSound" expanded="True">
@@ -46,7 +48,7 @@
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
- <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.913cb77b0eef11c9119c61a02bc00fec01bf67d6" />
+ <MonoDevelop.Ide.ItemProperties.Home.IOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.D4411691-F5B8-40F4-97C1-964F33115DBC" />
<MonoDevelop.Ide.DebuggingService.PinnedWatches>
<Watch file="../../../Home.Ios/AppDelegate.cs" line="113" offsetX="-1" offsetY="-1" expression="application.ApplicationState" liveUpdate="False" />
<Watch file="../../../Home.Ios/AppDelegate.cs" line="113" offsetX="-1" offsetY="-1" expression="application.ApplicationState" liveUpdate="False" />
@@ -55,7 +57,7 @@
<Watch file="../../../Home.Ios/AppDelegate.cs" line="104" offsetX="-1" offsetY="-1" expression="application.ApplicationState" liveUpdate="False" />
<Watch file="../../../Home.Ios/AppDelegate.cs" line="113" offsetX="-1" offsetY="-1" expression="application.ApplicationState" liveUpdate="False" />
</MonoDevelop.Ide.DebuggingService.PinnedWatches>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhoneSimulator" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
index 19f7105..25886e5 100644
--- a/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
+++ b/ZigbeeApp/.vs/GateWay/xs/sqlite3/storage.ide
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/AppDelegate.cs b/ZigbeeApp/Home.Ios/AppDelegate.cs
index ee2740e..964d407 100644
--- a/ZigbeeApp/Home.Ios/AppDelegate.cs
+++ b/ZigbeeApp/Home.Ios/AppDelegate.cs
@@ -236,7 +236,6 @@
}
GateWay.Ios.ESVideo.ShowESvideoVideoIntercom(eSVideoInfo);
-
//var url = "https://global.hdlcontrol.com/HangZhouHdlCloudApi/VideoIntercom/Answer";
//var dd=await Shared.Phone.Device.Logic.Send.HttpWebRequest(url, json.ToString(), "POST", 3, true);
}
diff --git a/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
index f3487e6..070ceac 100644
--- a/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
+++ b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
@@ -112,7 +112,11 @@
}
}
- public async static void Video(FrameLayout topFrameLayout)
+ /// <summary>
+ /// 鍒ゆ柇璐﹀彿鏄惁鏀寔鍙瀵硅
+ /// </summary>
+ /// <param name="topFrameLayout"></param>
+ public async static void AccountSupportVideo(FrameLayout topFrameLayout)
{
var jobject = new JObject();
jobject.Add("RequestVersion", CommonPage.RequestVersion);
@@ -166,6 +170,9 @@
}
+ /// <summary>
+ /// 鑾峰彇鍙瀵硅鍒楄〃
+ /// </summary>
static async System.Threading.Tasks.Task<List<VideoCalss>> GetVideoInfoList(CloudsVideo clouds)
{
List<VideoCalss> eSVideoInfosList = new List<VideoCalss>();
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 717fe41..01d33a7 100644
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -135,7 +135,7 @@
}
//鍙瀵硅蹇嵎鏂瑰紡
- Shared.Phone.Device.VideoIntercom.VideoMachine.Video(topFrameLayout);
+ Shared.Phone.Device.VideoIntercom.VideoMachine.AccountSupportVideo(topFrameLayout);
//var videoIntercomBtn = new Button();
//videoIntercomBtn.Gravity = Gravity.CenterVertical;
--
Gitblit v1.8.0