From f5d70cb8d5407e1aeaa596976639837151c9c909 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 25 三月 2021 13:47:32 +0800
Subject: [PATCH] 2021-03-25 1.增加相关接口
---
HDL-ON_Android/HDL-ON_Android.csproj | 1
HDL-ON_Android/.DS_Store | 0
/dev/null | 117 -----------
HDL_ON/DAL/Server/NewAPI.cs | 37 +++
HDL-ON_iOS/HDL-ON_iOS.csproj | 1
HDL_ON/DAL/FL/ESOnVideo.cs | 394 +++++++++++++++++++++++++++++++++++++++
.vs/HDL_APP_Project/xs/UserPrefs.xml | 30 +-
HDL_ON/HDL_ON.projitems | 2
8 files changed, 444 insertions(+), 138 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 7ffbd35..308018c 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,27 +1,21 @@
-锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/Constant.cs">
+锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs">
<Files>
- <File FileName="HDL-ON_iOS/Other/ESVideo.cs" Line="9" Column="27" />
- <File FileName="HDL-ON_Android/Application.cs" Line="30" Column="10" />
- <File FileName="HDL_ON/Common/HDLCommon.cs" Line="251" Column="23" />
- <File FileName="HDL-ON_Android/Other/JLCountrycode.cs" Line="67" Column="32" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushService.cs" Line="1" Column="1" />
- <File FileName="HDL-ON_Android/Other/JPush/JPushReceiver.cs" Line="177" Column="52" />
- <File FileName="HDL_ON/Common/Constant.cs" Line="241" Column="32" />
+ <File FileName="HDL_ON/UI/UI1-Login/ForgetPasswordPage.cs" Line="1" Column="1" />
</Files>
<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="Constant.cs" selected="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="FL" expanded="True" />
</Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Other" expanded="True">
- <Node name="JPush" expanded="True" />
+ <Node name="UI" expanded="True">
+ <Node name="UI1-Login" expanded="True">
+ <Node name="ForgetPasswordPage.cs" selected="True" />
+ </Node>
</Node>
</Node>
<Node name="HDL-ON_iOS" expanded="True">
@@ -39,8 +33,8 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.822QECU5228FU" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/HDL-ON_Android/.DS_Store b/HDL-ON_Android/.DS_Store
index ec75957..9a2b94c 100644
--- a/HDL-ON_Android/.DS_Store
+++ b/HDL-ON_Android/.DS_Store
Binary files differ
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 676054f..fd4c1d4 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -137,7 +137,6 @@
<Compile Include="Other\JLCountrycode.cs" />
<Compile Include="Other\JPush\JPushReceiver.cs" />
<Compile Include="Other\JPush\JPushService.cs" />
- <Compile Include="Other\ESOnVideo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
diff --git a/HDL-ON_Android/Other/ESOnVideo.cs b/HDL-ON_Android/Other/ESOnVideo.cs
deleted file mode 100644
index d632c32..0000000
--- a/HDL-ON_Android/Other/ESOnVideo.cs
+++ /dev/null
@@ -1,106 +0,0 @@
-锘縰sing System;
-
-namespace Shared
-{
- /// <summary>
- /// 涓版灄鍙瀵硅
- /// </summary>
- public class ESOnVideo
- {
- /// <summary>
- ///
- /// </summary>
- private static ESOnVideo m_Current = null;
- /// <summary>
- ///
- /// </summary>
- public static ESOnVideo Current
- {
- get
- {
- if (m_Current == null)
- {
- m_Current = new ESOnVideo();
- }
- return m_Current;
- }
- }
-
- public void InitESVideoSDK()
- {
- //ESVideo.
- }
-
- /// <summary>
- /// 鐩戞帶椤甸潰
- /// </summary>
- /// <param name="mESVideoInfo"></param>
- public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
- {
-
- }
-
-
-
- /// <summary>
- /// 琚懠鍙〉闈�
- /// </summary>
- /// <param name="mESVideoInfo"></param>
- public void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
- {
-
- }
-
- /// <summary>
- /// 娴嬭瘯鏂规硶
- /// </summary>
- /// <param name="isMonitor"></param>
- public void Test(bool isMonitor = true) {
- ESVideoInfo eSVideoInfo = new ESVideoInfo()
- {
- DeviceName = "瀹ゅ鏈�88",
- ESVideoUUID = "JJY000019VPLLF",
- };
- if (isMonitor)
- {
- ShowESVideoMonitor(eSVideoInfo);
- }
- else
- {
- ShowESvideoVideoIntercom(eSVideoInfo);
- }
-
- }
- }
-
- public class ESVideoInfo
- {
- /// <summary>
- /// 瀹ゅ鏈虹殑UUID
- /// 渚嬶細JJY000007FSEYX
- /// </summary>
- public string ESVideoUUID = string.Empty;
- /// <summary>
- /// 褰撳墠鐢ㄦ埛鐨勬埧闂碔D
- /// 渚嬶細0801
- /// </summary>
- public int ESRoomID;
- /// <summary>
- /// 瀹ゅ鏈虹殑鍚嶇О
- /// 渚嬶細瀹ゅ鏈�
- /// </summary>
- public string DeviceName = string.Empty;
- /// <summary>
- /// 鎴块棿鍛藉悕
- /// 渚嬶細8鏍�1鍗曞厓0801
- /// </summary>
- public string RoomName = string.Empty;
- /// <summary>
- /// 鏄惁鏀惰棌
- /// </summary>
- public bool IsCollect;
-
- }
-
-
-}
diff --git a/HDL-ON_iOS/HDL-ON_iOS.csproj b/HDL-ON_iOS/HDL-ON_iOS.csproj
index eedb958..7952804 100644
--- a/HDL-ON_iOS/HDL-ON_iOS.csproj
+++ b/HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -474,7 +474,6 @@
<Compile Include="ZXingOverlayView.cs" />
<Compile Include="Other\JLCountrycode.cs" />
<Compile Include="BlueWifi.cs" />
- <Compile Include="Other\ESOnVideo.cs" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Phone\LoginIcon\ShowPasswordIcon.png" />
diff --git a/HDL-ON_iOS/Other/ESOnVideo.cs b/HDL-ON_iOS/Other/ESOnVideo.cs
deleted file mode 100644
index 6641d3a..0000000
--- a/HDL-ON_iOS/Other/ESOnVideo.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-锘縰sing System;
-using Shared.IOS.ESVideoOnSDK;
-
-namespace Shared
-{
- /// <summary>
- /// 涓版灄鍙瀵硅
- /// </summary>
- public class ESOnVideo
- {
- /// <summary>
- ///
- /// </summary>
- private static ESOnVideo m_Current = null;
- /// <summary>
- ///
- /// </summary>
- public static ESOnVideo Current
- {
- get
- {
- if (m_Current == null)
- {
- m_Current = new ESOnVideo();
- }
- return m_Current;
- }
- }
-
- public void InitESVideoSDK()
- {
- //ESVideo.
- }
-
- /// <summary>
- /// 鐩戞帶椤甸潰
- /// </summary>
- /// <param name="mESVideoInfo"></param>
- public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
- {
- ESOnMonitorViewController vc = new ESOnMonitorViewController();
- vc.MESVideoID = mESVideoInfo.ESVideoUUID;
- vc.MESRoomID = mESVideoInfo.ESRoomID;
- vc.DeviceName = mESVideoInfo.DeviceName;
- vc.RoomName = mESVideoInfo.RoomName;
- Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
- }
-
-
-
- /// <summary>
- /// 琚懠鍙〉闈�
- /// </summary>
- /// <param name="mESVideoInfo"></param>
- public void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
- {
- ESOnIntercomViewController vc = new ESOnIntercomViewController();
- vc.MESVideoID = mESVideoInfo.ESVideoUUID;
- vc.MESRoomID = mESVideoInfo.ESRoomID;
- vc.DeviceName = mESVideoInfo.DeviceName;
- vc.RoomName = mESVideoInfo.RoomName;
- Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
- }
-
- /// <summary>
- /// 娴嬭瘯鏂规硶
- /// </summary>
- /// <param name="isMonitor"></param>
- public void Test(bool isMonitor = true) {
- ESVideoInfo eSVideoInfo = new ESVideoInfo()
- {
- DeviceName = "瀹ゅ鏈�88",
- ESVideoUUID = "JJY000019VPLLF",
- };
- if (isMonitor)
- {
- ShowESVideoMonitor(eSVideoInfo);
- }
- else
- {
- ShowESvideoVideoIntercom(eSVideoInfo);
- }
-
- }
- }
-
- public class ESVideoInfo
- {
- /// <summary>
- /// 瀹ゅ鏈虹殑UUID
- /// 渚嬶細JJY000007FSEYX
- /// </summary>
- public string ESVideoUUID = string.Empty;
- /// <summary>
- /// 褰撳墠鐢ㄦ埛鐨勬埧闂碔D
- /// 渚嬶細0801
- /// </summary>
- public int ESRoomID;
- /// <summary>
- /// 瀹ゅ鏈虹殑鍚嶇О
- /// 渚嬶細瀹ゅ鏈�
- /// </summary>
- public string DeviceName = string.Empty;
- /// <summary>
- /// 鎴块棿鍛藉悕
- /// 渚嬶細8鏍�1鍗曞厓0801
- /// </summary>
- public string RoomName = string.Empty;
- /// <summary>
- /// 鏄惁鏀惰棌
- /// </summary>
- public bool IsCollect;
-
- }
-
-
-}
diff --git a/HDL_ON/DAL/FL/ESOnVideo.cs b/HDL_ON/DAL/FL/ESOnVideo.cs
new file mode 100644
index 0000000..f7f67e1
--- /dev/null
+++ b/HDL_ON/DAL/FL/ESOnVideo.cs
@@ -0,0 +1,394 @@
+锘縰sing System;
+using HDL_ON;
+using HDL_ON.DAL.Server;
+using System.Threading;
+using System.Collections.Generic;
+
+#if __IOS__
+using Shared.IOS.ESVideoOnSDK;
+using UIKit;
+using Foundation;
+
+#endif
+
+namespace Shared
+{
+ /// <summary>
+ /// 涓版灄鍙瀵硅
+ /// </summary>
+ public class ESOnVideo
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ private static ESOnVideo m_Current = null;
+ /// <summary>
+ ///
+ /// </summary>
+ public static ESOnVideo Current
+ {
+ get
+ {
+ if (m_Current == null)
+ {
+ m_Current = new ESOnVideo();
+ }
+ return m_Current;
+ }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public ESVideoInfo esVideoInfo;
+ //public FLInfo mFLInfo;
+
+ public void InitESVideoSDK()
+ {
+ //ESVideo.
+ }
+
+ /// <summary>
+ /// 鐩戞帶椤甸潰
+ /// </summary>
+ /// <param name="mESVideoInfo"></param>
+ public void ShowESVideoMonitor(ESVideoInfo mESVideoInfo)
+ {
+ this.esVideoInfo = mESVideoInfo;
+
+#if __IOS__
+ ESOnMonitorViewController vc = new ESOnMonitorViewController();
+ vc.MESVideoID = mESVideoInfo.ESVideoUUID;
+ //vc.MESRoomID = mESVideoInfo.ESRoomID;
+ vc.DeviceName = mESVideoInfo.DeviceName;
+ //vc.RoomName = mESVideoInfo.RoomName;
+ vc.MESCallDelegate = new OnESCallDelegate(this);
+ Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
+#else
+
+#endif
+ }
+
+
+
+ /// <summary>
+ /// 琚懠鍙〉闈�
+ /// </summary>
+ /// <param name="mESVideoInfo"></param>
+ public void ShowESvideoVideoIntercom(ESVideoInfo mESVideoInfo)
+ {
+ this.esVideoInfo = mESVideoInfo;
+#if __IOS__
+ ESOnIntercomViewController vc = new ESOnIntercomViewController();
+ vc.MESVideoID = mESVideoInfo.ESVideoUUID;
+ //vc.MESRoomID = mESVideoInfo.ESRoomID;
+ vc.DeviceName = mESVideoInfo.DeviceName;
+ //vc.RoomName = mESVideoInfo.RoomName;
+ vc.MESCallDelegate = new OnESCallDelegate(this);
+ Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
+#else
+
+#endif
+ }
+
+ #region 鍔ㄤ綔鍥炶皟锛屾彁浜よ褰曞埌浜戠
+
+ /// <summary>
+ /// 鍒ゆ柇callId鏄惁涓虹┖
+ /// </summary>
+ /// <returns></returns>
+ bool CheckESVideoInfoIsNullOrEmpty()
+ {
+ return (esVideoInfo == null || string.IsNullOrEmpty(esVideoInfo.callId));
+ }
+
+ /// <summary>
+ /// 鎺ュ惉
+ /// </summary>
+ void AnswerAction()
+ {
+ Utlis.WriteLine("AnswerAction");
+
+ if (CheckESVideoInfoIsNullOrEmpty()) return;
+
+ new Thread(() =>
+ {
+ var requestJson = HttpUtil.GetSignRequestJson(esVideoInfo);
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Answer, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ Utlis.WriteLine("POST 鎺ュ惉鎴愬姛");
+ }
+ else
+ {
+ Utlis.WriteLine("POST 鎺ュ惉澶辫触");
+ }
+
+ })
+ { IsBackground = true }.Start();
+
+
+ }
+
+ /// <summary>
+ /// 鎸傛柇
+ /// </summary>
+ /// <param name="callDuration"></param>
+ void HangUpAction(int callDuration)
+ {
+ Utlis.WriteLine("HangUpAction :" + callDuration);
+
+ if (CheckESVideoInfoIsNullOrEmpty()) return;
+
+ new Thread(() =>
+ {
+ Dictionary<string, object> dic = new Dictionary<string, object>();
+ dic.Add("callId", esVideoInfo.callId);
+ dic.Add("callDuration", callDuration);
+
+ var requestJson = HttpUtil.GetSignRequestJson(dic);
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_HangUp, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ Utlis.WriteLine("POST 鎸傛柇鎴愬姛");
+ }
+ else
+ {
+ Utlis.WriteLine("POST 鎸傛柇澶辫触");
+ }
+
+ })
+ { IsBackground = true }.Start();
+ }
+
+ /// <summary>
+ /// 鎷掓帴
+ /// </summary>
+ void RejectCallAction()
+ {
+ Utlis.WriteLine("RejectCallAction");
+
+ if (CheckESVideoInfoIsNullOrEmpty()) return;
+
+ new Thread(() =>
+ {
+ Dictionary<string, object> dic = new Dictionary<string, object>();
+ dic.Add("callId", esVideoInfo.callId);
+
+ var requestJson = HttpUtil.GetSignRequestJson(dic);
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Reject, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ Utlis.WriteLine("POST 鎷掓帴鎴愬姛");
+ }
+ else
+ {
+ Utlis.WriteLine("POST 鎷掓帴澶辫触");
+ }
+
+ })
+ { IsBackground = true }.Start();
+ }
+
+ /// <summary>
+ /// 鎴浘鎴愬姛
+ /// </summary>
+ void ScreenshotSuccessfulAction(byte[] dataBytes)
+ {
+ Utlis.WriteLine("ScreenshotSuccessfulAction");
+
+ if (CheckESVideoInfoIsNullOrEmpty()) return;
+
+ new Thread(() =>
+ {
+ var imageName = Guid.NewGuid().ToString();
+ Dictionary<string, object> dic = new Dictionary<string, object>();
+ dic.Add("callId", esVideoInfo.callId);
+ dic.Add("images", dataBytes);
+ dic.Add("imagesName", "FL" + imageName + "_ios.jpg");
+
+ var requestJson = HttpUtil.GetSignRequestJson(dic);
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Screenshot, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ Utlis.WriteLine("POST 鎴浘涓婁紶鎴愬姛");
+ }
+ else
+ {
+ Utlis.WriteLine("POST 鎴浘涓婁紶澶辫触");
+ }
+
+ })
+ { IsBackground = true }.Start();
+
+ }
+
+ /// <summary>
+ /// 寮�閿佹垚鍔�
+ /// </summary>
+ void UnlockAction()
+ {
+ Utlis.WriteLine("UnlockAction");
+
+ if (CheckESVideoInfoIsNullOrEmpty()) return;
+
+ new Thread(() =>
+ {
+ Dictionary<string, object> dic = new Dictionary<string, object>();
+ dic.Add("callId", esVideoInfo.callId);
+
+ var requestJson = HttpUtil.GetSignRequestJson(dic);
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_FL_Unlock, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+ Utlis.WriteLine("POST 寮�閿佹垚鍔�");
+ }
+ else
+ {
+ Utlis.WriteLine("POST 寮�閿佸け璐�");
+ }
+
+ })
+ { IsBackground = true }.Start();
+ }
+
+ #endregion
+
+#if __IOS__
+ #region OnESCallDelegate
+ /////// <summary>
+ /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢
+ /////// </summary>
+ //OnESCallDelegate mOnESCallDelegate;
+
+ public class OnESCallDelegate : ESCallDelegate
+ {
+
+ [Weak] ESOnVideo _ESOnVideo;
+
+ public OnESCallDelegate(ESOnVideo mESOnVideo)
+ {
+ _ESOnVideo = mESOnVideo;
+ }
+
+ /// <summary>
+ /// 鎺ュ惉
+ /// </summary>
+ public override void OnAnswerAction()
+ {
+ _ESOnVideo.AnswerAction();
+ }
+
+ /// <summary>
+ /// 鎸傛柇
+ /// </summary>
+ /// <param name="callDuration"></param>
+ public override void OnHangUpAction(int callDuration)
+ {
+ _ESOnVideo.HangUpAction(callDuration);
+ }
+
+ /// <summary>
+ /// 鎷掓帴
+ /// </summary>
+ public override void OnRejectCallAction()
+ {
+ _ESOnVideo.RejectCallAction();
+ }
+
+ /// <summary>
+ /// 鎴浘鎴愬姛
+ /// </summary>
+ /// <param name="image"></param>
+ public override void OnScreenshotSuccessfulAction(UIImage image)
+ {
+ //NSData imageData = UIImagePNGRepresentation(image); UIImage
+ NSData imageData = image.AsPNG();
+ byte[] dataBytes = new byte[imageData.Length];
+ System.Runtime.InteropServices.Marshal.Copy(imageData.Bytes, dataBytes, 0, Convert.ToInt32(imageData.Length));
+ //image.g
+ _ESOnVideo.ScreenshotSuccessfulAction(dataBytes);
+ }
+
+ /// <summary>
+ /// 寮�閿佹垚鍔�
+ /// </summary>
+ public override void OnUnlockAction()
+ {
+ _ESOnVideo.UnlockAction();
+ }
+
+ }
+
+ #endregion
+#endif
+
+ /// <summary>
+ /// 娴嬭瘯鏂规硶
+ /// </summary>
+ /// <param name="isMonitor"></param>
+ public void Test(bool isMonitor = true)
+ {
+ ESVideoInfo eSVideoInfo = new ESVideoInfo()
+ {
+ DeviceName = "瀹ゅ鏈�88",
+ ESVideoUUID = "JJY000019VPLLF",
+ };
+ if (isMonitor)
+ {
+ ShowESVideoMonitor(eSVideoInfo);
+ }
+ else
+ {
+ ShowESvideoVideoIntercom(eSVideoInfo);
+ }
+
+ }
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public class ESVideoInfo
+ {
+ /// <summary>
+ /// 瀹ゅ鏈虹殑UUID
+ /// 渚嬶細JJY000007FSEYX
+ /// </summary>
+ public string ESVideoUUID = string.Empty;
+ /// <summary>
+ /// 瀹ゅ鏈虹殑鍚嶇О
+ /// 渚嬶細瀹ゅ鏈�
+ /// </summary>
+ public string DeviceName = string.Empty;
+ /// <summary>
+ /// 涓版灄璇锋眰鐨勫敮涓�id
+ /// </summary>
+ public string uuid;
+ /// <summary>
+ /// 涓版灄绀惧尯id
+ /// </summary>
+ public string cmtID;
+ /// <summary>
+ /// 涓版灄鎴块棿鍙�
+ /// </summary>
+ public string roomno;
+ /// <summary>
+ /// 涓版灄妤兼爧鍙�
+ /// </summary>
+ public string unitno;
+ /// <summary>
+ /// 涓版灄浣忓畢Id
+ /// </summary>
+ public string HomeID;
+ /// <summary>
+ /// 鍛煎彨璁板綍Id
+ /// </summary>
+ public string callId;
+
+ }
+
+
+
+
+}
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index 5921982..e653247 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -521,8 +521,43 @@
/// 淇敼绾㈠瀹濆悕绉�
/// </summary>
public const string API_POST_Ir_DeviceRename = "/home-wisdom/app/device/rename";
-
+
+ #endregion
+
+ #region 鈻� -- 涓版灄鐩稿叧鐩稿叧鎺ュ彛___________________________
+ ///// <summary>
+ ///// 妫�鏌ヤ綇瀹呮槸鍚︾粦瀹氫赴鏋楋紝骞惰幏鍙栭棬鍙ｆ満鍒楄〃
+ ///// </summary>
+ //public const string API_POST_FL_Check = "/home-wisdom/app/fl/vi/answer";
+ /// <summary>
+ /// 鎺ュ惉
+ /// </summary>
+ public const string API_POST_FL_Answer = "/home-wisdom/app/fl/vi/answer";
+ /// <summary>
+ /// 鎷掓帴
+ /// </summary>
+ public const string API_POST_FL_Reject = "/home-wisdom/app/fl/vi/reject";
+ /// <summary>
+ /// 寮�閿佹垚鍔�
+ /// </summary>
+ public const string API_POST_FL_Unlock= "/home-wisdom/app/fl/vi/unlock";
+ /// <summary>
+ /// 閫氳瘽瑙嗛鎴浘涓婁紶
+ /// </summary>
+ public const string API_POST_FL_Screenshot = "/home-wisdom/app/fl/vi/screenshot";
+ /// <summary>
+ /// 閫氳瘽瑙嗛鎴浘涓婁紶
+ /// </summary>
+ public const string API_POST_FL_HangUp = "/home-wisdom/app/fl/vi/hang-up";
+ /// <summary>
+ /// 鑾峰彇閫氳瘽璁板綍
+ /// </summary>
+ public const string API_POST_FL_GetCallList = "/home-wisdom/app/fl/vi/list";
+ /// <summary>
+ /// 鍒犻櫎閫氳瘽璁板綍
+ /// </summary>
+ public const string API_POST_FL_DeleteCallInfo = "/home-wisdom/app/fl/vi/delete";
#endregion
}
diff --git a/HDL_ON/HDL_ON.projitems b/HDL_ON/HDL_ON.projitems
index b88449d..8675109 100644
--- a/HDL_ON/HDL_ON.projitems
+++ b/HDL_ON/HDL_ON.projitems
@@ -360,6 +360,7 @@
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\Matching.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\PirNameView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddFunction\BrandListPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)DAL\FL\ESOnVideo.cs" />
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)UI\" />
@@ -399,5 +400,6 @@
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\ArmSensor\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\" />
<Folder Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\" />
+ <Folder Include="$(MSBuildThisFileDirectory)DAL\FL\" />
</ItemGroup>
</Project>
--
Gitblit v1.8.0