自研可视对讲问题修复

wxr

2023-04-25 bfc72d34aae172a0ec25c35bee0d6c28db57d0db

自研可视对讲问题修复

 DLL/Shared.Droid.dll

Binary files differ

 DLL/Shared.Droid230425.dll

Binary files differ

 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>-->

 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
                   );
            }

 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>

 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;

 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);