wxr
2023-08-03 8465d2e7af612a505cbf65dc50bd507ee4abd316
ios echats图表问题修复
3个文件已修改
59 ■■■■ 已修改文件
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs
@@ -446,7 +446,7 @@
        {
            try
            {
                return Utlis.UnixToDateTimeWithFormatMS(time, "yyyy-MM-dd HH:mm");
                return Utlis.UnixToDateTimeWithFormatMS(time, "yyyy.MM.dd HH:mm");
            }
            catch (Exception ex)
            {
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
@@ -93,6 +93,7 @@
                BackgroundColor = 0x1F5C62FE,
                BorderColor = CSS_Color.MainColor,
                BorderWidth = 2,
                Radius = 1,
            };
            showDataTypeView.AddChidren(btnShowHistroyData_Day);
            btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
@@ -112,8 +113,11 @@
                IsSelected = false,
                BorderWidth = 1,
                BorderColor = CSS_Color.PromptingColor1,
                Radius = 1,
            };
            showDataTypeView.AddChidren(btnShowHistroyData_Month);
            btnShowHistroyData_Month.BorderWidth = 1;
            btnShowHistroyData_Month.BorderColor = CSS_Color.PromptingColor1;
            var btnShowHistroyData_Year = new Button()
            {
@@ -129,8 +133,11 @@
                IsSelected = false,
                BorderWidth = 1,
                BorderColor = CSS_Color.PromptingColor1,
                Radius = 1,
            };
            showDataTypeView.AddChidren(btnShowHistroyData_Year);
            btnShowHistroyData_Year.BorderWidth = 1;
            btnShowHistroyData_Year.BorderColor = CSS_Color.PromptingColor1;
            var btnShowHistroyData_Total = new Button()
            {
@@ -146,6 +153,7 @@
                IsSelected = false,
                BorderWidth = 1,
                BorderColor = CSS_Color.PromptingColor1,
                Radius = 1,
            };
            showDataTypeView.AddChidren(btnShowHistroyData_Total);
            btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
@@ -157,8 +165,6 @@
                {
                    return;
                }
                curQueryType = "total";
                (sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
                (sender as Button).BackgroundColor = 0x1F5C62FE;
                (sender as Button).BorderColor = CSS_Color.MainColor;
@@ -183,7 +189,11 @@
                btnShowHistroyData_Day.BackgroundColor = 0x00000000;
                btnShowHistroyData_Day.SelectedBackgroundColor = 0x00000000;
#if __IOS__
                btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
                btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
#endif
            };
            btnShowHistroyData_Day.MouseUpEventHandler = (sender, e) =>
@@ -216,6 +226,10 @@
                btnShowHistroyData_Total.BackgroundColor = 0x00000000;
                btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
#if __IOS__
                btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
                btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
#endif
                curQueryType = "hour";
                brokenLine.YvalueText = "";
                LoadMothed_GetHistoryData();
@@ -251,6 +265,10 @@
                btnShowHistroyData_Total.BackgroundColor = 0x00000000;
                btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
#if __IOS__
                btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
                btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
#endif
                curQueryType = "month";
                brokenLine.YvalueText = "";
                LoadMothed_GetHistoryData();
@@ -262,7 +280,6 @@
                {
                    return;
                }
                (sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
                (sender as Button).BackgroundColor = 0x1F5C62FE;
                (sender as Button).BorderColor = CSS_Color.MainColor;
@@ -287,6 +304,10 @@
                btnShowHistroyData_Total.BackgroundColor = 0x00000000;
                btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
#if __IOS__
                btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
                btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
#endif
                curQueryType = "year_month";
                brokenLine.YvalueText = "";
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EchartsOption_BrokenLine.cs
@@ -224,7 +224,11 @@
#if __IOS__
        public string optionString = @"{
                 tooltip: {
                    trigger: 'axis'
                    trigger: 'axis',
                    textStyle: {
                            fontSize: 30
                        },
                    padding:40,
                    },
                    grid: {
                         top: '10%',
@@ -234,6 +238,9 @@
                    },
                    xAxis: {
                        name: '{10}',
                        nameTextStyle: {
                                fontSize: 30
                            },
                        type: 'category',
                        boundaryGap: false,
                        data: [{0}],
@@ -243,6 +250,10 @@
                    },
                    yAxis: {
                        name: '{20}',
                        nameGap:30,
                        nameTextStyle: {
                                fontSize: 30
                            },
                        type: 'value',
                        axisLabel : {
                            fontSize:30,
@@ -284,7 +295,11 @@
#if __IOS__
        public string optionString2 = @"{
                 tooltip: {
                    trigger: 'axis'
                    trigger: 'axis',
                    padding:40,
                    textStyle: {
                            fontSize: 30
                        },
                    },
                    grid: {
                         top: '10%',
@@ -294,6 +309,9 @@
                    },
                    xAxis: {
                        name: '{10}',
                        nameTextStyle: {
                                fontSize: 30
                            },
                        type: 'category',
                        boundaryGap: {11},
                        data: [{0}],
@@ -302,7 +320,11 @@
                        },
                    },
                    yAxis: {
                        name: '{20}',
                        name: '{20}',
                        nameGap:30,
                        nameTextStyle: {
                                fontSize: 30
                            },
                        type: 'value',
                        axisLabel : {
                            fontSize:30,