Merge branch 'wxr0114' into V1.5.9

wxr

2022-06-30 23bbed132eea46eef51c6d01c21b346238e29ee2

 HDL_ON/Common/ApiUtlis.cs

@@ -285,6 +285,7 @@

                    //======================获取可视对讲设备列表====================
                    bool isInterphoneType_HDL = false;//是否为HDLLinphone可视对讲
                    bool isInterphoneType_FREEVIEW = false;//是否为全视通可视对讲
                    var videoInfo= VideoSend.GetVideoInfoList();
                    if (videoInfo.Code == StateCode.SUCCESS)
                    {
@@ -300,6 +301,19 @@
                                isInterphoneType_HDL = true;
                                DB_ResidenceData.Instance.SupportFacePass = true;
                                DB_ResidenceData.Instance.SaveResidenceData();

                                Entity.DB_ResidenceData.Instance.SupportFVDevice = true;

                            }
                            else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
                            {//为全视通可视对讲
                                DB_ResidenceData.Instance.SupportFacePass = true;
                                Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
                                Entity.DB_ResidenceData.Instance.SupportFVDevice = true;

                                //isInterphoneType_HDL = true;
                                isInterphoneType_FREEVIEW = true;

                            }
                        }
                    }
@@ -311,7 +325,18 @@
                        if (isInterphoneType_HDL)
                        {
                            //HDLLinphone可视对讲,获取Sip账号并初始化SDK
                            HDLLinphone.Current.GetHDLSipInfoAndInitSDK(DB_ResidenceData.Instance.CurrentRegion.id);
                            HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
                            callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                            callVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
                            HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
                        }
                        else if (isInterphoneType_FREEVIEW)
                        {
                            //HDLLinphone可视对讲,获取Sip账号并初始化SDK
                            HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
                            callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
                            callVideoInfo.InterphoneType = InterphoneType.FREEVIEW.ToString();
                            HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
                        }
                        else
                        {
@@ -321,6 +346,16 @@
                        }
                    }

                    //======================登录全视通====================
                    if (isInterphoneType_FREEVIEW)
                    {
#if __IOS__
                        //登录全视通
                        Shared.IOS.HDLFVSDK.Video.Init("", DB_ResidenceData.Instance.CurrentRegion.id);
#endif
                    }


                    //======================安防====================
                    GetSecurityList();