wxr
2024-10-18 a40848272e33822f72a7fe0310f079717bf73f23
修复金茂科技系统,金茂光伏问题
5个文件已修改
176 ■■■■■ 已修改文件
HDL-ON_Android/Properties/AndroidManifest.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPage.cs 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubHistoryPage.cs 96 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoPage.cs 49 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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和外置SDCard)的文件,我的文件等-->
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;
            };
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
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;
                                //    }
                                //}
                            });
                        }
                    }
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: {