From 8bdaa9078e89f2db165c27de9d4d87cb0a05e18b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 09 二月 2023 14:44:00 +0800
Subject: [PATCH] 修复全视通安卓版本无法监控的问题
---
/dev/null | 0
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 4 +++-
HDL_ON/Entity/Function/Function.cs | 4 ++++
HDL_ON/DAL/DriverLayer/Control.cs | 4 +---
DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll | 0
HDL_ON/UI/UI1-Login/LoginPage.cs | 4 ++--
HDL_ON/Entity/FunctionList.cs | 12 ++----------
7 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/DLL/Linphone/Android/Shared.Droid.HDLLinphone-old-wxr.dll b/DLL/Linphone/Android/Shared.Droid.HDLLinphone-old-wxr.dll
deleted file mode 100644
index 38d92a5..0000000
--- a/DLL/Linphone/Android/Shared.Droid.HDLLinphone-old-wxr.dll
+++ /dev/null
Binary files differ
diff --git a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
index 14ed0c8..fb85f28 100644
--- a/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
+++ b/DLL/Linphone/Android/Shared.Droid.HDLLinphone.dll
Binary files differ
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index 1cdcd34..87e6d3e 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -1494,14 +1494,12 @@
//wjc
break;
case SPK.Inverter:
- MainPage.Log("閫嗗彉鍣ㄦ暟鎹洿鏂�");
+ case SPK.InverterRst:
var status = new Dictionary<string, object> { ["method"] = "status", ["data"] = temp.objects };
- MainPage.Log("閫嗗彉鍣ㄦ暟鎹洿鏂�1");
Application.RunOnMainThread(() =>
{
Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')");
});
- MainPage.Log("閫嗗彉鍣ㄦ暟鎹洿鏂�2");
break;
}
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index e652116..d7f4105 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -134,7 +134,8 @@
HDLLinphoneKit.Instance.SetAccountAndLogin(
mHDLSipInfo.sipAccount,
mHDLSipInfo.sipPasswd,
- "139.159.157.75:46000",
+ "139.159.157.75:47000",//mHDLSipInfo.realm,
+ "sip:139.159.157.75:47000;transport=udp",
HDLLinphoneKit.InterPhoneTypeFreeview
);
}
@@ -144,6 +145,7 @@
mHDLSipInfo.sipAccount,
mHDLSipInfo.sipPasswd,
mHDLSipInfo.realm,
+ "sip:139.159.157.75:47000;transport=udp",
HDLLinphoneKit.InterPhoneTypeHdl
);
}
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 63f24fe..87f8863 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -1546,6 +1546,10 @@
/// </summary>
public const string Inverter = "energy.inverter";
/// <summary>
+ /// 涓夌浉閫嗗彉鍣�
+ /// </summary>
+ public const string InverterRst = "energy.inverter_rst";
+ /// <summary>
/// 鑳芥簮妯″潡
/// </summary>
public const string EnergyStandard = "energy.standard";
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 6060289..f21e670 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -175,17 +175,9 @@
/// </summary>
public List<Function> InverterList()
{
- //get
- //{
- // return _inverterList;
- //}
- //set
- //{
- // _inverterList = value;
- //}
- return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
+ return Functions.FindAll((obj) => obj.spk == SPK.Inverter || obj.spk == SPK.InverterRst);
}
-#region 瀹剁數鍒楄〃 electricals
+ #region 瀹剁數鍒楄〃 electricals
/// <summary>
/// 瀹剁數鍒楄〃
/// </summary>
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 1d703fb..9caa7b2 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -230,7 +230,7 @@
//etAccount.Text = "18244942707";
//etAccount.Text = "12345678904";
//etAccount.Text = "13418062953";
- etAccount.Text = "13138682659";
+ etAccount.Text = "13138683659";
}
else
{
@@ -277,7 +277,7 @@
}else if(etAccount.Text == "18688414428")
{
etPassword.Text = "HDL1985000";
- }else if (etAccount.Text == "13138682659")
+ }else if (etAccount.Text == "13138683659")
{
etPassword.Text = "wsad123321";
}
--
Gitblit v1.8.0