需要合并

gxc

2019-11-22 9c607e921ca7c379799e4dd88b140265a1d5d5c5

 ZigbeeApp/.vs/GateWay/xs/UserPrefs.xml

@@ -1,36 +1,42 @@
<Properties StartupConfiguration="{28EDE1FF-20EF-476B-8AF8-24A3EEB69F45}|Default">
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.SelectDevice" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Droid PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.ItemProperties.GateWay.Ios automaticSigning="False" PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneSimulatorTarget.F39298B7-E473-472E-A80F-B0125726C55D" />
  <MonoDevelop.Ide.ItemProperties.ShardLib PreferredExecutionTarget="Android.M7BBB18B19152766" />
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/CommonForm/CommonFormResouce.cs">
  <MonoDevelop.Ide.Workbench ActiveDocument="Shared/Phone/Device/Category/Category.cs">
    <Files>
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1773" Column="93" />
      <File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" Line="261" Column="10" />
      <File FileName="Shared/Phone/ZigBee/Device/Scene.cs" Line="155" Column="1" />
      <File FileName="Shared/Phone/UserView/UserHomeView.cs" Line="1736" Column="76" />
      <File FileName="Shared/Phone/Device/CommonForm/SceneMainView.cs" />
      <File FileName="Shared/Common/SceneUI.cs" />
      <File FileName="Shared/Phone/Device/CommonForm/CommonFormResouce.cs" Line="197" Column="30" />
      <File FileName="Shared/Phone/Device/CommonForm/CommonFormResouce.cs" />
      <File FileName="Shared/Phone/Device/Category/Category.cs" Line="1610" Column="10" />
      <File FileName="Shared/Phone/Device/CommonForm/SceneCategoryView.cs" />
    </Files>
    <Pads>
      <Pad Id="ProjectPad">
        <State name="__root__">
          <Node name="GateWay" expanded="True">
            <Node name="DroidLib" expanded="True" />
            <Node name="GateWay.Droid" expanded="True" />
            <Node name="GateWay.Droid" expanded="True">
              <Node name="Assets" expanded="True" />
            </Node>
            <Node name="Shared" expanded="True">
              <Node name="Common" expanded="True" />
              <Node name="Phone" expanded="True">
                <Node name="Device" expanded="True">
                  <Node name="Account" expanded="True" />
                  <Node name="Category" expanded="True" />
                  <Node name="CommonForm" expanded="True">
                    <Node name="CommonFormResouce.cs" selected="True" />
                  <Node name="AC" expanded="True" />
                  <Node name="Category" expanded="True">
                    <Node name="Category.cs" selected="True" />
                  </Node>
                  <Node name="CommonForm" expanded="True" />
                </Node>
                <Node name="UserCenter" expanded="True">
                  <Node name="CommonBase" expanded="True">
                    <Node name="Controls" expanded="True">
                      <Node name="CompoundControls" expanded="True" />
                    </Node>
                  </Node>
                </Node>
                <Node name="UserView" expanded="True" />
                <Node name="ZigBee" expanded="True">
                  <Node name="Common" expanded="True" />
                  <Node name="Device" expanded="True" />
                </Node>
              </Node>
            </Node>
          </Node>