From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs | 17 +++++++++++++++--
.vs/HDL_APP_Project/xs/UserPrefs.xml | 32 +++++++++++++++++---------------
2 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 1db39a6..02492fd 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,25 +1,22 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
- <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.ED470421-805C-4716-A37A-2F00FD3DF71D" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs">
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs">
<Files>
- <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" />
- <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="66" Column="21" />
- <File FileName="HDL-ON_Android/LeChengVideoActivity.cs" />
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs" Line="90" Column="1" />
+ <File FileName="HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs" Line="222" Column="31" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="536" Column="14" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="1" 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="UI" expanded="True">
- <Node name="UI2" expanded="True" />
+ <Node name="HDL-ON_Android" expanded="True">
+ <Node name="LeChengVideo" expanded="True">
+ <Node name="Form" expanded="True">
+ <Node name="ReverseCallFragment.cs" selected="True" />
+ </Node>
</Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True" />
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="AppDelegate.cs" selected="True" />
</Node>
</Node>
</State>
@@ -31,9 +28,14 @@
<String>Shared.IOS.TBL/Shared.IOS.TBL.csproj</String>
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
+ <String>HDLSceneSiri/HDLSceneSiri.csproj</String>
+ <String>HDLSceneSiriUI/HDLSceneSiriUI.csproj</String>
+ <String>HDLONProSiri/HDLONProSiri.csproj</String>
+ <String>HDLONProSiriUI/HDLONProSiriUI.csproj</String>
+ <String>HDLONSiriKit/HDLONSiriKit.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.HF4A62I77N" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
diff --git a/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs b/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
index 4f0d886..1dca30f 100644
--- a/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
+++ b/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
@@ -31,6 +31,7 @@
private System.Threading.Timer timer = null;
private int Time = 0;
+ private bool isAnswer;//鏄惁宸茬粡鐐瑰嚮鎺ュ惉杩囦簡
private static LeChengVideoActivity CurtActivity;
@@ -202,6 +203,7 @@
if (v.Equals(answerImg))
{
//鎺ユ敹鏉ョ數
+ isAnswer = true;
CurtActivity.StartTalk();
answerLayout.Visibility = ViewStates.Gone;
PostAnswer();
@@ -209,7 +211,18 @@
else if (v.Equals(hangupImg))
{
CurtActivity.StopTalk();
- PostHangup();
+ //2021-11-30 澧炲姞鎷掔粷鍜屾寕鏂搷浣滃鐞�
+ if (isAnswer)
+ {
+ //濡傛灉鎺ュ惉杩囦簡锛屾墽琛屾寕鏂帴鍙�
+ PostHangup();
+ }
+ else
+ {
+ //娌℃帴鍚洿鎺ユ寕鏂紝鎵ц鎷掓帴鎺ュ彛
+ PostReject();
+ }
+
TimeEnd();
Activity.Finish();
}
@@ -265,7 +278,7 @@
{
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("callId", CurtActivity.CallId);//鍛煎彨id
- //d.Add("callStatus", "REJECT");//鍙敤鍊�:MISSED,RECEIVED,REJECT
+ d.Add("callStatus", "RECEIVED");//鍙敤鍊�:MISSED,RECEIVED,REJECT
d.Add("callDuration", Time);//閫氳瘽鏃堕暱锛堢锛�
d.Add("interphoneTypeEnum", "IMOUVISIAL");//鍙敤鍊�:FLVI,IMOUVISIAL
string jsonString = HttpUtil.GetSignRequestJson(d);
--
Gitblit v1.8.0