Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc

WJC

2019-12-03 f8b647c263f068babb8efcc19ff4e74026a4bd28

 ZigbeeApp/Shared/Shared.projitems

old mode 100755
new mode 100644
@@ -57,6 +57,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RoomNoNameMainView.cs" />

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

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

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

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

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

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

@@ -72,7 +73,6 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Light\AirSwitchControl.cs" />

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

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

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

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

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

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

@@ -118,14 +118,17 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\UnallocatedRoom.cs" />

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

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\AccountOption.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ClickButtonControls\BottomLeftClickButton.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ClickButtonControls\BottomRightClickButton.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\BelongAreaControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\CutPictureControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\ProgressFormBar.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\PswGestureInputControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\InformationEditorControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\RoomDeviceGroupMenuControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SceneFunctionSwitchControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\VerificationCodeControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalFrameRefreshControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalListRefreshControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\LoadingControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\MessageManagementControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\BottomMenuSelectForm.cs" />

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

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

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

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

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

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

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

@@ -291,10 +295,10 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\BackViewControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\UserCenterEnumCommon.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Base\TextInputBase.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\DialogInputForm.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\TextInputControls\DialogInputControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\IconViewControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\MostRightIconControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\MsgControls.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\MessageControls\ShowMsgControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\PicViewControl.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceSelectControl.cs" />

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

@@ -439,6 +443,45 @@
    <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\IO\LocalFileUtils.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlSafeguardLogic.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlAlarmsLogic.cs" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\AddAction.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\AddCondition.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockAddDevice.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockAddScene.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockLogicCommunalPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockLogicList.cs" />

  </ItemGroup>

  <ItemGroup>

    <Folder Include="$(MSBuildThisFileDirectory)Pad\" />

@@ -446,9 +489,17 @@
    <Folder Include="$(MSBuildThisFileDirectory)Phone\Device\Curtain\" />

  </ItemGroup>

  <ItemGroup>

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Shared.Droid.dll" />

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

    <None Include="$(MSBuildThisFileDirectory)DLL\M2Mqtt.Net.dll" />

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

    <None Include="$(MSBuildThisFileDirectory)DLL\Newtonsoft.Json.dll" />

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

    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Droid.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Droid.xml" />

    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Ios.xml" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Shared.Droid.HDLWidget.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Shared.Droid.TouchID.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Shared.Droid.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Arch.Core.Common.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Arch.Lifecycle.Common.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Arch.Lifecycle.Runtime.dll" />

@@ -459,18 +510,11 @@
    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.Core.Utils.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.Fragment.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.Media.Compat.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.v4.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.v7.AppCompat.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\Android\Xamarin.Android.Support.Vector.Drawable.dll" />

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

    <None Include="$(MSBuildThisFileDirectory)DLL\IOS\Shared.IOS.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\IOS\Shared.IOS.TBL.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\IOS\Shared.IOS.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\IOS\Xamarin.Essentials.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\M2Mqtt.Net.dll" />

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

    <None Include="$(MSBuildThisFileDirectory)DLL\Newtonsoft.Json.dll" />

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

    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Droid.dll" />

    <None Include="$(MSBuildThisFileDirectory)DLL\ZigBee.Ios.xml" />

  </ItemGroup>

</Project>
</Project>