2021-03-10 1.合并

JLChen

2021-03-10 4a83749337096aae6dd5ec4f44f16653fbc7268a

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,3 +1,4 @@
<<<<<<< HEAD
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs">
@@ -6,6 +7,22 @@
      <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="470" Column="50" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="2126" Column="47" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/AddThirdPartyBrandListpage.cs" Line="116" Column="35" />
=======
<Properties StartupConfiguration="{09712674-2A38-407B-B1E2-560B2C352F9A}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Common/HDLCommon.cs">
    <Files>
      <File FileName="HDL_ON/DAL/DriverLayer/Control_Udp.cs" />
      <File FileName="HDL_ON/DAL/DriverLayer/A_Protocol_Common.cs" />
      <File FileName="HDL_ON/DAL/Mqtt/MqttClient.cs" />
      <File FileName="HDL-ON_iOS/Info.plist" />
      <File FileName="HDL_ON/UI/MainPage.cs" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaWaterValvePage.cs" Line="124" Column="46" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="616" Column="84" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Electrical/TuyaAirCleanerPage.cs" Line="331" Column="15" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="758" Column="56" />
      <File FileName="HDL_ON/Common/HDLCommon.cs" Line="500" Column="21" />
>>>>>>> origin/temp-wxr
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -13,6 +30,7 @@
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True">
<<<<<<< HEAD
                <Node name="Utlis" expanded="True" />
              </Node>
              <Node name="DAL" expanded="True">
@@ -34,6 +52,13 @@
            </Node>
            <Node name="ys" expanded="True">
              <Node name="Transforms" expanded="True" />
=======
                <Node name="HDLCommon.cs" selected="True" />
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True" />
>>>>>>> origin/temp-wxr
            </Node>
          </Node>
        </State>
@@ -46,8 +71,13 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
<<<<<<< HEAD
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.4b65c4650918" />
=======
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Release|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
>>>>>>> origin/temp-wxr
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>