Merge branch 'release0123' into V1.5.9

wxr

2022-06-30 59e221cdb1ba8a666f68c5a2014e59e6f1870b43

 HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs

@@ -129,7 +129,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 +156,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
        }

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

               


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

            }

         

         

            #endregion
#endif
        }