2020-12-08-002

陈嘉乐

2020-12-08 c988ba6b217e0c619628e6920b06743465c4d3ac

2020-12-08-002

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,12 +1,11 @@
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-001674E61438002E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="857" Column="133" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs" Line="162" Column="97" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/Send.cs" Line="30" Column="13" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/LogicMethod.cs" Line="293" Column="32" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/AddTarget.cs" Line="50" Column="15" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/FunTpye.cs" Line="233" Column="10" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs" Line="438" Column="58" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -21,17 +20,12 @@
              <Node name="UI" expanded="True">
                <Node name="UI0-Public" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="2-Classification" expanded="True" />
                  <Node name="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True">
                      <Node name="AddTarget.cs" selected="True" />
                      <Node name="TargetDeviceFunList.cs" selected="True" />
                    </Node>
                  </Node>
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="Music" expanded="True">
                      <Node name="View" expanded="True" />
                    </Node>
                  </Node>
                  <Node name="FuntionControlView" expanded="True" />
                </Node>
              </Node>
            </Node>
@@ -52,7 +46,7 @@
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>

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

@@ -245,6 +245,7 @@
                dateTypeView.btnLine.Width = Application.GetRealWidth(303);
                dateView.frameLayout.AddChidren(dateTypeView.FLayoutView());
                dateTypeView.btnClick.Tag = i;//标记类型

                switch (i)
                {
                    case 0:

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

@@ -309,7 +309,7 @@

                                        }

                                        if (on_off != "" && on_off == "stop")
                                        if (on_off != "" && on_off == "stop"|| on_off != "" && on_off == "off")
                                        {
                                            targetView.btnState.Text = Language.StringByID(StringId.stop);
                                        }
@@ -331,12 +331,12 @@
                                            {
                                                case "on":
                                                    {
                                                        stateStr = Language.StringByID(StringId.onLogic)+",";
                                                        stateStr = Language.StringByID(StringId.onLogic)+";";
                                                    }
                                                    break;
                                                case "off":
                                                    {
                                                        stateStr = Language.StringByID(StringId.offLogic) + ",";
                                                        stateStr = Language.StringByID(StringId.offLogic) + ";";
                                                    }
                                                    break;
                                               
@@ -346,7 +346,7 @@
                                        if (set_temp != "")
                                        {

                                            stateStr += set_temp + "℃,";
                                            stateStr += set_temp + "℃;";
                                        }

                                        if (mode != "")
@@ -356,22 +356,22 @@
                                            {
                                                case "cool":
                                                    {
                                                        stateStr += Language.StringByID(StringId.coolLogic)+",";
                                                        stateStr += Language.StringByID(StringId.coolLogic)+";";
                                                    }
                                                    break;
                                                case "heat":
                                                    {
                                                        stateStr += Language.StringByID(StringId.heatingLogic) + ",";
                                                        stateStr += Language.StringByID(StringId.heatingLogic) + ";";
                                                    }
                                                    break;
                                                case "auto":
                                                    {
                                                        stateStr += Language.StringByID(StringId.autoLogic) + ",";
                                                        stateStr += Language.StringByID(StringId.autoLogic) + ";";
                                                    }
                                                    break;
                                                case "dry":
                                                    {
                                                        stateStr += Language.StringByID(StringId.dehumidifyLogic) + ",";
                                                        stateStr += Language.StringByID(StringId.dehumidifyLogic) + ";";
                                                    }
                                                    break;
                                            }
@@ -385,22 +385,22 @@
                                            {
                                                case "high":
                                                    {
                                                        stateStr += Language.StringByID(StringId.HighWindSpeed)+",";
                                                        stateStr += Language.StringByID(StringId.HighWindSpeed)+";";
                                                    }
                                                    break;
                                                case "medium":
                                                    {
                                                        stateStr += Language.StringByID(StringId.MiddleWindSpeed) + ",";
                                                        stateStr += Language.StringByID(StringId.MiddleWindSpeed) + ";";
                                                    }
                                                    break;
                                                case "low":
                                                    {
                                                        stateStr += Language.StringByID(StringId.LowWindSpeed) + ",";
                                                        stateStr += Language.StringByID(StringId.LowWindSpeed) + ";";
                                                    }
                                                    break;
                                                case "auto":
                                                    {
                                                        stateStr += Language.StringByID(StringId.Auto) + ",";
                                                        stateStr += Language.StringByID(StringId.Auto) + ";";
                                                    }
                                                    break;
                                            }
@@ -411,7 +411,7 @@
                                            targetView.btnState.Text = Language.StringByID(StringId.offLogic);
                                        }
                                        else {
                                            targetView.btnState.Text = stateStr.TrimEnd(',');
                                            targetView.btnState.Text = stateStr.TrimEnd(';');

                                        }

