From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
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