2021-03-25 1.完善丰林接口对接。

JLChen

2021-03-25 bcc1155365489498f171a245d26818be0aa526d0

 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>