Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr

wxr

2023-03-16 f703a411c0ebdf7ada490fda75b52fd839dae079

 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -98,7 +98,6 @@
            }
            else if(interphoneType == InterphoneType.FLVI.ToString())
            {

                ESOnMonitorViewController vc = new ESOnMonitorViewController();
                vc.MESVideoID = mESVideoInfo.ESVideoUUID;
                vc.MESRoomID = roomID;
@@ -106,13 +105,11 @@
                //vc.RoomName = mESVideoInfo.RoomName;
                //vc.MESCallDelegate = new OnESCallDelegate(this);
                Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
            }else if (interphoneType == InterphoneType.HDL.ToString())
            }
            else if (interphoneType == InterphoneType.HDL.ToString())
            {
                //HDLLinphone 狄耐克
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
                ////全视通
                //NSDictionary deviceInfo = new NSDictionary("deviceCode","3-1-11-2", "deviceName", mESVideoInfo.DeviceName);
                //Shared.IOS.HDLFVSDK.Video.Monitor(deviceInfo);
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, interphoneType);
            } else if (interphoneType == InterphoneType.FREEVIEW.ToString())
            {
                //全视通监视
@@ -129,7 +126,7 @@
            if (interphoneType == InterphoneType.IMOUVISIAL.ToString())
            {
                intent = new Intent(Shared.Application.Activity, typeof(HDL_ON_Android.LeChengVideoActivity));
         

                //=========乐橙==========
                intent.PutExtra("Type", 0);
                intent.PutExtra("callId", mESVideoInfo.callId);
@@ -156,22 +153,25 @@
                intent.PutExtra("callId", mESVideoInfo.callId);
                intent.PutExtra("Type", 0);

               


                Shared.Application.Activity.StartActivity(intent);
            }
            else if (interphoneType == InterphoneType.HDL.ToString())
            {
                //HDLLinphone 狄耐克
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo);
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.HDL.ToString());
            }
            else if (interphoneType == InterphoneType.FREEVIEW.ToString())
            {
                string sip_account = "sip:D" + mESVideoInfo.deviceCode + "@139.159.157.75:46000";
                mESVideoInfo.deviceSipAccount = sip_account;
                HDLLinphone.Current.ShowESVideoMonitor(mESVideoInfo, InterphoneType.FREEVIEW.ToString());
            }
            else
            {
                HDLUtils.WriteLine("未对接，不支持监视");
            }

          

#endif
        }

@@ -226,7 +226,6 @@
            }
            else if (interphoneType == InterphoneType.FLVI.ToString())
            {

                ESOnIntercomViewController vc = new ESOnIntercomViewController();
                vc.MESVideoID = mESVideoInfo.ESVideoUUID;
                vc.MESRoomID = roomID;
@@ -236,7 +235,8 @@
                mOnESCallDelegate = new OnESCallDelegate(this);
                vc.MESCallDelegate = mOnESCallDelegate;
                Shared.Application.currentVC.NavigationController.PushViewController(vc, true);
            }else{
            }
            else{
                HDLUtils.WriteLine("未支持的可视对讲类型");

            }
@@ -305,21 +305,12 @@
                intent.PutExtra("callId", mESVideoInfo.callId);
                intent.PutExtra("Type", 1);

               


                Shared.Application.Activity.StartActivity(intent);
            }
            else
            {
                HDLUtils.WriteLine("未支持的可视对讲类型");

            }

         

         

            #endregion
#endif
        }