From 8abfe81329d73836f40e6af40915e914a784f664 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期五, 06 五月 2022 21:49:32 +0800 Subject: [PATCH] 紧急面板功能 --- HDL-ON_Android/Properties/AndroidManifest.xml | 2 +- HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 34 +++++++++++++++++----------------- HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs | 2 +- HDL_ON/DAL/Server/NewApiRes.cs | 2 +- HDL-ON_Android/Assets/Language.ini | 6 +++++- HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs | 1 + HDL_ON/UI/UI2/FuntionControlView/Panel/PanelHelpPage.cs | 2 +- 7 files changed, 27 insertions(+), 22 deletions(-) diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini index cb5c44d..996bad9 100644 --- a/HDL-ON_Android/Assets/Language.ini +++ b/HDL-ON_Android/Assets/Language.ini @@ -526,6 +526,7 @@ 538=Uint 539=Smart panel 540=In Alarm +541=Monitoring 1000=Room Humidity @@ -1679,6 +1680,7 @@ 538=鍗曚綅 539=鏅鸿兘闈㈡澘 540=鎶ヨ涓� +541=鐩戞帶涓� 1000=瀹ゅ唴婀垮害 1001=绔ラ攣 @@ -3963,7 +3965,9 @@ 537=Humidity statistics 538=Uint 539=Smart panel -540=En alarma +540=En alarma +541=Monitoring + 1000=Humedad de ambiente diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml index 936829a..7331c9d 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="1.5.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202205051"> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.5.6" package="com.hdl.onpro" xmlns:tools="http://schemas.android.com/tools" android:versionCode="202205061"> <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="30" /> <!--鍙嬬洘--> <!--<uses-sdk android:minSdkVersion="8"></uses-sdk>--> diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs index c92e4d1..f005989 100644 --- a/HDL_ON/DAL/Server/NewApiRes.cs +++ b/HDL_ON/DAL/Server/NewApiRes.cs @@ -1505,7 +1505,7 @@ /// <summary> /// 浣忓畢ID /// </summary> - public string homeId; + public string homeId ; /// <summary> /// 闄勫姞鍐呭 /// </summary> diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs index 2552139..b6c3677 100644 --- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs +++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs @@ -698,23 +698,23 @@ }); - //FunctionList.List.Functions.Add(new Function() - //{ - // spk = SPK.HvacCac, - // name = "娴嬭瘯閲戣寕娓╂帶", - // attributes = new List<FunctionAttributes>() - // { - // new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" }, - // new FunctionAttributes(){ key = "mode",curValue= "cool",state = "cool" ,value = new List<string>(){ "cool", "heat" } }, - // new FunctionAttributes(){ key = "set_temp",curValue= "22",state = "22" ,value = new List<string>(){},min = 0,max = 30 }, - // //new FunctionAttributes(){ key = "set_temp_step",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low", "auto", "stop" } }, - // new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 }, - // new FunctionAttributes(){ key = "room_temp",curValue= "26",state = "26" ,value = new List<string>(){ },min = 0,max = 100 }, - // new FunctionAttributes(){ key = "dew_point_temp",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 }, - // new FunctionAttributes(){ key = "room_humidity",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 1000 }, - // //new FunctionAttributes(){ key = "tvoc",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 }, - // }, - //}); + FunctionList.List.Functions.Add(new Function() + { + spk = SPK.HvacCac, + name = "娴嬭瘯閲戣寕娓╂帶", + attributes = new List<FunctionAttributes>() + { + new FunctionAttributes(){ key = "on_off",curValue= "on",state = "on" }, + new FunctionAttributes(){ key = "mode",curValue= "cool",state = "cool" ,value = new List<string>(){ "cool", "heat" } }, + new FunctionAttributes(){ key = "set_temp",curValue= "22",state = "22" ,value = new List<string>(){},min = 0,max = 30 }, + //new FunctionAttributes(){ key = "set_temp_step",curValue= "low",state = "low" ,value = new List<string>(){ "high", "medium", "low", "auto", "stop" } }, + new FunctionAttributes(){ key = "humidity",curValue= "0",state = "0" ,value = new List<string>(){ },min = 0,max = 100 }, + new FunctionAttributes(){ key = "room_temp",curValue= "26",state = "26" ,value = new List<string>(){ },min = 0,max = 100 }, + new FunctionAttributes(){ key = "dew_point_temp",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 }, + new FunctionAttributes(){ key = "room_humidity",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 1000 }, + //new FunctionAttributes(){ key = "tvoc",curValue= "20",state = "20" ,value = new List<string>(){ },min = 0,max = 100 }, + }, + }); //FunctionList.List.Functions.Add(new Function() diff --git a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs index fe290a9..92fea27 100644 --- a/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs +++ b/HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs @@ -140,7 +140,7 @@ } else { - btnAlarmStatus.TextID = StringId.Normal; + btnAlarmStatus.TextID = StringId.zhengchang; btnAlarmStatus.TextColor = CSS_Color.MainColor; } diff --git a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs index 71f5518..4553294 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs @@ -109,6 +109,7 @@ //var opString = brokenLine.InitOption(); // myEchartsView_Line.ShowWithOption(opString); + #endif LoadMothed_GetHistoryData(); } diff --git a/HDL_ON/UI/UI2/FuntionControlView/Panel/PanelHelpPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Panel/PanelHelpPage.cs index 687b07a..1350a45 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Panel/PanelHelpPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Panel/PanelHelpPage.cs @@ -126,7 +126,7 @@ else { btnIcon.IsSelected = false; - btnSuctionView.TextID = StringId.SensorNormalState; + btnSuctionView.TextID = StringId.Monitoring; btnSuctionView.IsSelected = false; } } -- Gitblit v1.8.0