From 4296d04029fb5dc41f0ab781c5cf6c60b2cc9670 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 04 八月 2023 11:37:20 +0800 Subject: [PATCH] 三相空开控件优化 --- HDL-ON_Android/Properties/AndroidManifest.xml | 2 +- HDL_ON/Entity/Function/AC.cs | 14 +++++++++++++- HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs | 24 ++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml index 0e522a7..e213b08 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.1.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202308031"> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="2.1.0" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202308041"> <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29" /> <uses-permission android:name="android.permission.RECEIVE_SMS" /> <!--鍙嬬洘--> diff --git a/HDL_ON/Entity/Function/AC.cs b/HDL_ON/Entity/Function/AC.cs index 3f9a905..bc31208 100644 --- a/HDL_ON/Entity/Function/AC.cs +++ b/HDL_ON/Entity/Function/AC.cs @@ -11,6 +11,7 @@ /// </summary> public string GetTempUnitString(Function function) { + //var attr = function.GetAttribute(FunctionAttributeKey.TempType) var tt = function.GetAttrState(FunctionAttributeKey.TempType); if (tt == "0") { @@ -18,7 +19,18 @@ } else { - return tt; + if (tt == "C") + { + return "掳C"; + } + else if (tt == "F") + { + return "掳F"; + } + else + { + return tt; + } } } diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs index 17173d8..0fce218 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs @@ -227,6 +227,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); @@ -246,8 +247,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() { @@ -263,8 +267,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() { @@ -280,6 +287,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); @@ -317,6 +325,10 @@ 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 }; @@ -350,6 +362,10 @@ btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1; 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 = ""; @@ -385,6 +401,10 @@ btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1; 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 = ""; @@ -421,6 +441,10 @@ btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1; 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"; -- Gitblit v1.8.0