增加面板地暖SPK；增加安卓金茂热水器，光伏储能切图

wxr

2024-09-02 02ef7fd8315dfa7a5d8d3ddc0d04a3d4625dc0b5

增加面板地暖SPK；增加安卓金茂热水器，光伏储能切图

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/BatteryIconCharg.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/BatteryIconDischarg.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/BatteryIconFault.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/BatteryIconShutdown.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/ElectricityConsumptionBg.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/ElectricityConsumptionIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/ElectricityGenerationBg.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/ElectricityGenerationIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/EnergyStorageStatusBg.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/EsIconCharg.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/EsIconDischarge.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/EsIconFault.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/EsIconShutdown.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/PvBgDischarge.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/PvBgRun.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/PvIconFault.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/PvIconRun.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/PvIconStandby.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/SocialContributionInfoBg_Coal.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/Inverter/SocialContributionInfoIcon_Coal.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/ModeFree_False.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/ModeFree_True.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/Mode_Economic.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/Mode_Economic_On.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/Mode_QuickHeat.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/Mode_QuickHeat_On.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/NextIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/PreIcon.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/SocialContributionInfoBg_1.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/SocialContributionInfoBg_2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/SocialContributionInfoBg_3.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/SocialContributionInfoIcon_1.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/SocialContributionInfoIcon_2.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/SocialContributionInfoIcon_3.png

 HDL-ON_Android/Assets/Phone/FunctionIcon/Acst/WaterHeater/TempBg.png

 HDL-ON_Android/HDL-ON_Android.csproj

@@ -625,6 +625,41 @@
    <AndroidAsset Include="Assets\Phone\LogicIcon\electricaltvhisense.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Icon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\Pm10Bg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_1.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_3.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoBg_2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_QuickHeat.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\NextIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\ModeFree_False.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_Economic.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\PreIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_QuickHeat_On.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\TempBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_3.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\Mode_Economic_On.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\ModeFree_True.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_2.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\WaterHeater\SocialContributionInfoIcon_1.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconDischarge.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvIconFault.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconCharg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconFault.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconDischarg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\SocialContributionInfoIcon_Coal.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvBgDischarge.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvIconStandby.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconShutdown.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityConsumptionBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\SocialContributionInfoBg_Coal.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EnergyStorageStatusBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconShutdown.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityGenerationIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityConsumptionIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\BatteryIconCharg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\ElectricityGenerationBg.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvBgRun.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\PvIconRun.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\Acst\Inverter\EsIconFault.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />

 HDL-ON_Android/Resources/Resource.designer.cs

Diff too large

 HDL_ON/Common/ApiUtlis.cs

@@ -301,7 +301,7 @@
                            {
                                FunctionList.List.ClearDatas();
                                MainPage.Log($"读取设备信息成功");
                                //MainPage.Log($"sid列表获取====\r\n" , deviceResult.Data.ToString());
                                MainPage.Log($"sid列表获取====\r\n" , deviceResult.Data.ToString());
                                var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
                                if (deviceList == null)
                                {

 HDL_ON/Common/FileUtlis.cs

@@ -125,7 +125,7 @@
                fs = new FileStream(Path.Combine(RegionPath, fileName), FileMode.Create, FileAccess.Write);
                fs.Write(bytes, 0, bytes.Length);
                fs.Flush();
                MainPage.Log($"SaveFile:{fileName}");//Path:{RegionPath}
                //MainPage.Log($"SaveFile:{fileName}");//Path:{RegionPath}
                return true;
            }
            catch (Exception ex)

 HDL_ON/DAL/DriverLayer/Control.cs

@@ -1471,7 +1471,7 @@

                                }
                                break;
                            case SPK.HvacFloorHeat:
                            case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                            case SPK.FloorHeatStandard:
                                localFunction.lastState = "";
                                switch (localFunction.GetAttrState(FunctionAttributeKey.Mode))

 HDL_ON/DAL/DriverLayer/Control_Udp.cs

