20201210

wei

2020-12-11 9cc3de82145b405a76d7219084d3fa181f0eca4d

 .vs/HDL_APP_Project/xs/UserPrefs.xml

@@ -1,4 +1,5 @@
<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<<<<<<< Updated upstream
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.94B44E9C-E1BC-4BF7-812E-FC71E9B623B2" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs">
    <Files>
@@ -9,6 +10,18 @@
      <File FileName="HDL_ON/Entity/UserInfo.cs" Line="97" Column="25" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/SceneEditPage.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/UI/UI2/3-Intelligence/Scene/NewSceneMenuListPage.cs" Line="1" Column="1" />
=======
  <MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
  <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/Entity/UserInfo.cs">
    <Files>
      <File FileName="HDL_ON/UI/MainPage.cs" Line="137" Column="10" />
      <File FileName="HDL_ON/Entity/DB_ResidenceData.cs" Line="148" Column="23" />
      <File FileName="HDL_ON/Common/HDLCommon.cs" Line="281" Column="7" />
      <File FileName="HDL_ON/Common/DB_AccountList.cs" Line="22" Column="44" />
      <File FileName="HDL-ON_iOS/AppDelegate.cs" Line="104" Column="33" />
      <File FileName="HDL_ON/DAL/Server/HttpServerRequest.cs" Line="1" Column="1" />
      <File FileName="HDL_ON/Entity/UserInfo.cs" Line="90" Column="19" />
>>>>>>> Stashed changes
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
@@ -17,11 +30,15 @@
            <Node name="HDL_ON" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="DAL" expanded="True">
<<<<<<< Updated upstream
                <Node name="DriverLayer" expanded="True" />
=======
>>>>>>> Stashed changes
                <Node name="Server" expanded="True" />
              </Node>
              <Node name="Entity" expanded="True">
                <Node name="Function" expanded="True" />
                <Node name="UserInfo.cs" selected="True" />
              </Node>
              <Node name="UI" expanded="True">
                <Node name="UI0-Public" expanded="True" />