@@ -428,12 +428,12 @@
                                            {
                                                case "on":
                                                    {
                                                        stateStr = Language.StringByID(StringId.onLogic) + ",";
                                                        stateStr = Language.StringByID(StringId.onLogic) + ";";
                                                    }
                                                    break;
                                                case "off":
                                                    {
                                                        stateStr = Language.StringByID(StringId.offLogic) + ",";
                                                        stateStr = Language.StringByID(StringId.offLogic) + ";";
                                                    }
                                                    break;

@@ -442,7 +442,7 @@
                                        if (set_temp != "")
                                        {

                                            stateStr += set_temp + "℃,";
                                            stateStr += set_temp + "℃;";
                                        }
                                        if (mode != "")
                                        {
@@ -451,28 +451,28 @@
                                            {
                                                case "day":
                                                    {
                                                        stateStr += Language.StringByID(StringId.dayMode)+",";
                                                        stateStr += Language.StringByID(StringId.dayMode)+";";
                                                    }
                                                    break;
                                                case "night":
                                                    {
                                                        stateStr += Language.StringByID(StringId.nightMode) + ",";
                                                        stateStr += Language.StringByID(StringId.nightMode) + ";";
                                                    }
                                                    break;

                                                case "away":
                                                    {
                                                        stateStr += Language.StringByID(StringId.leaveMode) + ",";
                                                        stateStr += Language.StringByID(StringId.leaveMode) + ";";
                                                    }
                                                    break;
                                                case "normal":
                                                    {
                                                        stateStr += Language.StringByID(StringId.ordinaryMode) + ",";
                                                        stateStr += Language.StringByID(StringId.ordinaryMode) + ";";
                                                    }
                                                    break;
                                                case "timer":
                                                    {
                                                        stateStr += Language.StringByID(StringId.timeMode) + ",";
                                                        stateStr += Language.StringByID(StringId.timeMode) + ";";
                                                    }
                                                    break;
                                            }
@@ -482,22 +482,22 @@
                                            {
                                                case "cool":
                                                    {
                                                        stateStr += Language.StringByID(StringId.coolLogic) + ",";
                                                        stateStr += Language.StringByID(StringId.coolLogic) + ";";
                                                    }
                                                    break;
                                                case "heat":
                                                    {
                                                        stateStr += Language.StringByID(StringId.heatingLogic) + ",";
                                                        stateStr += Language.StringByID(StringId.heatingLogic) + ";";
                                                    }
                                                    break;
                                                case "auto":
                                                    {
                                                        stateStr += Language.StringByID(StringId.autoLogic) + ",";
                                                        stateStr += Language.StringByID(StringId.autoLogic) + ";";
                                                    }
                                                    break;
                                                case "dry":
                                                    {
                                                        stateStr += Language.StringByID(StringId.dehumidifyLogic) + ",";
                                                        stateStr += Language.StringByID(StringId.dehumidifyLogic) + ";";
                                                    }
                                                    break;
                                            }
@@ -509,7 +509,7 @@
                                        }
                                        else
                                        {
                                            targetView.btnState.Text = stateStr.TrimEnd(',');
                                            targetView.btnState.Text = stateStr.TrimEnd(';');

                                        }
                                    }

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

@@ -316,7 +316,7 @@
                deviceStrTypeList.Add(Language.StringByID(StringId.AC));
            }
            var floorHeating = deviceList.Find((device) => device.functionType == FunctionType.FloorHeating);
            if (ac != null)
            if (floorHeating != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.FloorHeating));
            }