@@ -302,7 +302,7 @@
                            break;
                        case SPK.LightRGB:
                            break;
                        case SPK.HvacFloorHeat:
                        case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                        case SPK.FloorHeatStandard:
                            if (f.status.Find((obj)=>obj.key ==FunctionAttributeKey.Mode) == null)
                            {
@@ -735,7 +735,7 @@
                        0,0,0,0,0,0,0,onoff,mode,fan,temp,sanfan});

                        break;
                    case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
                    case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
                        var fhTemp = new FloorHeating();
                        if (function.Fh_Mode_Temp.Count == 4)
                        {
@@ -960,7 +960,7 @@
                    case SPK.HvacAC:
                        ControlBytesSend(Command.ReadACMode, subnetId, deviceId, new byte[] { function.bus.LoopId });
                        break;
                    case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:
                    case SPK.HvacFloorHeat:case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
                        ControlBytesSend(Command.ReadFloorHeat, subnetId, deviceId, new byte[] { function.bus.LoopId });
                        break;
                    case SPK.HvacFan:

 HDL_ON/Entity/Function/Function.cs

@@ -204,7 +204,7 @@
                    case SPK.HvacFan:
                        iconPath = "electricalfan";
                        break;
                    case SPK.HvacFloorHeat:
                    case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                        iconPath = "floorHeatstandard";
                        break;
                    case SPK.ElectricTuyaFan2:
@@ -1955,6 +1955,10 @@
        /// 地暖
        /// </summary>
        public const string HvacFloorHeat = "hvac.floorHeat";
        /// <summary>
        /// 面板地暖
        /// </summary>
        public const string HvacFloorHeatPanel = "hvac.floorHeat_panel";

        /// <summary>
        /// 地热spk列表
@@ -1964,7 +1968,7 @@
        {
            var spkList = new List<string>();
            spkList.Add(FloorHeatStandard);
            spkList.Add(HvacFloorHeat);
            spkList.Add(HvacFloorHeat); spkList.Add(HvacFloorHeatPanel);
            return spkList;
        }
        #endregion

 HDL_ON/UI/MainPage.cs

@@ -116,7 +116,7 @@
            SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB,
            SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,SPK.CurtainDream,
            SPK.AcIr,SPK.AcStandard,SPK.HvacAC,
            SPK.FloorHeatStandard,SPK.HvacFloorHeat,
            SPK.FloorHeatStandard,SPK.HvacFloorHeat,SPK.HvacFloorHeatPanel,
            SPK.AirFreshStandard,SPK.HvacAirFresh,
            SPK.AirSwitch,
            SPK.PanelSocket,SPK.ElectricSocket,

 HDL_ON/UI/UI0-Public/PublicAssmeblyBLL.cs

@@ -103,7 +103,7 @@
                        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                        break;
                    case SPK.FloorHeatStandard:
                    case SPK.HvacFloorHeat:
                    case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                        var fhView = new FloorHeatingPage(function);
                        MainPage.BasePageView.AddChidren(fhView);
                        fhView.LoadPage(btnCollectionIcon, btnName, btnFromFloor);

 HDL_ON/UI/UI1-Login/LoginPage.cs

@@ -6,7 +6,6 @@
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Security;
using Shared;

namespace HDL_ON.UI.UI1Login
@@ -319,6 +318,7 @@
                    etAccount.Text = "649362315@qq.com";
                    //etAccount.Text = "18402017839";
                    etAccount.Text = "18620993214";
                    etAccount.Text = "13414984501";

                }
                else
@@ -342,7 +342,7 @@
                {
                    etPassword.Text = "hdl1985.";
                }
                else if (etAccount.Text == "13580507523")
                else if (etAccount.Text == "13414984501")
                {
                    etPassword.Text = "a123456";
                }
