From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/Shared/Shared.projitems | 27 +++++++++------------------
1 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index 26c2f05..35d1714 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -28,15 +28,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Account\PhoneZone.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\AC\ACControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\AC\ACControlBase.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\CategorySceneSelectAirSwitchSetting.cs" />
- <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\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\SelectDevice.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\SelectFloor.cs" />
@@ -65,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" />
@@ -80,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" />
@@ -126,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" />
@@ -207,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" />
@@ -299,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" />
@@ -354,6 +350,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\EditorAccountPasswordForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Suggestion\FeedbackForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\SecondAuthenticationForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\LoginLoading.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\AC.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DimmableLight.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DoorLock.cs" />
@@ -390,11 +387,8 @@
<Compile Include="$(MSBuildThisFileDirectory)Common\SendDataToServer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\UserHomeView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\Room.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddRoom.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\RoomManagement.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddRoomSelectPicByLocal.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddRoomContent.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddDeviceList.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\ProgressBar.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SearchEditText.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\RowLayoutControls\RowLayoutControl.cs" />
@@ -402,10 +396,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\AddDeviceTypeListForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceMacInfoEditorForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceAddSuccessForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddDevicesSameTypeList.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddDevieDetailFromAddFunction.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\DeviceUI.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Room\AddRoomScene.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\SafetyManagementMainForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameRowControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Category\Category.cs" />
--
Gitblit v1.8.0