Merge branch 'CJL'

wxr

2020-11-20 f4b178e64fd43262872fe9d443aa9da6048ceaac

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,41 +1,50 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.5DD5CF9F-1E54-4DAB-BB36-8F8F2D8D6BF0" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/DAL/DriverLayer/Control.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="647" Column="64" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs" Line="211" Column="41" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/SizeClass.cs" Line="73" Column="25" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/View/MusicView.cs" Line="80" Column="37" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs" Line="879" Column="24" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicModel.cs" Line="46" Column="1" />
      <File FileName="HDL_ON/DAL/Net/MqttCommon.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/DAL/FileUtils.cs" />
      <File FileName="HDL_ON/Entity/ResponseEntity/RegionInfoRes.cs" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control_TcpClient.cs" />
      <File FileName="HDL_ON/Common/A_Protocol_Common.cs" Line="78" Column="26" />
      <File FileName="HDL_ON/Entity/Enumerative/Command.cs" />
      <File FileName="HDL_ON/DAL/DriverLayer/Control.cs" Line="105" Column="24" />
      <File FileName="HDL_ON/DAL/DriverLayer/Packet.cs" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/SearchDevice/SearchDevicePage.cs" />
      <File FileName="HDL_ON/DAL/DriverLayer/UdpSocket.cs" Line="129" Column="53" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="HDL_APP_Project" expanded="True">
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
                <Node name="DriverLayer" expanded="True">
                  <Node name="Control.cs" selected="True" />
                </Node>
                <Node name="Net" expanded="True" />
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Device" expanded="True" />
                <Node name="Enumerative" expanded="True" />
                <Node name="ResponseEntity" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI0-Public" expanded="True" />
                <Node name="UI1-Login" expanded="True" />
                <Node name="UI2" expanded="True">
                  <Node name="1-HomePage" expanded="True" />
                  <Node name="2-Classification" expanded="True" />
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="AC" expanded="True" />
                    <Node name="EnvironmentalScience" expanded="True" />
                    <Node name="Music" expanded="True">
                      <Node name="View" expanded="True" />
                      <Node name="A31MusicModel.cs" selected="True" />
                    </Node>
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="SearchDevice" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
            <Node name="HDL-ON_Android" expanded="True">
              <Node name="References" expanded="True" />
              <Node name="Properties" expanded="True" />
              <Node name="Resources" expanded="True">
                <Node name="values" expanded="True" />
              </Node>
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
          </Node>
        </State>
@@ -48,13 +57,16 @@
    <String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
    <String>Shared.IOS/Shared.IOS.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android AndroidDesignerPreferredTheme="AppTheme" AndroidDesignerPreferredDevice="Nexus 4" PreferredExecutionTarget="Android.364c4b3158493098" />
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Packet.cs" relfile="HDL_ON/DriverLayer/Packet.cs" line="60" column="1" />
      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" relfile="HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs" line="198" column="1" />
      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/AccountBindInfo/AccountBindInfoPage.cs" line="138" column="1" />
      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/ResidentialManage/RoomEditPageBLL.cs" line="76" column="1" />
      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/UnlockSetting/AppUnlockSettingsPageBLL.cs" line="56" column="1" />
      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/UI/UI0-Public/AppUnlockPage.cs" relfile="HDL_ON/UI/UI0-Public/AppUnlockPage.cs" line="18" column="1" />
      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DAL/Net/Mqtt_A_Protocol.cs" relfile="HDL_ON/DAL/Net/Mqtt_A_Protocol.cs" line="104" column="1" />
      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DAL/Net/Mqtt_A_Protocol.cs" relfile="HDL_ON/DAL/Net/Mqtt_A_Protocol.cs" line="163" column="1" />
      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DriverLayer/Control_TcpServer.cs" relfile="HDL_ON/DriverLayer/Control_TcpServer.cs" line="197" column="1" />
      <Breakpoint file="/Users/nigel/Desktop/HDL_APP_Project/HDL_ON/DAL/DriverLayer/Packet.cs" relfile="HDL_ON/DAL/DriverLayer/Packet.cs" line="578" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />