xm
2021-12-01 6d73bf6e816570291865674bef8bce8972e4de3f
2021-12-01-01
4个文件已添加
6个文件已修改
100 ■■■■ 已修改文件
.vs/HDL_APP_Project/xs/UserPrefs.xml 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/LogicIcon/inputlocation.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/LogicIcon/selectTheautomAtion.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/LogicIcon/selectTheautomLocation.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/Assets/Phone/LogicIcon/selectTheautomSecurity.png 补丁 | 查看 | 原始文档 | blame | 历史
HDL-ON_Android/HDL-ON_Android.csproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -3,12 +3,38 @@
    <MonoDevelop.MacDev.AppleDevelopmentTeam />
  </MonoDevelop.Ide.ItemProperties.SiriIntentUI>
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget" />
  <MonoDevelop.Ide.Workbench>
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs" Line="86" Column="38" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs" Line="552" Column="79" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs" Line="395" Column="1" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TimeTpye.cs" Line="100" Column="47" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/SpeciaTime.cs" Line="89" Column="41" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs" Line="137" Column="65" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs" Line="615" Column="29" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL-ON_Android" selected="True" />
            <Node name="HDL_ON" expanded="True">
              <Node name="UI" expanded="True">
                <Node name="UI2" expanded="True">
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True">
                      <Node name="PublicInterface.cs" selected="True" />
                    </Node>
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="Assets" expanded="True">
                <Node name="Phone" expanded="True">
                  <Node name="LogicIcon" expanded="True" />
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
HDL-ON_Android/Assets/Phone/LogicIcon/inputlocation.png
HDL-ON_Android/Assets/Phone/LogicIcon/selectTheautomAtion.png
HDL-ON_Android/Assets/Phone/LogicIcon/selectTheautomLocation.png
HDL-ON_Android/Assets/Phone/LogicIcon/selectTheautomSecurity.png
HDL-ON_Android/HDL-ON_Android.csproj
@@ -211,6 +211,10 @@
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnCloseIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\btnInfoIcon.png" />
    <AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\HumiOnIcon.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\inputlocation.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheautomAtion.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheautomLocation.png" />
    <AndroidAsset Include="Assets\Phone\LogicIcon\selectTheautomSecurity.png" />
  </ItemGroup>
  <ItemGroup>
    <AndroidResource Include="Resources\values\colors.xml" />
HDL_ON/UI/UI2/3-Intelligence/Automation/AddInputType.cs
@@ -70,7 +70,7 @@
      LogicView.SelectTypeView likiadaodaView = new LogicView.SelectTypeView();
      likiadaodaView.frameLayout.Y = shiwaiView.frameLayout.Bottom;
      likiadaodaView.btnText.TextID = StringId.likiadaoda;
      likiadaodaView.btnIcon.UnSelectedImagePath = "LogicIcon/location.png";
      likiadaodaView.btnIcon.UnSelectedImagePath = "LogicIcon/inputlocation.png";
      if (MainView.IsGatewayType)
      {
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -549,7 +549,7 @@
                        break;
                    case "8":
                        {
                            inputView.btnIcon.UnSelectedImagePath = "LogicIcon/location.png";
              inputView.btnIcon.UnSelectedImagePath = "LogicIcon/inputlocation.png";
                            foreach (var dic in dicList)
                            {
                                string strtext = "";
@@ -1118,7 +1118,8 @@
                                    }
                                    break;
                                case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string set_temp = GetKeyValue("set_temp", dicList);
@@ -1593,7 +1594,8 @@
                    }
                    break;
                case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
        case SPK.FloorHeatStandard:
        case SPK.HvacFloorHeat:
                    {
                        foreach (var dic in dicList)
@@ -2040,7 +2042,8 @@
                                    break;
                                case SPK.AcStandard:
                                case SPK.HvacAC:
                                case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
                case SPK.FloorHeatStandard:
                case SPK.HvacFloorHeat:
                                    {
                                        foreach (var dic in dicList)
                                        {
@@ -2255,7 +2258,8 @@
            }
            return strtext;
        }
        private void SensorView(FrameLayout thisView, Function device,string key, int indexVulae) {
    private void SensorView(FrameLayout thisView, Function device, string key, int indexVulae)
    {
            //这个设备比较特殊
            ConditionDeviceFunList conditionDeviceFunList = new ConditionDeviceFunList();
            ///当前的索引值数据对象
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -130,7 +130,8 @@
            {
                Logic.currlogic = new Logic();
            }
            else {
      else
      {
                Logic.currlogic = logic;
            }
            if (IsGatewayType)
@@ -394,6 +395,12 @@
                        }
                        break;
          case 8:
            {
              iconInt = 5;
            }
            break;
                }
                if (!iconIntValue.Contains(iconInt))
@@ -504,6 +511,12 @@
                            strIcon = "LogicIcon/selectTheScene.png";
                        }
                        break;
          case 5:
            {
              strIcon = "LogicIcon/selectTheautomLocation.png";
            }
            break;
                    case 11:
                        {
                            //分割条件和目标的图标
@@ -524,7 +537,7 @@
                    case 14:
                        {
                            strIcon = "LogicIcon/security.png";
              strIcon = "LogicIcon/selectTheautomSecurity.png";
                        }
                        break;
                    case 15:
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -682,11 +682,12 @@
                case "time":
                    {
                        list = new List<string> {
                   "30 s",
                  // "30 s",
                   "1 min",
                   "2 min",
                   "3 min",
                   "5 min",
                   "10 min",
                      };
                    }
                    break;
@@ -952,23 +953,33 @@
                case "pm25":
                    {
                        switch (strValue) {
                            case "(0,35]": {
            switch (strValue)
            {
              case "(0,35]":
                {
                                    text = Language.StringByID(StringId.pmyou);
                                }
                                break;
                            case "(35,75]": {
              case "(35,75]":
                {
                                    text = Language.StringByID(StringId.pmliang);
                                } break;
                            case "(75,115]": {
                }
                break;
              case "(75,115]":
                {
                                    text = Language.StringByID(StringId.pmqingdu);
                                } break;
                            case "(115,150]": {
                }
                break;
              case "(115,150]":
                {
                                    text = Language.StringByID(StringId.pmzhongdu);
                                } break;
                            case "(151,100000]": {
                }
                break;
              case "(151,100000]":
                {
                                    text = Language.StringByID(StringId.pmzhongduwuran);
                                } break;
                }
                break;
                        }
                      
                    }