wxr
2023-03-29 1820fafc5b982120f87c8045e832d85bbbb62f6b
自动化
7个文件已修改
24866 ■■■■■ 已修改文件
HDL-ON_Android/Resources/Resource.designer.cs 24839 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_iOS/Info.plist 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI1-Login/LoginPage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Resources/Resource.designer.cs
Diff too large
HDL-ON_iOS/Info.plist
@@ -100,11 +100,9 @@
    <key>UIStatusBarStyle</key>
    <string>UIStatusBarStyleLightContent</string>
    <key>CFBundleShortVersionString</key>
    <string>1.6.602303211</string>
    <string>1.6.602303293</string>
    <key>CFBundleVersion</key>
    <string>1.6.603211</string>
    <key>NSLocationWhenInUseUsageDescription</key>
    <string>Use geographic location to provide services such as weather</string>
    <string>1.6.603293</string>
    <key>NSAppleMusicUsageDescription</key>
    <string>App needs to access your music library to connect to an external player to play music.</string>
    <key>NSLocationAlwaysUsageDescription</key>
@@ -140,6 +138,10 @@
    <array>
        <string>HDLRunSceneIntent</string>
    </array>
    <key>NSContactsUsageDescription</key>
    <string>LC Video will be use</string>
    <key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
    <string>LC Video will be use</string>
    <key>Custom Property</key>
    <string></string>
</dict>
HDL_ON/UI/UI1-Login/LoginPage.cs
@@ -235,6 +235,7 @@
                    //etAccount.Text = "18100573477";
                    //etAccount.Text = "18321091245";
                    //etAccount.Text = "13751916353";
                    etAccount.Text = "a18903011008@163.com";
                }
                else
                {
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -89,6 +89,7 @@
                //空调
                case SPK.AcStandard:
                case SPK.HvacAC:
                case SPK.AcIr:
                //地热
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -162,6 +162,7 @@
                                //空调
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                //地热
                                case SPK.HvacFloorHeat:
                                case SPK.FloorHeatStandard:
@@ -1081,6 +1082,7 @@
                                    break;
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string set_temp = GetKeyValue("set_temp", dicList);
@@ -1662,6 +1664,7 @@
                    break;
                case SPK.AcStandard:
                case SPK.HvacAC:
                case SPK.AcIr:
                    {
                        foreach (var dic in dicList)
                        {
@@ -2327,6 +2330,7 @@
                                    break;
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.AcIr:
                                case SPK.FloorHeatStandard:
                                case SPK.HvacFloorHeat:
                                    {
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs
@@ -422,6 +422,7 @@
                    }
                    break;
                case SPK.AcStandard:
                case SPK.AcIr:
                case SPK.HvacAC:
                    {
                        strPath = "LogicIcon/airconditionerlogic.png";
@@ -518,7 +519,7 @@
                deviceStrTypeList.Add(Language.StringByID(StringId.Curtain));
            }
            ///空调类
            var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.HvacAC);
            var ac = deviceList.Find((device) => device.spk == SPK.AcStandard || device.spk == SPK.AcIr || device.spk == SPK.HvacAC);
            if (ac != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.AC));
@@ -645,6 +646,7 @@
                functionTypeList.Add(SPK.AcStandard);
                functionTypeList.Add(SPK.HvacAC);
                functionTypeList.Add(SPK.HvacCac);
                functionTypeList.Add(SPK.AcIr);
            }
            ///地暖类
            else if (deviceType == Language.StringByID(StringId.FloorHeating))
@@ -734,6 +736,7 @@
                functionTypeList.Add(SPK.CurtainTrietex);
                functionTypeList.Add(SPK.AcStandard);
                functionTypeList.Add(SPK.HvacAC);
                functionTypeList.Add(SPK.AcIr);
                functionTypeList.Add(SPK.FloorHeatStandard);
                functionTypeList.Add(SPK.HvacFloorHeat);
                functionTypeList.Add(SPK.AirFreshStandard);
@@ -799,7 +802,7 @@
                        deviceTypeList.Add(SPK.CurtainSwitch);
                        deviceTypeList.Add(SPK.CurtainRoller);
                        deviceTypeList.Add(SPK.CurtainTrietex);
                        deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
                        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.SensorSmoke);
@@ -845,7 +848,7 @@
                        deviceTypeList.Add(SPK.CurtainSwitch);
                        deviceTypeList.Add(SPK.CurtainRoller);
                        deviceTypeList.Add(SPK.CurtainTrietex);
                        deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC);
                        deviceTypeList.Add(SPK.AcStandard); deviceTypeList.Add(SPK.HvacAC); deviceTypeList.Add(SPK.AcIr);
                        deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
                        deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
                        deviceTypeList.Add(SPK.AirSwitch);
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -297,6 +297,7 @@
                    break;
                case SPK.AcStandard:
                case SPK.HvacAC:
                case SPK.AcIr:
                    {
                        #region 界面
                        ///开关
@@ -699,6 +700,7 @@
                                break;
                            }
                        case SPK.HvacAC:
                        case SPK.AcIr:
                        case SPK.AcStandard:
                        case SPK.FloorHeatStandard:
                        case SPK.HvacFloorHeat: