From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
HDL_ON/DAL/Server/NewAPI.cs | 6 +++
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 33 ++++++++++++++++
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs | 2
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs | 2
HDL_ON/UI/UI1-Login/LoginPage.cs | 21 +++++-----
HDL_ON/Entity/Function/Sensor.cs | 2
6 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/DAL/Server/NewAPI.cs b/HDL_ON/DAL/Server/NewAPI.cs
index fbbad8b..1f6ae36 100644
--- a/HDL_ON/DAL/Server/NewAPI.cs
+++ b/HDL_ON/DAL/Server/NewAPI.cs
@@ -884,6 +884,12 @@
/// </summary>
public const string API_POST_VideoDevice_UpdateCallStatus = "/home-wisdom/platform/imou/updateCallStatus";
/// <summary>
+ /// 鎷掓帴锛堟寕娈垫墍鏈夊懠鍙級
+ /// </summary>
+ public const string API_POST_VideoDevice_RejectCallIn = "/home-wisdom/platform/imou/updateCallStatus";
+
+
+ /// <summary>
/// 鑾峰彇閫氳瘽璁板綍
/// </summary>
public const string API_POST_FL_GetCallList = "/home-wisdom/platform/imou/listCallRecords";
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index d26ebf5..a7a7453 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -426,9 +426,39 @@
{ IsBackground = false }.Start();
}
+ /// <summary>
+ /// 鎷掓帴锛堟寕娈垫墍鏈夊懠鍙級
+ /// </summary>
+ public void HDLRejectCallIn() {
+
+ if (CheckmHDLCallVideoInfoIsNullOrEmpty()) return;
+
+ new Thread(() =>
+ {
+ Dictionary<string, object> dic = new Dictionary<string, object>();
+ dic.Add("homeId", DB_ResidenceData.Instance.CurrentRegion.id);
+ dic.Add("deviceId", mHDLCallVideoInfo.DeviceId);
+ dic.Add("interphoneType", "HDL");
+ dic.Add("callId", mHDLCallVideoInfo.CallId);//鍛煎彨id
+
+ var requestJson = HttpUtil.GetSignRequestJson(dic);
+ var revertObj = HttpUtil.RequestHttpsPostFroHome(NewAPI.API_POST_VideoDevice_RejectCallIn, requestJson);
+ if (revertObj.Code == StateCode.SUCCESS)
+ {
+
+ }
+ else
+ {
+ Utlis.WriteLine("POST 鏇存柊鐘舵�佸け璐� code: " + revertObj.Code);
+ }
+
+ })
+ { IsBackground = false }.Start();
+ }
+
#endregion
-
+
#region 鈻� -- 璺宠浆鐩戞帶椤甸潰_______________________________
/// <summary>
/// 璺宠浆鐩戞帶椤甸潰
@@ -734,6 +764,7 @@
{
//showToast("鎷掓帴");
hdlLinphone.HDLUpdateCallStatus(CallStatusType.REJECT, InterphoneType.HDL);
+ hdlLinphone.HDLRejectCallIn();
}
/// <summary>
diff --git a/HDL_ON/Entity/Function/Sensor.cs b/HDL_ON/Entity/Function/Sensor.cs
index b86e111..1cf5bab 100644
--- a/HDL_ON/Entity/Function/Sensor.cs
+++ b/HDL_ON/Entity/Function/Sensor.cs
@@ -181,7 +181,7 @@
unit = "掳C";
break;
case SPK.SensorTVOC:
- unit = "PPB";
+ unit = "mg/m鲁";
break;
case SPK.SensorCO2:
unit = "PPM";
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index a89c424..0e921fe 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -521,6 +521,7 @@
PlaceholderText = Language.StringByID(StringId.PlsEntryPassword),
SecureTextEntry = true,
TextAlignment = TextAlignment.CenterLeft,
+
};
passwordView.AddChidren(etPassword);
@@ -1077,17 +1078,17 @@
new FunctionAttributes(){ key = AcstParent_AttrEnum.month_electricity.ToString(),curValue = "999",state = "999"},
new FunctionAttributes(){ key = AcstParent_AttrEnum.total_electricity.ToString(),curValue = "9999",state = "9999"},
new FunctionAttributes(){ key = AcstParent_AttrEnum.active_power.ToString(),curValue = "9999",state = "9999"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
- //new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.co2.ToString(),curValue = "266",state = "266"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.tvoc.ToString(),curValue = "666",state = "666"},
+ new FunctionAttributes(){ key = AcstParent_AttrEnum.pm25.ToString(),curValue = "36",state = "36"},
}
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-1",
+ name = "瀛愭帶-1",
spk = SPK.AcstSub,
sid = "0000001",
attributes = new List<FunctionAttributes>()
@@ -1100,7 +1101,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-2",
+ name = "瀛愭帶-2",
spk = SPK.AcstSub,
sid = "0000002",
attributes = new List<FunctionAttributes>()
@@ -1113,7 +1114,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-3",
+ name = "瀛愭帶-3",
spk = SPK.AcstSub,
sid = "0000003",
attributes = new List<FunctionAttributes>()
@@ -1126,7 +1127,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-4",
+ name = "瀛愭帶-4",
spk = SPK.AcstSub,
sid = "0000004",
attributes = new List<FunctionAttributes>()
@@ -1139,7 +1140,7 @@
});
FunctionList.List.Functions.Add(new Function
{
- name = "娴嬭瘯-绌鸿皟绉戞妧绯荤粺瀛愭帶-5",
+ name = "瀛愭帶-5",
spk = SPK.AcstSub,
sid = "0000005",
attributes = new List<FunctionAttributes>()
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
index a492590..a416394 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
@@ -896,7 +896,7 @@
btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
break;
case SPK.SensorTVOC:
- btnTitle.Text = "TVOC(PPB)";
+ btnTitle.Text = "TVOC(mg/m鲁)";
break;
case SPK.SensorCO2:
btnTitle.Text = "CO2(PPM)";
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
index 9e31a22..07f386f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalPage.cs
@@ -598,7 +598,7 @@
btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
break;
case SPK.SensorTVOC:
- btnTitle.Text = "TVOC(PPB)";
+ btnTitle.Text = "TVOC(mg/m鲁)";
break;
case SPK.SensorCO2:
btnTitle.Text = "CO2(PPM)";
--
Gitblit v1.8.0