@@ -1177,20 +1177,7 @@
                    new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
                }
                });
                FunctionList.List.Functions.Add(new Function
                {
                    name = "子控-5",
                    spk = SPK.AcstSub,
                    sid = "0000005",
                    attributes = new List<FunctionAttributes>()
                    {
                        new FunctionAttributes(){ key = FunctionAttributeKey.OnOff ,curValue = "on",state = "on" },
                        new FunctionAttributes(){ key = AcstSub_AttrEnum.set_temp.ToString(),curValue = "26",state = "26"},
                        new FunctionAttributes(){ key = AcstSub_AttrEnum.room_temp.ToString(),curValue = "26",state = "26"},
                        new FunctionAttributes(){ key = AcstSub_AttrEnum.room_humidity.ToString(),curValue = "66",state = "66"},
                    }
                });

                
                FunctionList.List.Functions.Add(new Function
                {
                    name = "子控-5",

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

@@ -104,7 +104,7 @@
                case SPK.AcIr:
                //地热
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
                case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                //新风
                case SPK.AirFreshStandard:
                case SPK.HvacAirFresh:

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

@@ -164,7 +164,7 @@
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                //地热
                                case SPK.HvacFloorHeat:
                                case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                                case SPK.FloorHeatStandard:
                                //新风
                                case SPK.AirFreshStandard:
@@ -1384,7 +1384,7 @@
                                    }
                                    break;
                                case SPK.FloorHeatStandard:
                                case SPK.HvacFloorHeat:
                                case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string set_temp = GetKeyValue("set_temp", dicList);
@@ -2123,7 +2123,7 @@

                    }
                    break;
                case SPK.FloorHeatStandard:
                case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
                case SPK.HvacFloorHeat:
                    {

@@ -2832,7 +2832,7 @@
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                case SPK.FloorHeatStandard:
                                case SPK.FloorHeatStandard:case SPK.HvacFloorHeatPanel:
                                case SPK.HvacFloorHeat:
                                    {
                                        string value = this.GetValue(dicList);

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

@@ -428,7 +428,7 @@
                deviceStrTypeList.Add(Language.StringByID(StringId.AC));
            }
            ///地暖类
            var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard || device.spk == SPK.HvacFloorHeat);
            var floorHeating = deviceList.Find((device) => device.spk == SPK.FloorHeatStandard || device.spk == SPK.HvacFloorHeat || device.spk == SPK.HvacFloorHeatPanel);
            if (floorHeating != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
@@ -564,7 +564,7 @@
            ///地暖类
            else if (deviceType == Language.StringByID(StringId.FloorHeating))
            {
                functionTypeList.Add(SPK.FloorHeatStandard); functionTypeList.Add(SPK.HvacFloorHeat);
                functionTypeList.Add(SPK.FloorHeatStandard); functionTypeList.Add(SPK.HvacFloorHeat); functionTypeList.Add(SPK.HvacFloorHeatPanel);
            }
            ///新风类
            else if (deviceType == Language.StringByID(StringId.AirFresh))
@@ -660,7 +660,7 @@
                functionTypeList.Add(SPK.HvacAC);
                functionTypeList.Add(SPK.AcIr);
                functionTypeList.Add(SPK.FloorHeatStandard);
                functionTypeList.Add(SPK.HvacFloorHeat);
                functionTypeList.Add(SPK.HvacFloorHeat); functionTypeList.Add(SPK.HvacFloorHeatPanel);
                functionTypeList.Add(SPK.AirFreshStandard);
                functionTypeList.Add(SPK.HvacAirFresh);
                functionTypeList.Add(SPK.SensorSmoke);
@@ -734,7 +734,7 @@
                        deviceTypeList.Add(SPK.CurtainTrietex);
                        deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);deviceTypeList.Add(SPK.AcIr);
                        deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
                        deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
                        deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat); deviceTypeList.Add(SPK.HvacFloorHeatPanel);
                        deviceTypeList.Add(SPK.SensorSmoke);
                        deviceTypeList.Add(SPK.SensorWater);
                        deviceTypeList.Add(SPK.SensorGas);
@@ -784,7 +784,7 @@
                        deviceTypeList.Add(SPK.CurtainRoller);
                        deviceTypeList.Add(SPK.CurtainTrietex);
                        deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC); deviceTypeList.Add(SPK.AcIr);
                        deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
                        deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat); deviceTypeList.Add(SPK.HvacFloorHeatPanel);
                        deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
                        deviceTypeList.Add(SPK.AirSwitch);
                        deviceTypeList.Add(SPK.PanelSocket);

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

@@ -562,7 +562,7 @@
                    }
                    break;
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
                case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                    {
                        #region 界面
                        ///开关
@@ -987,7 +987,7 @@
                        case SPK.AcIr:
                        case SPK.AcStandard:
                        case SPK.FloorHeatStandard:
                        case SPK.HvacFloorHeat:
                        case SPK.HvacFloorHeat:case SPK.HvacFloorHeatPanel:
                            {
                                //做了一个特殊处理；
                                bool _bool = false;

 HDL_ON/UI/UI2/FuntionControlView/Acst/AcstParentPage.cs

@@ -467,7 +467,7 @@
            {
                var infoView = new FrameLayout()
                {
                    Y = topView.Bottom,
                    //Y = topView.Bottom,
                    Height = Application.GetRealHeight(104),
                    BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
                };