From a40848272e33822f72a7fe0310f079717bf73f23 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 18 十月 2024 16:21:39 +0800
Subject: [PATCH] 修复金茂科技系统，金茂光伏问题
---
HDL-ON_Android/Properties/AndroidManifest.xml | 2
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs | 96 ++++++++++++++++----------------
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs | 49 +++++++++------
HDL_ON/UI/UI1-Login/LoginPage.cs | 27 ++++++--
5 files changed, 99 insertions(+), 77 deletions(-)
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 963074b..cbb316d 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="2.7.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202410151">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.7.1" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202410171">
<uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" />
<uses-permission android:name="android.permission.RECEIVE_SMS" />
<!--绋嬪簭鍙互璇诲彇璁惧澶栭儴瀛樺偍绌洪棿(鍐呯疆SDcard鍜屽缃甋DCard)鐨勬枃浠讹紝鎴戠殑鏂囦欢绛�-->
diff --git a/HDL_ON/UI/UI1-Login/LoginPage.cs b/HDL_ON/UI/UI1-Login/LoginPage.cs
index 42f2ad1..54c5be1 100644
--- a/HDL_ON/UI/UI1-Login/LoginPage.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -307,18 +307,20 @@
//etAccount.Text = "1272061968@qq.com";//涓囩鍩庡競涔嬪厜E鍖�8鏍�206
//etAccount.Text = "marketing@australindo.co.id";
//etAccount.Text = "13922115008";//鍒樻��
- etAccount.Text = "13336018868";
- etAccount.Text = "649362315@qq.com";//钄℃窇濞�
+ //etAccount.Text = "13336018868";
+ //etAccount.Text = "649362315@qq.com";//钄℃窇濞�
//etAccount.Text = "18402017839";
//etAccount.Text = "13414984501";//鍚存檽鑱�
- etAccount.Text = "13682244600";
- etAccount.Text = "pjh@hdlchina.com.cn";
- etAccount.Text = "13580507523";//Test
- etAccount.Text = "18475593023";//Online
+ //etAccount.Text = "13682244600";
+ //etAccount.Text = "pjh@hdlchina.com.cn";
+ //etAccount.Text = "13580507523";//Test
+ //etAccount.Text = "18475593023";//Online
//etAccount.Text = "13960905167";
//etAccount.Text = "iot-en-public@hdlchina.com.cn";
- etAccount.Text = "13160677992";
- etAccount.Text = "support7@hdlautomation.com";
+ //etAccount.Text = "13160677992";
+ //etAccount.Text = "support7@hdlautomation.com";
+ //etAccount.Text = "13106800613";
+ etAccount.Text = "15313316909";
}
else
{
@@ -369,6 +371,15 @@
else if (etAccount.Text == "13160677992") {
etPassword.Text = "123456aa";
}
+ else if(etAccount.Text == "13106800613")
+ {
+ etPassword.Text = "ab123456";
+ }
+ else if (etAccount.Text == "15313316909")
+ {
+ etPassword.Text = "123456";
+ }
+
btnLogin.IsSelected = true;
};
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
index 786666a..13b33bc 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs
@@ -184,59 +184,59 @@
#if DEBUG
- List<string> vs = new List<string>() {
- "1","2","3","4","5","6","7","8","9","10","11","12","13","14"
- };
- tempEchartOption.InitXdataText(vs);
- tempEchartOption.InitYdataText("yData", new List<EnvironmentalSensorHistor>() {
- new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" },
- new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" },
- new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "-11" },
- new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" },
- new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "-41" },
- new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" },
- new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "-31" },
- new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "-23" },
- new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "-11" },
- new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "-21" },
- new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" },
- new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" },
- new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" },
- new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }
- }, "#FF9D54");
- tempEchartOption.yTitle = "娓╁害 (掳)";
- tempEchartOption.xTitle = "";
- var opString = tempEchartOption.InitOption();
- tempEchartsView.ShowWithOption(opString);
+ //List<string> vs = new List<string>() {
+ // "1","2","3","4","5","6","7","8","9","10","11","12","13","14"
+ // };
+ //tempEchartOption.InitXdataText(vs);
+ //tempEchartOption.InitYdataText("yData", new List<EnvironmentalSensorHistor>() {
+ // new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" },
+ // new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" },
+ // new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "-11" },
+ // new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" },
+ // new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "-41" },
+ // new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" },
+ // new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "-31" },
+ // new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "-23" },
+ // new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "-11" },
+ // new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "-21" },
+ // new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" },
+ // new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" },
+ // new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" },
+ // new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }
+ //}, "#FF9D54");
+ //tempEchartOption.yTitle = "娓╁害 (掳)";
+ //tempEchartOption.xTitle = "";
+ //var opString = tempEchartOption.InitOption();
+ //tempEchartsView.ShowWithOption(opString);
- List<string> vs2 = new List<string>() {
- "1","2","3","4","5","6","7","8","9","10","11","12","13","14"
- };
- humiEchartsOption.InitXdataText(vs2);
- humiEchartsOption.InitYdataText("yData", new List<EnvironmentalSensorHistor>() {
- new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" },
- new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" },
- new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "-11" },
- new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" },
- new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "-41" },
- new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" },
- new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "-31" },
- new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "-23" },
- new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "-11" },
- new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "-21" },
- new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" },
- new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" },
- new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" },
- new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }
- }, "#FF9D54");
- humiEchartsOption.yTitle = "婀垮害 (%)";
- humiEchartsOption.xTitle = "";
- var opString2 = humiEchartsOption.InitOption();
+ //List<string> vs2 = new List<string>() {
+ // "1","2","3","4","5","6","7","8","9","10","11","12","13","14"
+ // };
+ //humiEchartsOption.InitXdataText(vs2);
+ //humiEchartsOption.InitYdataText("yData", new List<EnvironmentalSensorHistor>() {
+ // new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" },
+ // new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" },
+ // new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "-11" },
+ // new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" },
+ // new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "-41" },
+ // new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" },
+ // new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "-31" },
+ // new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "-23" },
+ // new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "-11" },
+ // new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "-21" },
+ // new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" },
+ // new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" },
+ // new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" },
+ // new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }
+ //}, "#FF9D54");
+ //humiEchartsOption.yTitle = "婀垮害 (%)";
+ //humiEchartsOption.xTitle = "";
+ //var opString2 = humiEchartsOption.InitOption();
- humiEchartsView.ShowWithOption(opString2);
+ //humiEchartsView.ShowWithOption(opString2);
#endif
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
index fb7b707..c3d9e0b 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs
@@ -592,17 +592,21 @@
Application.RunOnMainThread(() =>
{
pvGeneration_YearValuesButton.Text = totalValues.ToString();
- while (true)
+ if (pvGeneration_YearValuesButton.Width < pvGeneration_YearValuesButton.GetTextWidth())
{
- if (pvGeneration_YearValuesButton.Width < pvGeneration_YearValuesButton.GetTextWidth())
- {
- pvGeneration_YearValuesButton.TextSize--;
- }
- else
- {
- break;
- }
+ pvGeneration_YearValuesButton.TextSize = 12;
}
+ //while (true)
+ //{
+ // if (pvGeneration_YearValuesButton.Width < pvGeneration_YearValuesButton.GetTextWidth())
+ // {
+ // pvGeneration_YearValuesButton.TextSize=12;
+ // }
+ // else
+ // {
+ // break;
+ // }
+ //}
});
}
}
@@ -817,17 +821,22 @@
Application.RunOnMainThread(() =>
{
powerUsage_YearValuesButton.Text = totalValues.ToString();
- while (true)
- {
- if (powerUsage_YearValuesButton.Width < powerUsage_YearValuesButton.GetTextWidth())
- {
- powerUsage_YearValuesButton.TextSize--;
- }
- else
- {
- break;
- }
- }
+ powerUsage_YearValuesButton.TextSize=12;
+ //while (true)
+ //{
+ // if (powerUsage_YearValuesButton.Width < powerUsage_YearValuesButton.GetTextWidth())
+ // {
+ // powerUsage_YearValuesButton.TextSize-=1;
+ // if (powerUsage_YearValuesButton.TextSize <= 10)
+ // {
+ // break;
+ // }
+ // }
+ // else
+ // {
+ // break;
+ // }
+ //}
});
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs
index 7378642..8b5e939 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs
@@ -131,6 +131,7 @@
data:[{1}],
type:'{333}',
smooth:0.6,
+ type: 'line',
symbol:'none',
color:'{2}'}
";
@@ -180,6 +181,7 @@
var YvalueTextItem = @"{name:'{0}',
data:[{1}],
smooth:0.6,
+ type: 'line',
symbol:'none',
color:'{2}CC',
areaStyle: {
--
Gitblit v1.8.0