2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接

JLChen

2021-08-18 b5d11d4b592f2ee398d5174ad6e2e22f1db367e8

2021-08-18 1.完善Android对接LinphoneSDK 2.完善SIP相关接口对接

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -2,8 +2,8 @@
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs">
    <Files>
      <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" Line="173" Column="67" />
      <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/Common/HDLCommon.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" Line="9" Column="16" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -16,11 +16,10 @@
                  <Node name="HDLLinphone.cs" selected="True" />
                </Node>
              </Node>
              <Node name="Entity" expanded="True" />
              <Node name="UI" expanded="True" />
            </Node>
            <Node name="HDL-ON_Android" expanded="True" />
            <Node name="HDL-ON_iOS" expanded="True" />
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Packages" expanded="True" />
            </Node>
          </Node>
        </State>
      </Pad>

 DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll

Binary files differ

 HDL-ON_Android/Other/JPush/JPushReceiver.cs

@@ -1,5 +1,6 @@

using System;

using Android.App;
using Android.Content;
using CN.Jpush.Android.Api;
using CN.Jpush.Android.Service;
@@ -70,6 +71,7 @@
            {
                HDLCommon.Current.AdjustPushMessage(pushMes);
            });

        }

        /// <summary>

 HDL_ON/Common/HDLCommon.cs

@@ -307,7 +307,6 @@
                        //1.视对讲厂家类型
                        string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
                        if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
                        //
                        ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent);
                        //2.根据可视对讲厂家类型，处理不同的数据
                        if (interphoneTypeEnum == InterphoneType.IMOUVISIAL.ToString())
@@ -337,6 +336,7 @@
                            eSVideoInfo.DeviceName = json["deviceName"].ToString();
                            eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
                            //ShowAlert("狄耐克门口机呼叫");
                            //打开呼叫页面
                            HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo);
                            return;
                        }

 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs

@@ -6,6 +6,7 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
#if __Android__
using Android.App;
using Android.Content;
using Android.Graphics;
using Android.Widget;
@@ -20,6 +21,8 @@
    {
        public HDLLinphone()
        {
            //判断有没有初始化SDK，没初始化过初始化一次
            InitLinphone();
        }

        /// <summary>
@@ -110,12 +113,11 @@
        /// <returns></returns>
        bool CheckmHDLCallVideoInfoIsNullOrEmpty()
        {
            //return false;
            return (mHDLCallVideoInfo == null || string.IsNullOrEmpty(mHDLCallVideoInfo.CallId));
        }

        /// <summary>
        /// 截图成功
        /// 截图成功 暂时废弃
        /// </summary>
        public void ScreenshotSuccessfulAction(byte[] dataBytes)
        {
@@ -168,9 +170,9 @@
            {
                Dictionary<string, object> dic = new Dictionary<string, object>();
                dic.Add("deviceId", mHDLCallVideoInfo.DeviceId);//设备id
                dic.Add("callId", mHDLCallVideoInfo.CallId);
                dic.Add("interphoneType", mHDLCallVideoInfo.InterphoneType);
                dic.Add("homeId", mHDLCallVideoInfo.HomeId);
                dic.Add("callId", mHDLCallVideoInfo.CallId);//当前呼叫id
                dic.Add("interphoneType", mHDLCallVideoInfo.InterphoneType);//可视对讲厂家类型
                dic.Add("homeId", mHDLCallVideoInfo.HomeId);//住宅ID
                var requestJson = HttpUtil.GetSignRequestJson(dic);
                var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_OpenDoorbell, requestJson);

@@ -199,7 +201,6 @@
                    }
#endif


                });


@@ -220,7 +221,7 @@
                Dictionary<string, object> dic = new Dictionary<string, object>();
                dic.Add("callId", mHDLCallVideoInfo.CallId);//呼叫id
                dic.Add("callStatus", callStatusType.ToString());//可用值:MISSED,RECEIVED,REJECT
                dic.Add("interphoneTypeEnum", interphoneType.ToString());//可用值:FLVI,IMOUVISIAL
                dic.Add("interphoneTypeEnum", interphoneType.ToString());
                if (callStatusType == CallStatusType.RECEIVED && callDuration > 0)
                {
                    dic.Add("callDuration", callDuration);//通话时长（秒）
@@ -327,9 +328,11 @@
#if __IOS__
               
#else
            //1.先呼叫设备
            Com.Hdl.Hdllinphonesdk.HDLLinphoneKit.Instance.CallTo(mHDLCallVideoInfo.DeviceSipAccount, true);
            //2.跳转打开监控页面
            var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneMonitorActivity)); ;
            intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);
            intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);//传入设备名称为显示标题
            Shared.Application.Activity.StartActivity(intent);
#endif

@@ -427,6 +430,14 @@
            HDLLinphoneKit.Instance.OnHDLLinphoneCallListener = new HDLLinphoneCallListener(this);
        }

        /// <summary>
        /// 清楚通知栏所有通知
        /// </summary>
        void CancelAllNotification() {
            NotificationManager nMgr = (NotificationManager)Application.Activity.GetSystemService(Context.NotificationService);
            nMgr.CancelAll();
        }

#endif
        #endregion
    }