Merge branch 'Dev-Branch' into dev--wxr

wxr

2022-09-27 0ee75b88cfe03e46289de0de96e8ed4580c797d3

 HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs

@@ -117,7 +117,12 @@

            this.currentHDLSipInfo = mHDLSipInfo;

            if (mHDLSipInfo == null) return;
            if (mHDLSipInfo == null) {
                //new alert
                return;
            }



#if __IOS__
            //Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().Login("1003", "123456", "192.168.31.194:5060");
@@ -126,14 +131,12 @@
#else
            if (mInterphoneType == InterphoneType.FREEVIEW.ToString())
            {
                //HDLLinphoneKit.Instance.SetAccountAndLogin(
                //    mHDLSipInfo.sipAccount,
                //    mHDLSipInfo.sipPasswd,
                //    mHDLSipInfo.realm,
                //    HDLLinphoneKit.InterPhoneTypeFreeview
                //    );

                HDLLinphoneKit.Instance.SetAccountAndLogin("A583853817423247", "763548", "139.159.157.75:46000", HDLLinphoneKit.InterPhoneTypeFreeview);
                HDLLinphoneKit.Instance.SetAccountAndLogin(
                    mHDLSipInfo.sipAccount,
                    mHDLSipInfo.sipPasswd,
                    "139.159.157.75:46000",
                    HDLLinphoneKit.InterPhoneTypeFreeview
                    );
            }
            else
            {
@@ -144,7 +147,6 @@
                   HDLLinphoneKit.InterPhoneTypeHdl
                   );
            }
            // "A583853817423247","763548","139.159.157.75:46000",
#endif
        }

@@ -236,6 +238,10 @@
                        SetAccountAndLogin(mHDLSipInfo, mHDLCallVideoInfo.InterphoneType);
                        Utlis.WriteLine("CALL 获取SIP账号成功：" + mHDLSipInfo.sipAccount);
                    });
                }
                else
                {
                    new Alert("", $"获取Sip账号信息失败.", "确定").Show();
                }
            }
            catch { }
@@ -488,6 +494,15 @@
#if __IOS__
                //自研可视对讲
                HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName,mHDLCallVideoInfo.DeviceSipAccount);
#else
                var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneReverseCallActivity));  
                if (mHDLCallVideoInfo != null)
                {
                    //intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);
                    intent.PutExtra("lpTitleName", mHDLCallVideoInfo.DeviceName);
                    intent.PutExtra("lpSipAccount", mHDLCallVideoInfo.DeviceSipAccount);
                }
                Shared.Application.Activity.StartActivity(intent);
#endif
            }
            else {
@@ -537,7 +552,8 @@
            var intent = new Intent(Shared.Application.Activity, typeof(Com.Hdl.Hdllinphonesdk.Activity.HDLLinphoneIntercomActivity));
            if (mHDLCallVideoInfo != null)
            {
                intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);
                //intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.DeviceName);
                intent.PutExtra(HDLLinphoneKit.KeyTitleName, mHDLCallVideoInfo.CallId);
            }
            Shared.Application.Activity.StartActivity(intent);
#endif