From bcc1155365489498f171a245d26818be0aa526d0 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 25 三月 2021 18:40:59 +0800
Subject: [PATCH] 2021-03-25 1.完善丰林接口对接。

---
 HDL_ON/DAL/FL/ESOnVideo.cs |   68 +++++++++++++++++++++++----------
 1 files changed, 47 insertions(+), 21 deletions(-)

diff --git a/HDL_ON/DAL/FL/ESOnVideo.cs b/HDL_ON/DAL/FL/ESOnVideo.cs
index f7f67e1..e9a5cf2 100644
--- a/HDL_ON/DAL/FL/ESOnVideo.cs
+++ b/HDL_ON/DAL/FL/ESOnVideo.cs
@@ -38,11 +38,13 @@
         }
 
         /// <summary>
-        /// 
+        /// 闂ㄥ彛鏈恒�佷赴鏋楀皬鍖轰俊鎭拰鎴块棿淇℃伅绛夊弬鏁�
         /// </summary>
         public ESVideoInfo esVideoInfo;
-        //public FLInfo mFLInfo;
 
+        /// <summary>
+        /// 
+        /// </summary>
         public void InitESVideoSDK()
         {
             //ESVideo.
@@ -66,6 +68,7 @@
             Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
 #else
 
+
 #endif
         }
 
@@ -84,9 +87,12 @@
             //vc.MESRoomID = mESVideoInfo.ESRoomID;
             vc.DeviceName = mESVideoInfo.DeviceName;
             //vc.RoomName = mESVideoInfo.RoomName;
-            vc.MESCallDelegate = new OnESCallDelegate(this);
+            //vc.MESCallDelegate = new OnESCallDelegate(this);
+            mOnESCallDelegate = new OnESCallDelegate(this);
+            vc.MESCallDelegate = mOnESCallDelegate;
             Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
 #else
+
 
 #endif
         }
@@ -99,7 +105,13 @@
         /// <returns></returns>
         bool CheckESVideoInfoIsNullOrEmpty()
         {
-            return (esVideoInfo == null || string.IsNullOrEmpty(esVideoInfo.callId));
+            if(esVideoInfo == null || string.IsNullOrEmpty(esVideoInfo.callId))
+            {
+                Utlis.WriteLine("ESVideoInfo Is NullOrEmpty");
+                return true;
+            }
+            return false;
+            //return (esVideoInfo == null || string.IsNullOrEmpty(esVideoInfo.callId));
         }
 
         /// <summary>
@@ -121,12 +133,11 @@
                 }
                 else
                 {
-                    Utlis.WriteLine("POST 鎺ュ惉澶辫触");
+                    Utlis.WriteLine("POST 鎺ュ惉澶辫触 code: " + revertObj.Code);
                 }
 
             })
-            { IsBackground = true }.Start();
-
+            { IsBackground = false }.Start();
 
         }
 
@@ -154,11 +165,11 @@
                 }
                 else
                 {
-                    Utlis.WriteLine("POST 鎸傛柇澶辫触");
+                    Utlis.WriteLine("POST 鎸傛柇澶辫触 code: "+ revertObj.Code);
                 }
 
             })
-            { IsBackground = true }.Start();
+            { IsBackground = false }.Start();
         }
 
         /// <summary>
@@ -183,11 +194,11 @@
                 }
                 else
                 {
-                    Utlis.WriteLine("POST 鎷掓帴澶辫触");
+                    Utlis.WriteLine("POST 鎷掓帴澶辫触 code: " + revertObj.Code);
                 }
 
             })
-            { IsBackground = true }.Start();
+            { IsBackground = false }.Start();
         }
 
         /// <summary>
@@ -215,14 +226,15 @@
                 }
                 else
                 {
-                    Utlis.WriteLine("POST 鎴浘涓婁紶澶辫触");
+                    Utlis.WriteLine("POST 鎴浘涓婁紶澶辫触 code: " + revertObj.Code);
                 }
 
             })
-            { IsBackground = true }.Start();
+            { IsBackground = false }.Start();
 
         }
 
+        DateTime UnlockDateTime = DateTime.MinValue;
         /// <summary>
         /// 寮�閿佹垚鍔�
         /// </summary>
@@ -231,6 +243,15 @@
             Utlis.WriteLine("UnlockAction");
 
             if (CheckESVideoInfoIsNullOrEmpty()) return;
+
+            //3S鍐呬笉鍏佽瑙﹀彂绗簩娆�
+            if(UnlockDateTime.AddSeconds(3) > DateTime.Now)
+            {
+                UnlockDateTime = DateTime.Now;
+                Utlis.WriteLine("3S鍐呬笉鍏佽瑙﹀彂绗簩娆�");
+                //涓版灄SDKbug锛屽懠鍙殑鏃跺�欏紑閿佹垚鍔熶細鏈�2娆″洖璋冿紝
+                return;
+            }
 
             new Thread(() =>
             {
@@ -245,11 +266,11 @@
                 }
                 else
                 {
-                    Utlis.WriteLine("POST 寮�閿佸け璐�");
+                    Utlis.WriteLine("POST 寮�閿佸け璐� code: " + revertObj.Code);
                 }
 
             })
-            { IsBackground = true }.Start();
+            { IsBackground = false }.Start();
         }
 
         #endregion
@@ -259,8 +280,11 @@
         /////// <summary>
         /////// OnESCallDelegate 缁ф壙鍝嶅簲浜嬩欢
         /////// </summary>
-        //OnESCallDelegate mOnESCallDelegate;
+        OnESCallDelegate mOnESCallDelegate;
 
+        /// <summary>
+        /// 
+        /// </summary>
         public class OnESCallDelegate : ESCallDelegate
         {
 
@@ -333,6 +357,7 @@
             {
                 DeviceName = "瀹ゅ鏈�88",
                 ESVideoUUID = "JJY000019VPLLF",
+                 
             };
             if (isMonitor)
             {
@@ -340,6 +365,7 @@
             }
             else
             {
+                eSVideoInfo.callId = "88888";
                 ShowESvideoVideoIntercom(eSVideoInfo);
             }
 
@@ -360,7 +386,7 @@
         /// 瀹ゅ鏈虹殑鍚嶇О
         /// 渚嬶細瀹ゅ鏈�
         /// </summary>
-        public string DeviceName = string.Empty;
+        public string DeviceName = "闂ㄥ彛鏈�";
         /// <summary>
         /// 涓版灄璇锋眰鐨勫敮涓�id
         /// </summary>
@@ -377,10 +403,10 @@
         /// 涓版灄妤兼爧鍙�
         /// </summary>
         public string unitno;
-        /// <summary>
-        /// 涓版灄浣忓畢Id
-        /// </summary>
-        public string HomeID;
+        ///// <summary>
+        ///// 涓版灄浣忓畢Id
+        ///// </summary>
+        //public string HomeID;
         /// <summary>
         /// 鍛煎彨璁板綍Id
         /// </summary>

--
Gitblit v1.8.0