Merge branch 'WJC' into NewFilePath

wxr

2021-01-27 df7dd3e3f8830eceb615c59099631fc2a744b0ee

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,16 +1,19 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.00008020-000404163432002E" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/MainPage.cs">
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs">
    <Files>
      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs" Line="116" Column="115" />
      <File FileName="HDL_ON/Entity/Function/Function.cs" Line="92" Column="14" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" Line="483" Column="1" />
      <File FileName="HDL_ON/Entity/Function/AC.cs" Line="264" Column="36" />
      <File FileName="HDL-ON_iOS/Info.plist" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPageBLL.cs" Line="216" Column="157" />
      <File FileName="HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs" Line="564" Column="60" />
      <File FileName="HDL_ON/UI/MainPage.cs" Line="255" Column="57" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AddFunction/ThirdPartyBrandListPage.cs" Line="38" Column="61" />
      <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1052" Column="7" />
      <File FileName="HDL_ON/Common/R.cs" Line="8" Column="51" />
      <File FileName="HDL_ON/UI/UI0-Public/Widget/EmptyTipView.cs" Line="26" Column="28" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/AboutOn/FunctionIntroductionPage.cs" Line="70" Column="45" />
      <File FileName="HDL_ON/UI/UI2/1-HomePage/MessageCenterPage.cs" Line="271" Column="31" />
      <File FileName="HDL_ON/UI/MainPage.cs" Line="89" Column="47" />
      <File FileName="HDL_ON/DAL/Server/NewAPI.cs" Line="465" Column="23" />
      <File FileName="HDL_ON/DAL/Server/NewApiRes.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs" Line="264" Column="55" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -21,33 +24,35 @@
              <Node name="DAL" expanded="True">
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Enumerative" expanded="True" />
                <Node name="Function" expanded="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="CSS" expanded="True" />
                <Node name="UI0-Public" expanded="True">
                  <Node name="Widget" expanded="True" />
                </Node>
                <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="3-Intelligence" expanded="True">
                    <Node name="Automation" expanded="True">
                      <Node name="LogicView" expanded="True" />
                    </Node>
                  </Node>
                  <Node name="4-PersonalCenter" expanded="True">
                    <Node name="AboutOn" expanded="True" />
                    <Node name="AddFunction" expanded="True" />
                    <Node name="PersonalCenterPageBLL.cs" selected="True" />
                  </Node>
                  <Node name="FuntionControlView" expanded="True">
                    <Node name="Light" expanded="True" />
                    <Node name="AC" expanded="True" />
                  </Node>
                </Node>
                <Node name="MainPage.cs" selected="True" />
              </Node>
            </Node>
            <Node name="HDL-ON_iOS" expanded="True" />
            <Node name="HDL-ON_iOS" expanded="True">
              <Node name="Resources" expanded="True" />
            </Node>
          </Node>
        </State>
      </Pad>
      <Pad Id="MonoDevelop.Debugger.WatchPad">
        <State>
          <Value>btnLightPower.Tag.ToString()</Value>
          <Value>response.StatusCode</Value>
          <Value>method</Value>
          <Value>btn.Tag.ToString()</Value>
          <Value>item</Value>
          <Value>functionCategory</Value>
        </State>
      </Pad>
    </Pads>
@@ -62,7 +67,13 @@
  <MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.DebuggingService.Breakpoints>
    <BreakpointStore>
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs" line="165" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" line="166" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs" relfile="HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPageBLL.cs" line="167" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/Entity/Function/Function.cs" relfile="HDL_ON/Entity/Function/Function.cs" line="417" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" relfile="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" line="170" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL_ON/UI/BindingResidence/BindingResidencePage.cs" relfile="HDL_ON/UI/BindingResidence/BindingResidencePage.cs" line="124" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/BlueWifi.cs" relfile="HDL-ON_iOS/BlueWifi.cs" line="153" column="1" />
      <Breakpoint file="/Users/kaede/Desktop/HDL_APP_Project/HDL-ON_iOS/BlueWifi.cs" relfile="HDL-ON_iOS/BlueWifi.cs" line="158" column="1" />
    </BreakpointStore>
  </MonoDevelop.Ide.DebuggingService.Breakpoints>
  <MultiItemStartupConfigurations />