From c8a39835019ed4210c3010eb273cafbd9c7c7c21 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 27 八月 2021 10:04:38 +0800
Subject: [PATCH] 2021-08-27 1.更新iOSLinphoneDLL库
---
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 3 ++-
.vs/HDL_APP_Project/xs/UserPrefs.xml | 29 +++++++++++++++++++++--------
2 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 9467882..e8a881d 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,18 +1,27 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_iOS/AppDelegate.cs">
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1" Column="1" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" Line="595" Column="108" />
+ <File FileName="HDL_ON/Common/ApiUtlis.cs" Line="267" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL_ON" expanded="True" />
- <Node name="HDL-ON_Android" expanded="True" />
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="References" expanded="True" />
- <Node name="AppDelegate.cs" selected="True" />
+ <Node name="HDL_ON" expanded="True">
+ <Node name="Common" expanded="True" />
+ <Node name="DAL" expanded="True">
+ <Node name="DriverLayer" expanded="True" />
+ <Node name="Mqtt" expanded="True" />
+ <Node name="Server" expanded="True" />
+ <Node name="ThirdPartySdk" expanded="True">
+ <Node name="HDLLinphone.cs" selected="True" />
+ </Node>
+ </Node>
+ <Node name="Entity" expanded="True" />
+ <Node name="UI" expanded="True" />
</Node>
</Node>
</State>
@@ -29,7 +38,11 @@
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.364c4b3158493098" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
- <BreakpointStore />
+ <BreakpointStore>
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/Common/ApiUtlis.cs" relfile="HDL_ON/Common/ApiUtlis.cs" line="290" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/Common/ApiUtlis.cs" relfile="HDL_ON/Common/ApiUtlis.cs" line="267" column="1" />
+ <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/ON+/HDL_ON/Common/ApiUtlis.cs" relfile="HDL_ON/Common/ApiUtlis.cs" line="287" column="1" />
+ </BreakpointStore>
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MultiItemStartupConfigurations />
</Properties>
\ No newline at end of file
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 7dfa239..68cec3c 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -553,6 +553,7 @@
{
GoToHDLLinphoneIntercomActivity();
});
+
}
}
@@ -592,7 +593,7 @@
/// <returns></returns>
public bool CheckIncomingCallThreadIsNull()
{
- return checkIncomingCallThread == null;
+ return checkIncomingCallThread == null || checkIncomingCallThread.ThreadState != ThreadState.Running;
}
#endregion
--
Gitblit v1.8.0