合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/Shared/Shared.projitems

@@ -32,12 +32,12 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectCurtainSetting.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectDevice.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectDeviceByRoom.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectedDelayTime.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectedDimmableLightSetting.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectedScene.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectImgByLocal.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectLightSetting.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectRoomList.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\SelectDelayTime.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\SelectFloor.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\ACLeftIconButtonRowLayout.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\BackButton.cs" />

@@ -62,6 +62,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RowLayoutDeleteButton.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RowLayoutEditButton.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SceneMainView.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SceneTargetRow.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectedStatuButton.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectFunctionView.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectTime.cs" />

@@ -136,11 +137,15 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\RemotelyUnlock.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\SubAccountManagementPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\TemporaryPassword.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\TempPasswordTimePage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\TimeSettignPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UndistributeDoorlockUserPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UnLockMethod.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UserDoorLockPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UserManagement.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\GatewayProductInfoForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGatewayListForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGatewayRebindForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\MemberNotEsixtForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckNewPhoneForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckOldPhoneForm.cs" />

@@ -227,7 +232,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayCoordinatorInfoForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayFirmwareInfoForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayHistoryFirmwareVersionForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\GatewayInfoAddForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayLinuxInfoForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayListForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayVirtualDriveInfoForm.cs" />

@@ -296,10 +300,10 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\SectorsSettionMenuForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\SensorDeviceSettionListForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\UserPasswordListForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\ConfigureNewSharedListRoomForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\ConfigureNewSharedMainForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\SearchConfigureSharedListRoomForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\SearchConfigureSharedMainForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\AddNewSharedListRoomForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\AddNewSharedContentForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\LookSharedListRoomForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\LookSharedContentForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckNewEmailForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckOldEmailForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\EditorAccountPasswordForm.cs" />

@@ -322,8 +326,8 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\MemberManagementForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\UserInformationForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\UserMainForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\NewGateWaySelectForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGwAddDirectionForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\NewGateWayMenuSelectForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGatewayDirectionForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGatewaySearchForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayInfoEditorForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Account\AccountLogin.cs" />

@@ -412,7 +416,6 @@
    <Folder Include="$(MSBuildThisFileDirectory)Phone\Device\Curtain\" />

    <Folder Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\" />

    <Folder Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Curtain\" />

    <Folder Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\" />

  </ItemGroup>

  <ItemGroup>

    <None Include="$(MSBuildThisFileDirectory)DLL\Elian.iOS.dll" />