From bfc72d34aae172a0ec25c35bee0d6c28db57d0db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 25 四月 2023 15:01:56 +0800
Subject: [PATCH] 自研可视对讲问题修复
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2 +-
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 3 ++-
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 14 ++++++++++----
HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs | 1 +
DLL/Shared.Droid230425.dll | 0
HDL_ON/UI/MainPage.cs | 2 +-
DLL/Shared.Droid.dll | 0
7 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/DLL/Shared.Droid.dll b/DLL/Shared.Droid.dll
index dd23a23..2219ca6 100644
--- a/DLL/Shared.Droid.dll
+++ b/DLL/Shared.Droid.dll
Binary files differ
diff --git a/DLL/Shared.Droid230425.dll b/DLL/Shared.Droid230425.dll
new file mode 100644
index 0000000..dd23a23
--- /dev/null
+++ b/DLL/Shared.Droid230425.dll
Binary files differ
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 193dcef..5a7aae1 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202304221">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.7.2" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202304251">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<!--鍙嬬洘-->
<!--<uses-sdk android:minSdkVersion="8"></uses-sdk>-->
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 13c9e3c..08a8cf6 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -144,7 +144,8 @@
mHDLSipInfo.sipAccount,
mHDLSipInfo.sipPasswd,
mHDLSipInfo.realm,
- "sip:139.159.157.75:47000;transport=udp",
+ mHDLSipInfo.proxy+ ";transport=udp",
+ //"sip:139.159.157.75:47000;transport=udp",
HDLLinphoneKit.InterPhoneTypeHdl
);
}
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 1740a16..639cbe7 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.7.1";
+ public static string VersionString = "1.7.2";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 987ec8e..4f2d2b4 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -289,7 +289,7 @@
deviceId = enviTemp.deviceId,
attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = humiAttr.state, curValue = humiAttr.curValue } },
};
- humiSensorList.Add(newTemp);
+ humiSensorList.Add(newTemp);//020103CF594C3E00051F0001051F// 1650546588519424001
}
var tempAttr = enviTemp.attributes.Find((obj) => obj.key == "temperature");
if (tempAttr != null)
@@ -301,7 +301,7 @@
deviceId = enviTemp.deviceId,
attributes = new List<FunctionAttributes> { new FunctionAttributes { key = "value", state = tempAttr.state, curValue = tempAttr.curValue } },
};
- tempSensorList.Add(newTemp);
+ tempSensorList.Add(newTemp);//020103CF594C3E00051F0001051F
}
}
@@ -359,7 +359,10 @@
foreach (var temp in tempSensorList)
{
double tempValue = 0;
- double.TryParse(temp.GetAttrState("temperature"), out tempValue);
+ if (temp.GetAttribute("temperature") != null)
+ double.TryParse(temp.GetAttrState("temperature"), out tempValue);
+ else
+ double.TryParse(temp.GetAttrState("value"), out tempValue);
if (tempValue > 0)
{
tempTotalValues += tempValue;
@@ -413,7 +416,10 @@
foreach (var humi in humiSensorList)
{
double humiValue = 0;
- double.TryParse(humi.GetAttrState("humidity"), out humiValue);
+ if (humi.GetAttribute("temperature") != null)
+ double.TryParse(humi.GetAttrState("humidity"), out humiValue);
+ else
+ double.TryParse(humi.GetAttrState("value"), out humiValue);
if (humiValue > 0)
{
humiTotalValues += humiValue;
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
index d13882a..57dae9c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Video/VideoMainView.cs
@@ -267,6 +267,7 @@
TextColor = CSS.CSS_Color.TextualColor,
TextAlignment = TextAlignment.Center,
Text = video.deviceName,
+ IsMoreLines = true,
};
fLayout.AddChidren(deviceNameBtn);
--
Gitblit v1.8.0