JLChen
2021-08-09 1f956c79026e8dc20bb16afbbf550385679e2e59
2021-08-09 1.Linphone测试
1个文件已添加
6个文件已修改
7356 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Resources/Resource.designer.cs 7220 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/HDL-ON_iOS.csproj 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs 101 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/HDL_ON.projitems 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/MainPage.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,11 +1,24 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench>
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/MainPage.cs">
    <Files>
      <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" Line="36" Column="33" />
      <File FileName="HDL_ON/UI/MainPage.cs" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL-ON_iOS" expanded="True" selected="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="DAL" expanded="True" />
              <Node name="UI" expanded="True">
                <Node name="MainPage.cs" selected="True" />
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="References" expanded="True" />
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="References" expanded="True" />
            </Node>
          </Node>
@@ -19,7 +32,7 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
HDL-ON_Android/HDL-ON_Android.csproj
@@ -157,6 +157,9 @@
    <Reference Include="ys">
      <HintPath>..\DLL\EZvizMonitor\ys.dll</HintPath>
    </Reference>
    <Reference Include="Shared.Droid.HDLLinphone">
      <HintPath>..\..\Linphone\HDLLinphoneSDK_Android\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone\bin\Release\Shared.Droid.HDLLinphone.dll</HintPath>
    </Reference>
  </ItemGroup>
  <ItemGroup>
    <Compile Include="MainActivity.cs" />
HDL-ON_Android/Resources/Resource.designer.cs
Diff too large
HDL-ON_iOS/HDL-ON_iOS.csproj
@@ -101,6 +101,9 @@
        <Reference Include="Shared.IOS.LCVideoOnSDK">
          <HintPath>..\DLL\LC\IOS\Shared.IOS.LCVideoOnSDK.dll</HintPath>
        </Reference>
        <Reference Include="Shared.Droid.HDLLinphone">
          <HintPath>..\..\Linphone\HDLLinphoneSDK_Android\Shared.Droid.HDLLinphone\Shared.Droid.HDLLinphone\bin\Release\Shared.Droid.HDLLinphone.dll</HintPath>
        </Reference>
    </ItemGroup>
    <ItemGroup>
      <PackageReference Include="Newtonsoft.Json">
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
New file
@@ -0,0 +1,101 @@
using System;
#if __Android__
using Android.Graphics;
using Android.Widget;
using Com.Hdl.Hdllinphonesdk;
#endif
namespace Shared
{
    public class HDLLinphone
    {
        public HDLLinphone()
        {
        }
        /// <summary>
        ///
        /// </summary>
        private static HDLLinphone m_Current = null;
        /// <summary>
        ///
        /// </summary>
        public static HDLLinphone Current
        {
            get
            {
                if (m_Current == null)
                {
                    m_Current = new HDLLinphone();
                }
                return m_Current;
            }
        }
        public void InitLinphone()
        {
#if __IOS__
#else
            Com.Hdl.Hdllinphonesdk.Core.EasyLinphone.InitLinphone(Application.Activity);
            setOnHDLLinphoneCallListener();
            Com.Hdl.Hdllinphonesdk.Core.EasyLinphone.SetAccountAndLogin("3333", "85521566", "116.62.26.215:5060");
#endif
        }
#if __Android__
                class HDLLinphoneCallListener : Java.Lang.Object, Com.Hdl.Hdllinphonesdk.Callback.IOnHDLLinphoneCallListener
                {
                    //showToast
                    void showToast(string text)
                    {
                        Toast.MakeText(Application.Activity, text, ToastLength.Short).Show();
                    }
                    public void OnAnswerAction()
                    {
                        showToast("接听");
                    }
                    public void OnHangUpAction(int callDuration)
                    {
                        showToast("挂断 通话时长:" + callDuration);
                    }
                    public void OnRejectCallAction()
                    {
                        showToast("拒接");
                    }
                    public void OnScreenshotSuccessfulAction(Bitmap p0)
                    {
                        showToast("截图");
                    }
                    public void OnUnlockAction()
                    {
                        HDLLinphoneKit.Instance.OnOpenSuccess();
                    }
                }
                void setOnHDLLinphoneCallListener()
                {
                    HDLLinphoneKit.Instance.OnHDLLinphoneCallListener = new HDLLinphoneCallListener();
                }
#endif
    }
}
HDL_ON/HDL_ON.projitems
@@ -467,6 +467,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\PirDevice\View\Buttons.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\SenesorEnvironment\SensorEnvironmentManagerPage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\4-PersonalCenter\AddDevice\SenesorEnvironment\AddSensorEnvironmentPage.cs" />
    <Compile Include="$(MSBuildThisFileDirectory)DAL\ThirdPartySdk\HDLLinphone.cs" />
  </ItemGroup>
  <ItemGroup>
    <Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />
HDL_ON/UI/MainPage.cs
@@ -159,7 +159,8 @@
                        //})
                        //{ IsBackground = true }.Start();
                        Common.ApiUtlis.Ins.DownloadData();
                        //初始化Linphone
                        HDLLinphone.Current.InitLinphone();
                        GoUserPage(false,true);
                    }
                }
@@ -195,7 +196,7 @@
        /// <param name="isFirstOpen">如果是第一次启动 检测校验密码</param>
        /// <param name="pageShowEvent">主页显示之后触发的事件(没有住宅的话,则不会触发)</param>
        public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
        {
        {
            BaseView.RemoveAll();
            #region 后退事件
            BasePageView = new PageLayout();