紧急面板备份

wxr

2022-04-18 680385e9f4ddc6f9153d3b1a7b50d54878bc0884

紧急面板备份

 HDL-ON_Android/Assets/Language.ini

@@ -524,7 +524,7 @@
536=Temperature statistics
537=Humidity statistics
538=Uint

539=Smart panel

1000=Room Humidity
1001=V-chip
@@ -1671,6 +1671,7 @@
536=温度统计图
537=湿度统计图
538=单位
539=智能面板
 
1000=室内湿度
1001=童锁
@@ -2799,6 +2800,7 @@
536=Temperature statistics
537=Humidity statistics
538=Uint
539=Smart panel



@@ -3951,6 +3953,7 @@
536=Temperature statistics
537=Humidity statistics
538=Uint
539=Smart panel


1000=Humedad de ambiente

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Icon/sensorhelp.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -236,6 +236,9 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_blue.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_white.png" />
    <AndroidAsset Include="Assets\Phone\Public\dialogBg2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\sensorhelp.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_blue.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_white.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />

 HDL-ON_iOS/HDL-ON_iOS.csproj

@@ -1396,6 +1396,9 @@
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_blue.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\hvaccac_white.png" />
      <BundleResource Include="Resources\Phone\Public\dialogBg2.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\sensorhelp.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_blue.png" />
      <BundleResource Include="Resources\Phone\FunctionIcon\Icon\HomeIcon\sensorhelp_white.png" />
    </ItemGroup>
    <ItemGroup>
      <ITunesArtwork Include="iTunesArtwork" />

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_blue.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/HomeIcon/sensorhelp_white.png

 HDL-ON_iOS/Resources/Phone/FunctionIcon/Icon/sensorhelp.png

 HDL_ON/Common/R.cs

@@ -4,7 +4,10 @@
{
    public static class StringId
    {

        /// <summary>
        /// 智能面板
        /// </summary>
        public const int SmartPanel = 539;
        /// <summary>
        /// 单位
        /// </summary>

 HDL_ON/Entity/Function/Function.cs

@@ -1442,6 +1442,10 @@
        public const string SenesorMegahealth = "sensor.megahealth";
        public const string SenesorMegahealth2 = "sensor.megahealth.zg";
        /// <summary>
        /// 紧急呼叫
        /// </summary>
        public const string SensorHelp = "sensor.help";
        /// <summary>
        /// 安防传感器spk列表
        /// </summary>
        /// <returns></returns>
@@ -1461,6 +1465,18 @@
            spkList.Add(SensorDryContact2);
            spkList.Add(SenesorMegahealth);
            spkList.Add(SenesorMegahealth2);
            spkList.Add(SensorHelp);
            return spkList;
        }

        /// <summary>
        /// 面板spk列表
        /// </summary>
        /// <returns></returns>
        public static List<string> PanelSpkList()
        {
            var spkList = new List<string>();
            spkList.Add(SensorHelp);
            return spkList;
        }
        #endregion

 HDL_ON/Entity/FunctionList.cs

@@ -87,6 +87,15 @@
            var spkList = SPK.AirFreshSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
        /// <summary>
        /// 面板列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetPanelList()
        {
            var spkList = SPK.PanelSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

        /// <summary>
        /// 能源列表

 HDL_ON/HDL_ON.projitems

@@ -492,6 +492,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\CacWeekHistoryPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\CacDayHistoryPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\1ContorlPage\CacHistoryChoosePage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\3-Intelligence\Automation\LogicMethod.cs" />

  </ItemGroup>

  <ItemGroup>

    <Folder Include="$(MSBuildThisFileDirectory)Entity\Device\" />


 HDL_ON/UI/MainPage.cs

@@ -133,6 +133,7 @@
          _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
          _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
          _RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
          _RoomNotSupportFunctionList.AddRange(SPK.PanelSpkList());
        }
        return _RoomNotSupportFunctionList;
      }

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -626,6 +626,18 @@
            //        new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
            //    },
            //});
            FunctionList.List.Functions.Add(new Function()
            {
                spk = SPK.SensorHelp,
                name = "测试紧急求助按钮",
                attributes = new List<FunctionAttributes>()
                {
                    new FunctionAttributes(){ key = "status",curValue= "on",state = "on" },
                    new FunctionAttributes(){ key = "battery_value",curValue= "2000",state = "2000" },
                    new FunctionAttributes(){ key = "battery_percentage",curValue= "80",state = "80" },
                    new FunctionAttributes(){ key = "battery_state",curValue= "high",state = "high" },
                },
            });

            //FunctionList.List.Functions.Add(new Function()
            //{
@@ -649,23 +661,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/ClassificationPage.cs

@@ -709,6 +709,8 @@
#endif
                        break;
                    case ShowFunction.Panel:


                        break;
                    case ShowFunction.SecurityMonitoring:
                        if (!MainPage.NoLoginMode)

 HDL_ON/UI/UI2/2-Classification/FunctionControlZone.cs

@@ -76,7 +76,8 @@
            {//音乐没有开关按钮
                MusicFragment();
            }
            else if (SPK.EvironmentSensorList().Contains(function.spk) || SPK.ArmSensorSpkList().Contains(function.spk)) //传感器没有开关按钮)
            else if (SPK.EvironmentSensorList().Contains(function.spk) || SPK.ArmSensorSpkList().Contains(function.spk)
                || SPK.PanelSpkList().Contains(function.spk)) //传感器没有开关按钮)
            {
                var powerLowTipAttr = function.attributes.Find((obj) => obj.key == FunctionAttributeKey.BatteryState);
                if (powerLowTipAttr != null)

 HDL_ON/UI/UI2/2-Classification/FunctionPage.cs

@@ -157,6 +157,10 @@
            {
                functionList.AddRange(FunctionList.List.GetAirFreshList());
            }
            else if (titleId == StringId.SmartPanel)
            {
                functionList.AddRange(FunctionList.List.GetPanelList());
            }
            functionList.OrderByDescending(o => o.controlCounter).ToList();

            ShowFunctionRow(functionList);

 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs