Merge branch 'master' into wjc

陈嘉乐

2021-03-03 375751523a86b9ba0b3a27f04c3d3c4f19538690

 Crabtree/.vs/SmartHome/xs/UserPrefs.xml

@@ -1,11 +1,9 @@
<Properties StartupConfiguration="{1D83BF28-BA88-4152-BA41-D7EFE90A5437}|Default">
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.Android_Accelerated_Oreo" />
<Properties StartupConfiguration="{9D9EF20B-6E65-4A65-92BF-567EBF1E1443}|Default">
  <MonoDevelop.Ide.ItemProperties.ON.Droid PreferredExecutionTarget="Android.822QECU5228FU" />
  <MonoDevelop.Ide.Workbench ActiveDocument="SmartHome/HDL/Common/HDLLinkUtlis.cs">
    <Files>
      <File FileName="SmartHome/HDL/Common/HDLLinkUtlis.cs" Line="1724" Column="21" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/Schedule/HelpView.cs" Line="220" Column="100" />
      <File FileName="SmartHome/HDL/Operation/UserConfig.cs" Line="162" Column="34" />
      <File FileName="SmartHome/HDL/Operation/UserInfo.cs" Line="1" Column="1" />
      <File FileName="SmartHome/UI/SimpleControl/Phone/User/UserSettingView.cs" Line="324" Column="46" />
      <File FileName="SmartHome/HDL/Common/HDLLinkUtlis.cs" Line="125" Column="21" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -19,31 +17,17 @@
                  <Node name="HttpUtil" expanded="True" />
                  <Node name="HDLLinkUtlis.cs" selected="True" />
                </Node>
                <Node name="Operation" expanded="True">
                  <Node name="Device" expanded="True" />
                </Node>
              </Node>
              <Node name="IO" expanded="True" />
              <Node name="UI" expanded="True">
                <Node name="SimpleControl" expanded="True">
                  <Node name="Phone" expanded="True">
                    <Node name="Alexa" expanded="True" />
                    <Node name="Guide" expanded="True" />
                    <Node name="Register" expanded="True" />
                    <Node name="Room" expanded="True" />
                    <Node name="Schedule" expanded="True" />
                    <Node name="Sensor" expanded="True" />
                    <Node name="User" expanded="True" />
                    <Node name="Warning" expanded="True" />
                  </Node>
                </Node>
              </Node>
            </Node>
          </Node>
        </State>
      </Pad>
      <Pad Id="MonoDevelop.Debugger.WatchPad">
        <State />
      </Pad>
    </Pads>
  </MonoDevelop.Ide.Workbench>
@@ -56,12 +40,9 @@
    <String>DroidService/DroidService.csproj</String>
  </DisabledProjects>
  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
  <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008030-00014C392121802E" />
  <MonoDevelop.Ide.ItemProperties.ON.Ios PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.08FD445C-3EE8-4ED2-BF28-B42ADD0DA92C" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOnNew/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs" relfile="SmartHome/HDL/Common/HttpUtil/HttpUtil.cs" line="219" column="1" />
      <Breakpoint file="/Users/jlchen/JLChen/ProjectsCode/HDLGit/CrabtreeOnNew/Crabtree/SmartHome/HDL/Common/HttpUtil/HttpUtil.cs" relfile="SmartHome/HDL/Common/HttpUtil/HttpUtil.cs" line="215" column="1" />
    </BreakpointStore>
    <BreakpointStore />
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />
</Properties>