紧急面板功能

wxr

2022-05-06 8abfe81329d73836f40e6af40915e914a784f664

紧急面板功能

 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

 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>-->

 HDL_ON/DAL/Server/NewApiRes.cs

@@ -1505,7 +1505,7 @@
        /// <summary>
        /// 住宅ID
        /// </summary>
        public string homeId;
        public string homeId ;
        /// <summary>
        /// 附加内容
        /// </summary>

 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()

 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;
                    }


 HDL_ON/UI/UI2/FuntionControlView/1ContorlPage/CacDayHistoryPage.cs

@@ -109,6 +109,7 @@
            //var opString = brokenLine.InitOption();

            //    myEchartsView_Line.ShowWithOption(opString);

#endif
            LoadMothed_GetHistoryData();
        }

 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;
                    }
                }