From 0ab9960587ececb5d3e13e7fb062e2f67308f9e7 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:33:03 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs | 1 +
.vs/HDL_APP_Project/xs/UserPrefs.xml | 19 +++++++++----------
HDL_ON/UI/MainPage.cs | 2 +-
HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 02492fd..48d6242 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,21 +1,20 @@
锘�<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs">
+ <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/MainPage.cs">
<Files>
<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" />
+ <File FileName="HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs" />
+ <File FileName="HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs" Line="47" Column="15" />
+ <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" />
+ <File FileName="HDL_ON/UI/MainPage.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" 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 name="HDL_ON" expanded="True">
+ <Node name="UI" expanded="True">
+ <Node name="MainPage.cs" selected="True" />
</Node>
</Node>
</Node>
@@ -35,7 +34,7 @@
<String>HDLONSiriKit/HDLONSiriKit.csproj</String>
</DisabledProjects>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
- <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.HF4A62I77N" />
+ <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<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 1dca30f..68073cc 100644
--- a/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
+++ b/HDL-ON_Android/LeChengVideo/Form/ReverseCallFragment.cs
@@ -304,6 +304,7 @@
Dictionary<string, object> d = new Dictionary<string, object>();
d.Add("callId", CurtActivity.CallId);//鍛煎彨id
d.Add("callStatus", "REJECT");//鍙敤鍊�:MISSED,RECEIVED,REJECT
+ d.Add("interphoneTypeEnum", "IMOUVISIAL");//鍙敤鍊�:FLVI,IMOUVISIAL
string jsonString = HttpUtil.GetSignRequestJson(d);
string url = "/home-wisdom/platform/imou/updateCallStatus";
diff --git a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
index a8e6062..0965c39 100644
--- a/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/ESOnVideo.cs
@@ -62,7 +62,7 @@
/// <returns></returns>
bool GetIsChinaMainland()
{
- //寮哄埗浣跨敤鍥藉唴
+ ////寮哄埗浣跨敤鍥藉唴
//return true;
return OnAppConfig.Instance.RequestHttpsHost.Contains("china");//濡傛灉鍩熷悕鍖呭惈china锛屽垯SDK 浣跨敤涔愭鐨勪腑鍥藉ぇ闄�(姝ｅ紡)鍩熷悕
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index d9d7471..02083bb 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -25,7 +25,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.2.1014";
+ public static string VersionString = "1.2.1130";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
--
Gitblit v1.8.0