From ca233e3c6154859a17948d892fbc6bbf723b60a8 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 29 五月 2020 15:47:30 +0800
Subject: [PATCH] 发布的1.0.20052901
---
ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 2
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunction.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs | 0
ZigbeeApp20200525/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs | 10
ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFiveSelected2.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs | 0
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironmentSelected2.png | 0
ZigbeeApp20200525/GateWay.Droid/GateWay.Droid.csproj | 702 ++-----
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs | 12
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/RealDevice/ButtonPanelSimpleMultifunction.png | 0
ZigbeeApp20200525/Home.Ios/Resources/Phone/RealDevice/ButtonPanelSimpleMultifunction.png | 0
ZigbeeApp20200525/Shared/Phone/Device/Logic/SoneLogicList.cs | 101
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironmentSelected.png | 0
ZigbeeApp20200525/Shared/Phone/ZigBee/Device/DoorLock.cs | 0
ZigbeeApp20200525/Home.Ios/Resources/Phone/Instruct/ButtonPanelSimpleMultifunction.png | 0
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelFangyueFreshAirSelected2.png | 0
ZigbeeApp20200525/Home.Ios/Resources/Language.ini | 15
ZigbeeApp20200525/Shared/Phone/ZigBee/Common/Application.cs | 0
ZigbeeApp20200525/Shared/Phone/Device/Logic/SkipView.cs | 53
ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/PanelSimpleEnvironmentDirectionForm.cs | 74
ZigbeeApp20200525/GateWay.Droid/Resources/Resource.designer.cs | 814 ++++----
ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironment.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 17
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/RealDevice/ButtonPanelSimpleEnvironment.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 168 +
ZigbeeApp20200525/GateWay.Droid/Assets/Language.ini | 15
ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunctionSelected2.png | 0
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/SensorPMTwoPointFiveSelected.png | 0
ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelCurtainSelected2.png | 0
ZigbeeApp20200525/Shared/Phone/ZigBee/Device/ZbGateway.cs | 0
ZigbeeApp20200525/Home.Ios/Home.IOS.csproj | 26
ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironmentSelected.png | 0
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Instruct/ButtonPanelSimpleMultifunction.png | 0
ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironmentSelected2.png | 0
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelCurtainSelected2.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs | 0
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Instruct/ButtonPanelSimpleEnvironment.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 7
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 49
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionBindSensorForm.cs | 1890 +++++++++++++++++++++
ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunctionSelected.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs | 25
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunctionSelected2.png | 0
ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFiveSelected.png | 0
ZigbeeApp20200525/Home.Ios/Resources/Phone/Instruct/ButtonPanelSimpleEnvironment.png | 0
ZigbeeApp20200525/Home.Ios/Resources/Phone/RealDevice/ButtonPanelSimpleEnvironment.png | 0
ZigbeeApp20200525/Shared/Shared.projitems | 899 +++++-----
ZigbeeApp20200525/Shared/Common/CommonPage.cs | 2
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironment.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentTargetsForm.cs | 10
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/SensorPMTwoPointFiveSelected2.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 0
ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunction.png | 0
ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunctionSelected.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 69
ZigbeeApp20200525/Shared/R.cs | 33
ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelFangyueFreshAirSelected2.png | 0
ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs | 0
ZigbeeApp20200525/Shared/Common/Device.cs | 50
ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/PanelSimpleMultifunctionDirectionForm.cs | 83
63 files changed, 3,578 insertions(+), 1,548 deletions(-)
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Language.ini b/ZigbeeApp20200525/GateWay.Droid/Assets/Language.ini
index 4127b95..aad48d3 100755
--- a/ZigbeeApp20200525/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Language.ini
@@ -253,7 +253,7 @@
249=鎮ㄧ殑甯稿紑妯″紡灏嗚鍙栨秷
250=淇濇寔甯稿紑
251=纭鍙栨秷
-252=(鏈鎿嶄綔浠呬负鍗曟鍙栨秷锛岃嫢闇�瑕佸仠姝㈡墽琛岃嚜鍔ㄥ寲锛岃閫夋嫨鍒嗙被-鑷姩鍖栬繘琛岃缃�)
+252=(鏈鎿嶄綔浠呬负鍗曟鍙栨秷锛岃嫢闇�瑕佸仠姝㈡墽琛岃嚜鍔ㄥ寲锛岃鍒板父寮�鑷姩鍖栬缃�)
253=鑾峰彇闂ㄩ攣甯稿紑妯″紡澶辫触
254=鎵撳紑闂ㄩ攣甯稿紑妯″紡鎴愬姛
255=鎵撳紑闂ㄩ攣甯稿紑妯″紡澶辫触
@@ -324,6 +324,11 @@
321=閲嶅害姹℃煋
322=涓ラ噸姹℃煋
323=鑷姩鍖栧叧闂�愰棬閿佸父寮�妯″紡銆戯紝闂ㄩ攣宸插叧
+324=鍏ョ綉
+;娉ㄦ剰鈥滃叆缃戔�濈殑鑻辨枃鈥淐onnection",鍥犱负灞忓箷涓婃槸杩欐牱鏄剧ず鐨�
+325=鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
+326=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
+327=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
5097=鍙栨秷
5098=纭畾
@@ -1990,6 +1995,8 @@
30038=鏂规偊鏂伴灏忔ā鍧�
30039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
30040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+30041=绠�绾﹀鍔熻兘闈㈡澘
+30042=绠�绾︾幆澧冮潰鏉�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
@@ -2055,6 +2062,8 @@
50038=鏂伴鎺у埗灏忔ā鍧�
50039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
50040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+50041=绠�绾﹀鍔熻兘闈㈡澘
+50042=绠�绾︾幆澧冮潰鏉�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
60000=浼犳劅鍣�
@@ -2097,4 +2106,6 @@
70023=涓户鍣�
70024=鏅鸿兘绌哄紑
70025=鍚搁《鐕冩皵浼犳劅鍣�
-70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
\ No newline at end of file
+70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+70027=绠�绾﹀鍔熻兘闈㈡澘
+70028=绠�绾︾幆澧冮潰鏉�
\ No newline at end of file
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelCurtainSelected2.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelCurtainSelected2.png
new file mode 100644
index 0000000..6e4c3ab
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelCurtainSelected2.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelFangyueFreshAirSelected2.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelFangyueFreshAirSelected2.png
new file mode 100644
index 0000000..400f73c
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelFangyueFreshAirSelected2.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironment.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironment.png
new file mode 100644
index 0000000..b600be5
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironment.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironmentSelected.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironmentSelected.png
new file mode 100644
index 0000000..470608c
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironmentSelected.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironmentSelected2.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironmentSelected2.png
new file mode 100644
index 0000000..0432723
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleEnvironmentSelected2.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunction.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunction.png
new file mode 100644
index 0000000..e295871
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunction.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunctionSelected.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunctionSelected.png
new file mode 100644
index 0000000..347ffc4
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunctionSelected.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunctionSelected2.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunctionSelected2.png
new file mode 100644
index 0000000..e6c8858
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/ButtonPanelSimpleMultifunctionSelected2.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/SensorPMTwoPointFiveSelected.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/SensorPMTwoPointFiveSelected.png
new file mode 100644
index 0000000..61f33fa
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/SensorPMTwoPointFiveSelected.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/SensorPMTwoPointFiveSelected2.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/SensorPMTwoPointFiveSelected2.png
new file mode 100644
index 0000000..1628d3d
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Device/SensorPMTwoPointFiveSelected2.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Instruct/ButtonPanelSimpleEnvironment.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Instruct/ButtonPanelSimpleEnvironment.png
new file mode 100644
index 0000000..0d3e5d7
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Instruct/ButtonPanelSimpleEnvironment.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Instruct/ButtonPanelSimpleMultifunction.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Instruct/ButtonPanelSimpleMultifunction.png
new file mode 100644
index 0000000..1f24e24
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/Instruct/ButtonPanelSimpleMultifunction.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/RealDevice/ButtonPanelSimpleEnvironment.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/RealDevice/ButtonPanelSimpleEnvironment.png
new file mode 100644
index 0000000..eb8b51e
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/RealDevice/ButtonPanelSimpleEnvironment.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/RealDevice/ButtonPanelSimpleMultifunction.png b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/RealDevice/ButtonPanelSimpleMultifunction.png
new file mode 100644
index 0000000..981b1f5
--- /dev/null
+++ b/ZigbeeApp20200525/GateWay.Droid/Assets/Phone/RealDevice/ButtonPanelSimpleMultifunction.png
Binary files differ
diff --git a/ZigbeeApp20200525/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp20200525/GateWay.Droid/GateWay.Droid.csproj
index 15159bf..f8c1c74 100644
--- a/ZigbeeApp20200525/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp20200525/GateWay.Droid/GateWay.Droid.csproj
@@ -290,43 +290,6 @@
<AndroidAsset Include="Assets\Phone\Center\Opinion.png" />
<AndroidAsset Include="Assets\Phone\Center\ResidenceManagement.png" />
<AndroidAsset Include="Assets\Phone\Center\SafetyManagement.png" />
- <AndroidAsset Include="Assets\Phone\Device\AirConditioner.png" />
- <AndroidAsset Include="Assets\Phone\Device\AirConditionerEpoint.png" />
- <AndroidAsset Include="Assets\Phone\Device\AirConditionerZbGateway.png" />
- <AndroidAsset Include="Assets\Phone\Device\AirSwitch.png" />
- <AndroidAsset Include="Assets\Phone\Device\AirSwitchCloudContr.png" />
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanel.png" />
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFour.png" />
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelOne.png" />
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelThree.png" />
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelTwo.png" />
- <AndroidAsset Include="Assets\Phone\Device\ColorLight.png" />
- <AndroidAsset Include="Assets\Phone\Device\Converter.png" />
- <AndroidAsset Include="Assets\Phone\Device\ConverterZb485.png" />
- <AndroidAsset Include="Assets\Phone\Device\Curtain.png" />
- <AndroidAsset Include="Assets\Phone\Device\CurtainAutoOpen.png" />
- <AndroidAsset Include="Assets\Phone\Device\CurtainSiphonate.png" />
- <AndroidAsset Include="Assets\Phone\Device\DimmableLight.png" />
- <AndroidAsset Include="Assets\Phone\Device\DimmableLightOneLoad.png" />
- <AndroidAsset Include="Assets\Phone\Device\DryContact.png" />
- <AndroidAsset Include="Assets\Phone\Device\IntelligentLocks.png" />
- <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksH06C.png" />
- <AndroidAsset Include="Assets\Phone\Device\Light.png" />
- <AndroidAsset Include="Assets\Phone\Device\Relay.png" />
- <AndroidAsset Include="Assets\Phone\Device\RelayEpoint.png" />
- <AndroidAsset Include="Assets\Phone\Device\RelayThreeLoad.png" />
- <AndroidAsset Include="Assets\Phone\Device\Repeater.png" />
- <AndroidAsset Include="Assets\Phone\Device\Sensor.png" />
- <AndroidAsset Include="Assets\Phone\Device\SensorCarbonMonoxide.png" />
- <AndroidAsset Include="Assets\Phone\Device\SensorDoorWindow.png" />
- <AndroidAsset Include="Assets\Phone\Device\SensorFire.png" />
- <AndroidAsset Include="Assets\Phone\Device\SensorHumidity.png" />
- <AndroidAsset Include="Assets\Phone\Device\SensorInfrared.png" />
- <AndroidAsset Include="Assets\Phone\Device\SensorPir.png" />
- <AndroidAsset Include="Assets\Phone\Device\SensorTemperature.png" />
- <AndroidAsset Include="Assets\Phone\Device\SensorWater.png" />
- <AndroidAsset Include="Assets\Phone\Device\Socket1.png" />
- <AndroidAsset Include="Assets\Phone\Device\Switch.png" />
<AndroidAsset Include="Assets\Phone\DoorLock\AddFailedPic.png" />
<AndroidAsset Include="Assets\Phone\DoorLock\AddFingerprintTipPic.png" />
<AndroidAsset Include="Assets\Phone\DoorLock\AddIcCardTipPic.png" />
@@ -427,13 +390,6 @@
<AndroidAsset Include="Assets\Phone\Gateway\RealGateway6.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WiredGateway.png" />
<AndroidAsset Include="Assets\Phone\Gateway\WiredGatewayInstruct.png" />
- <AndroidAsset Include="Assets\Phone\Instruct\DeviceSearch.png" />
- <AndroidAsset Include="Assets\Phone\Instruct\DimmableLightOneLoad.png" />
- <AndroidAsset Include="Assets\Phone\Instruct\IntelligentLocksH06C.png" />
- <AndroidAsset Include="Assets\Phone\Instruct\PanelFourButton.png" />
- <AndroidAsset Include="Assets\Phone\Instruct\PanelThreeButton.png" />
- <AndroidAsset Include="Assets\Phone\Instruct\PanelTwoButton.png" />
- <AndroidAsset Include="Assets\Phone\Instruct\RelayThreeLoad.png" />
<AndroidAsset Include="Assets\Phone\Item\Add.png" />
<AndroidAsset Include="Assets\Phone\Item\Add_Category.png" />
<AndroidAsset Include="Assets\Phone\Item\Add_GW.png" />
@@ -513,20 +469,6 @@
<AndroidAsset Include="Assets\Phone\Navigation\HomeSelected.png" />
<AndroidAsset Include="Assets\Phone\Navigation\Setting.png" />
<AndroidAsset Include="Assets\Phone\Navigation\SettingSelected.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\AirSwitchCloudContr.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\CommonDevice.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\CurtainAutoOpen.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\CurtainSiphonate.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFour.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFourNotPower.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelThree.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelTwo.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorCarbonMonoxide.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorDoorWindow.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorFire.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorInfrared.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorPir.png" />
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorWater.png" />
<AndroidAsset Include="Assets\Phone\Room\RoomCardView.png" />
<AndroidAsset Include="Assets\Phone\Room\RoomCardView_Name.png" />
<AndroidAsset Include="Assets\Phone\Room\Room_Rectangle.png" />
@@ -536,6 +478,221 @@
<AndroidAsset Include="Assets\Phone\Safeguard\ProtectionRemoveHomeSelected.png" />
<AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrison.png" />
<AndroidAsset Include="Assets\Phone\Safeguard\WithdrawGarrisonSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\DimmableLightSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\CurtainSiphonate.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Socket1Selected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\DimmableLight.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelTwo.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RelayEpointSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ConverterZb485Selected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSimpleMultifunctionSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelCurtainSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\DimmableLightSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorPir.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorFireSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEnvironmentSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\LightSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RelaySelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorWaterSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorHumiditySelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RelayThreeLoad.png" />
+ <AndroidAsset Include="Assets\Phone\Device\CurtainAutoOpen.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksH06CSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\CurtainSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Relay.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorEpoint.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorWaterSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorInfrared.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFreshAir.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Curtain.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SwitchSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirSwitchCloudContr.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Socket1.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RelayThreeLoadSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorCarbonMonoxideSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFour.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RelayEpointSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorCeilingGasSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureHumidity.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RepeaterZigbeeSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelCurtainSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorDoorWindowSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RelayThreeLoadSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\DryContactSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelCurtain.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorCarbonMonoxideSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ConverterZb485.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFreshAirSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Repeater.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFour.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorInfraredSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorHumidity.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerEpointSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\CurtainAutoOpenSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Sensor.png" />
+ <AndroidAsset Include="Assets\Phone\Device\FreshAirEpointSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RepeaterSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorCeilingGasSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirSwitchSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ConverterSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirSwitchSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorEpointSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RelaySelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Socket1Selected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\IntelligentLocks.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSimpleEnvironment.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ConverterZb485Selected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ColorLightSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirSwitch.png" />
+ <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksH06CSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SwitchSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelTwoSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorDoorWindowSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Light.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueTwoSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ThirdPartyDevice.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerZbGatewaySelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEightSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEnvironment.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelOneSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSimpleMultifunctionSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerEpoint.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureHumiditySelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerEpointSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorPMTwoPointFiveSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\DryContactSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\CurtainSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSimpleEnvironmentSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Converter.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirConditioner.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorFireSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ColorLight.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerZbGatewaySelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorEpointSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\Switch.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanel.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelTwoSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\FreshAirEpointSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirConditionerZbGateway.png" />
+ <AndroidAsset Include="Assets\Phone\Device\DryContact.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirSwitchCloudContrSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFourSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelOneSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorPirSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorCeilingGas.png" />
+ <AndroidAsset Include="Assets\Phone\Device\CurtainSiphonateSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\LightSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelThreeSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksH06C.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEightSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorPMTwoPointFiveSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\CurtainSiphonateSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorDoorWindow.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSimpleMultifunction.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelOne.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEight.png" />
+ <AndroidAsset Include="Assets\Phone\Device\CurtainAutoOpenSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFourSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ThirdPartyDeviceSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ThirdPartyDeviceSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorTemperature.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorFire.png" />
+ <AndroidAsset Include="Assets\Phone\Device\DimmableLightOneLoadSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueTwoSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\FreshAirEpoint.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ColorLightSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\DimmableLightOneLoadSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelThree.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorInfraredSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RepeaterSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorPMTwoPointFive.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ConverterSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RepeaterZigbeeSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorCarbonMonoxide.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFourSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\DimmableLightOneLoad.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorHumiditySelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorPirSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSimpleEnvironmentSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\AirSwitchCloudContrSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueTwo.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RelayEpoint.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\RepeaterZigbee.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorWater.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelThreeSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorSelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFreshAirSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureHumiditySelected.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFourSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEnvironmentSelected2.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\CurtainSiphonate.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelTwo.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorPir.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\RelayThreeLoad.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFourNotPower.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\CurtainAutoOpen.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorInfrared.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueFreshAir.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\AirSwitchCloudContr.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFour.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelCurtain.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\Repeater.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorTemperatrueHumidity.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueFour.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelSimpleEnvironment.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\CommonDevice.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueEnvironment.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\AirConditionerZbGateway.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorCeilingGas.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\IntelligentLocksH06C.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorDoorWindow.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelSimpleMultifunction.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueEight.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorFire.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelThree.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorPMTwoPointFive.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorCarbonMonoxide.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\DimmableLightOneLoad.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueTwo.png" />
+ <AndroidAsset Include="Assets\Phone\RealDevice\SensorWater.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\CurtainSiphonate.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\PanelFreshAir.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorPir.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\RelayThreeLoad.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\CurtainAutoOpen.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorInfrared.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\AirSwitchCloudContr.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorTemperatureHumidity.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueTwoButton.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\ButtonPanelSimpleEnvironment.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\PanelCurtain.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueFourButton.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\PanelFourButton.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\AirConditionerZbGateway.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorCeilingGas.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\IntelligentLocksH06C.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorDoorWindow.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\ButtonPanelSimpleMultifunction.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorFire.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorPMTwoPointFive.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\PanelThreeButton.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorCarbonMonoxide.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\DimmableLightOneLoad.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueEightButton.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\RepeaterZigbee.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\SensorWater.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\DeviceSearch.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueEnvironment.png" />
+ <AndroidAsset Include="Assets\Phone\Instruct\PanelTwoButton.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\InputAccountIcon.png" />
@@ -868,9 +1025,6 @@
<AndroidAsset Include="Assets\Phone\Item\GwSwitchIconSelected.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\CurtainAutoOpen.png" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\DeviceLimitGround.png" />
</ItemGroup>
<ItemGroup>
@@ -881,36 +1035,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\DeviceLimitGroundSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\CurtainSiphonate.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\SensorInfrared.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\SensorDoorWindow.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\SensorCarbonMonoxide.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\SensorWater.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\AirSwitchCloudContr.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\RepeaterZigbee.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\AirConditionerZbGateway.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RepeaterZigbee.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\SensorFire.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\ZigeeLogic\lockadd.png" />
@@ -929,9 +1053,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\RoomIconSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirConditionerEpointSelected.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\WarningIcon1.png" />
@@ -968,9 +1089,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Safeguard\SafetyShortcutSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ThirdPartyDevice.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Account\QQ.png" />
@@ -1258,18 +1376,6 @@
<AndroidAsset Include="Assets\Phone\ZigeeLogic\progressbtn2.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\SensorPir.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\SensorTemperatureHumidity.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureHumidity.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirConditionerSelected.png" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu1_1.png" />
</ItemGroup>
<ItemGroup>
@@ -1298,117 +1404,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\MenuGroud\TopRightMenu2_5.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirConditionerZbGatewaySelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirSwitchCloudContrSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirSwitchSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFourSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelOneSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelThreeSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelTwoSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ColorLightSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ConverterSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ConverterZb485Selected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\CurtainAutoOpenSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\CurtainSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\CurtainSiphonateSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\DimmableLightOneLoadSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\DimmableLightSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\DryContactSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksH06CSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\LightSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RelayEpointSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RelaySelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RelayThreeLoadSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RepeaterSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RepeaterZigbeeSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorCarbonMonoxideSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorDoorWindowSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorFireSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorHumiditySelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorInfraredSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorPirSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureHumiditySelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorWaterSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\Socket1Selected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SwitchSelected.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Room\AddBackground.png" />
@@ -1462,21 +1457,6 @@
<AndroidAsset Include="Assets\Phone\Gateway\RealGateway.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\AirConditionerZbGateway.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\DimmableLightOneLoad.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\RelayThreeLoad.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\Repeater.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorTemperatrueHumidity.png" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\Center\MainBack1.png" />
</ItemGroup>
<ItemGroup>
@@ -1487,54 +1467,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Guide\WorkRoomIcon.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueEight.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueEnvironment.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueFour.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueTwo.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEight.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEnvironment.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFour.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueTwo.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueEightButton.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueEnvironment.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueFourButton.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\PanelFangyueTwoButton.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEightSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEnvironmentSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFourSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueTwoSelected.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Floor\SelectFloor_Left_1.png" />
@@ -1580,138 +1512,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Room\RoomCardShadow.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirConditionerEpointSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirConditionerSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirConditionerZbGatewaySelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirSwitchCloudContrSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirSwitchSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEightSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueEnvironmentSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFourSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueTwoSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFourSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelOneSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelThreeSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelTwoSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ColorLightSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ConverterSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ConverterZb485Selected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\CurtainAutoOpenSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\CurtainSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\CurtainSiphonateSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\DimmableLightOneLoadSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\DimmableLightSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\DryContactSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksH06CSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\IntelligentLocksSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\LightSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RelayEpointSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RelaySelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RelayThreeLoadSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RepeaterSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\RepeaterZigbeeSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorCarbonMonoxideSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorDoorWindowSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorFireSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorHumiditySelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorPirSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureHumiditySelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorTemperatureSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorWaterSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\Socket1Selected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SwitchSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ThirdPartyDeviceSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ThirdPartyDeviceSelected2.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FunctionIcon\1IconSelected2.png" />
@@ -1846,12 +1646,6 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\28IconSelected2.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorInfraredSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\PanelCurtain.png" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\DeviceItem\ButtonPanelFangyueEnvironmentBigPic.png" />
</ItemGroup>
<ItemGroup>
@@ -1865,15 +1659,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\DeviceItem\PanelTable.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelCurtain.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelCurtain.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelCurtainSelected.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\DoorLock\LowPower.png" />
@@ -2026,21 +1811,6 @@
<AndroidAsset Include="Assets\Phone\RoomIcon\6.jpg" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\IntelligentLocksH06C.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFreshAir.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\ButtonPanelFangyueFreshAirSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\PanelFreshAir.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\ButtonPanelFangyueFreshAir.png" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\SceneCardIcon\0.png" />
</ItemGroup>
<ItemGroup>
@@ -2098,55 +1868,13 @@
<AndroidAsset Include="Assets\Phone\ZigeeLogic\openMode.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\FreshAirEpoint.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\FreshAirEpointSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\FreshAirEpointSelected2.png" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\FreshAir\FreshAirPic.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\FreshAir\FreshAirRealDevicePic.png" />
</ItemGroup>
<ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorCeilingGas.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorCeilingGas.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorCeilingGasSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorCeilingGasSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\SensorCeilingGas.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\SensorPMTwoPointFive.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Instruct\SensorPMTwoPointFive.png" />
- </ItemGroup>
- <ItemGroup>
<AndroidAsset Include="Assets\Phone\ZigeeLogic\nextIconSone.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorEpoint.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorEpointSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\Device\AirQualitySensorEpointSelected2.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\RealDevice\SensorPMTwoPointFive.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\PM2.5Sensor\HumidityPic.png" />
diff --git a/ZigbeeApp20200525/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp20200525/GateWay.Droid/Resources/Resource.designer.cs
index 09d3931..d393349 100644
--- a/ZigbeeApp20200525/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp20200525/GateWay.Droid/Resources/Resource.designer.cs
@@ -2979,698 +2979,665 @@
public partial class Id
{
- // aapt resource value: 0x7F090015
- public const int action0 = 2131296277;
-
- // aapt resource value: 0x7F090027
- public const int actions = 2131296295;
-
- // aapt resource value: 0x7F090016
- public const int action_bar = 2131296278;
-
- // aapt resource value: 0x7F090017
- public const int action_bar_activity_content = 2131296279;
-
- // aapt resource value: 0x7F090018
- public const int action_bar_container = 2131296280;
-
- // aapt resource value: 0x7F090019
- public const int action_bar_root = 2131296281;
-
- // aapt resource value: 0x7F09001A
- public const int action_bar_spinner = 2131296282;
-
- // aapt resource value: 0x7F09001B
- public const int action_bar_subtitle = 2131296283;
-
- // aapt resource value: 0x7F09001C
- public const int action_bar_title = 2131296284;
-
- // aapt resource value: 0x7F09001D
- public const int action_container = 2131296285;
-
- // aapt resource value: 0x7F09001E
- public const int action_context_bar = 2131296286;
-
- // aapt resource value: 0x7F09001F
- public const int action_divider = 2131296287;
+ // aapt resource value: 0x7F09000E
+ public const int action0 = 2131296270;
// aapt resource value: 0x7F090020
- public const int action_image = 2131296288;
+ public const int actions = 2131296288;
+
+ // aapt resource value: 0x7F09000F
+ public const int action_bar = 2131296271;
+
+ // aapt resource value: 0x7F090010
+ public const int action_bar_activity_content = 2131296272;
+
+ // aapt resource value: 0x7F090011
+ public const int action_bar_container = 2131296273;
+
+ // aapt resource value: 0x7F090012
+ public const int action_bar_root = 2131296274;
+
+ // aapt resource value: 0x7F090013
+ public const int action_bar_spinner = 2131296275;
+
+ // aapt resource value: 0x7F090014
+ public const int action_bar_subtitle = 2131296276;
+
+ // aapt resource value: 0x7F090015
+ public const int action_bar_title = 2131296277;
+
+ // aapt resource value: 0x7F090016
+ public const int action_container = 2131296278;
+
+ // aapt resource value: 0x7F090017
+ public const int action_context_bar = 2131296279;
+
+ // aapt resource value: 0x7F090018
+ public const int action_divider = 2131296280;
+
+ // aapt resource value: 0x7F090019
+ public const int action_image = 2131296281;
+
+ // aapt resource value: 0x7F09001A
+ public const int action_menu_divider = 2131296282;
+
+ // aapt resource value: 0x7F09001B
+ public const int action_menu_presenter = 2131296283;
+
+ // aapt resource value: 0x7F09001C
+ public const int action_mode_bar = 2131296284;
+
+ // aapt resource value: 0x7F09001D
+ public const int action_mode_bar_stub = 2131296285;
+
+ // aapt resource value: 0x7F09001E
+ public const int action_mode_close_button = 2131296286;
+
+ // aapt resource value: 0x7F09001F
+ public const int action_text = 2131296287;
// aapt resource value: 0x7F090021
- public const int action_menu_divider = 2131296289;
+ public const int activity_chooser_view_content = 2131296289;
// aapt resource value: 0x7F090022
- public const int action_menu_presenter = 2131296290;
+ public const int add = 2131296290;
// aapt resource value: 0x7F090023
- public const int action_mode_bar = 2131296291;
+ public const int alertTitle = 2131296291;
// aapt resource value: 0x7F090024
- public const int action_mode_bar_stub = 2131296292;
-
- // aapt resource value: 0x7F090025
- public const int action_mode_close_button = 2131296293;
-
- // aapt resource value: 0x7F090026
- public const int action_text = 2131296294;
-
- // aapt resource value: 0x7F090028
- public const int activity_chooser_view_content = 2131296296;
-
- // aapt resource value: 0x7F090029
- public const int add = 2131296297;
-
- // aapt resource value: 0x7F09002A
- public const int alertTitle = 2131296298;
-
- // aapt resource value: 0x7F09002B
- public const int all = 2131296299;
+ public const int all = 2131296292;
// aapt resource value: 0x7F090000
public const int ALT = 2131296256;
+ // aapt resource value: 0x7F090025
+ public const int always = 2131296293;
+
+ // aapt resource value: 0x7F090026
+ public const int async = 2131296294;
+
+ // aapt resource value: 0x7F090027
+ public const int auto = 2131296295;
+
+ // aapt resource value: 0x7F090028
+ public const int beginning = 2131296296;
+
+ // aapt resource value: 0x7F090029
+ public const int blocking = 2131296297;
+
+ // aapt resource value: 0x7F09002A
+ public const int bottom = 2131296298;
+
+ // aapt resource value: 0x7F09002B
+ public const int btnCancel = 2131296299;
+
// aapt resource value: 0x7F09002C
- public const int always = 2131296300;
+ public const int btnSubmit = 2131296300;
// aapt resource value: 0x7F09002D
- public const int async = 2131296301;
+ public const int buttonPanel = 2131296301;
// aapt resource value: 0x7F09002E
- public const int auto = 2131296302;
+ public const int cancel_action = 2131296302;
// aapt resource value: 0x7F09002F
- public const int beginning = 2131296303;
+ public const int center = 2131296303;
// aapt resource value: 0x7F090030
- public const int blocking = 2131296304;
+ public const int center_horizontal = 2131296304;
// aapt resource value: 0x7F090031
- public const int bottom = 2131296305;
+ public const int center_vertical = 2131296305;
// aapt resource value: 0x7F090032
- public const int btnCancel = 2131296306;
+ public const int checkbox = 2131296306;
// aapt resource value: 0x7F090033
- public const int btnSubmit = 2131296307;
+ public const int chronometer = 2131296307;
// aapt resource value: 0x7F090034
- public const int buttonPanel = 2131296308;
+ public const int clip_horizontal = 2131296308;
// aapt resource value: 0x7F090035
- public const int cancel_action = 2131296309;
+ public const int clip_vertical = 2131296309;
// aapt resource value: 0x7F090036
- public const int center = 2131296310;
+ public const int collapseActionView = 2131296310;
// aapt resource value: 0x7F090037
- public const int center_horizontal = 2131296311;
+ public const int container = 2131296311;
// aapt resource value: 0x7F090038
- public const int center_vertical = 2131296312;
+ public const int contentFrame = 2131296312;
// aapt resource value: 0x7F090039
- public const int checkbox = 2131296313;
+ public const int contentPanel = 2131296313;
// aapt resource value: 0x7F09003A
- public const int chronometer = 2131296314;
+ public const int content_container = 2131296314;
// aapt resource value: 0x7F09003B
- public const int clip_horizontal = 2131296315;
-
- // aapt resource value: 0x7F09003C
- public const int clip_vertical = 2131296316;
-
- // aapt resource value: 0x7F09003D
- public const int collapseActionView = 2131296317;
-
- // aapt resource value: 0x7F09003E
- public const int container = 2131296318;
-
- // aapt resource value: 0x7F09003F
- public const int contentFrame = 2131296319;
-
- // aapt resource value: 0x7F090040
- public const int contentPanel = 2131296320;
-
- // aapt resource value: 0x7F090041
- public const int content_container = 2131296321;
-
- // aapt resource value: 0x7F090042
- public const int coordinator = 2131296322;
+ public const int coordinator = 2131296315;
// aapt resource value: 0x7F090001
public const int CTRL = 2131296257;
- // aapt resource value: 0x7F090002
- public const int Custom = 2131296258;
+ // aapt resource value: 0x7F09003C
+ public const int custom = 2131296316;
+
+ // aapt resource value: 0x7F09003D
+ public const int customPanel = 2131296317;
+
+ // aapt resource value: 0x7F09003E
+ public const int day = 2131296318;
+
+ // aapt resource value: 0x7F09003F
+ public const int decor_content_parent = 2131296319;
+
+ // aapt resource value: 0x7F090040
+ public const int default_activity_button = 2131296320;
+
+ // aapt resource value: 0x7F090041
+ public const int description = 2131296321;
+
+ // aapt resource value: 0x7F090042
+ public const int design_bottom_sheet = 2131296322;
// aapt resource value: 0x7F090043
- public const int custom = 2131296323;
-
- // aapt resource value: 0x7F090003
- public const int CustomLabel = 2131296259;
+ public const int design_menu_item_action_area = 2131296323;
// aapt resource value: 0x7F090044
- public const int customPanel = 2131296324;
+ public const int design_menu_item_action_area_stub = 2131296324;
// aapt resource value: 0x7F090045
- public const int day = 2131296325;
+ public const int design_menu_item_text = 2131296325;
// aapt resource value: 0x7F090046
- public const int decor_content_parent = 2131296326;
+ public const int design_navigation_view = 2131296326;
// aapt resource value: 0x7F090047
- public const int default_activity_button = 2131296327;
+ public const int disableHome = 2131296327;
// aapt resource value: 0x7F090048
- public const int description = 2131296328;
+ public const int edit_query = 2131296328;
// aapt resource value: 0x7F090049
- public const int design_bottom_sheet = 2131296329;
+ public const int end = 2131296329;
// aapt resource value: 0x7F09004A
- public const int design_menu_item_action_area = 2131296330;
+ public const int end_padder = 2131296330;
// aapt resource value: 0x7F09004B
- public const int design_menu_item_action_area_stub = 2131296331;
+ public const int enterAlways = 2131296331;
// aapt resource value: 0x7F09004C
- public const int design_menu_item_text = 2131296332;
+ public const int enterAlwaysCollapsed = 2131296332;
// aapt resource value: 0x7F09004D
- public const int design_navigation_view = 2131296333;
-
- // aapt resource value: 0x7F09004E
- public const int disableHome = 2131296334;
+ public const int exitUntilCollapsed = 2131296333;
// aapt resource value: 0x7F09004F
- public const int edit_query = 2131296335;
+ public const int expanded_menu = 2131296335;
+
+ // aapt resource value: 0x7F09004E
+ public const int expand_activities_button = 2131296334;
// aapt resource value: 0x7F090050
- public const int end = 2131296336;
+ public const int fill = 2131296336;
+
+ // aapt resource value: 0x7F090002
+ public const int FILL = 2131296258;
// aapt resource value: 0x7F090051
- public const int end_padder = 2131296337;
+ public const int fill_horizontal = 2131296337;
+
+ // aapt resource value: 0x7F090003
+ public const int FILL_STROKE = 2131296259;
// aapt resource value: 0x7F090052
- public const int enterAlways = 2131296338;
+ public const int fill_vertical = 2131296338;
// aapt resource value: 0x7F090053
- public const int enterAlwaysCollapsed = 2131296339;
+ public const int fingerprint_icon = 2131296339;
// aapt resource value: 0x7F090054
- public const int exitUntilCollapsed = 2131296340;
-
- // aapt resource value: 0x7F090056
- public const int expanded_menu = 2131296342;
-
- // aapt resource value: 0x7F090055
- public const int expand_activities_button = 2131296341;
-
- // aapt resource value: 0x7F090057
- public const int fill = 2131296343;
-
- // aapt resource value: 0x7F090004
- public const int FILL = 2131296260;
-
- // aapt resource value: 0x7F090058
- public const int fill_horizontal = 2131296344;
+ public const int @fixed = 2131296340;
// aapt resource value: 0x7F090005
- public const int FILL_STROKE = 2131296261;
-
- // aapt resource value: 0x7F090059
- public const int fill_vertical = 2131296345;
-
- // aapt resource value: 0x7F09005A
- public const int fingerprint_icon = 2131296346;
-
- // aapt resource value: 0x7F09005B
- public const int @fixed = 2131296347;
-
- // aapt resource value: 0x7F090007
- public const int FixedBehind = 2131296263;
-
- // aapt resource value: 0x7F090008
- public const int FixedFront = 2131296264;
-
- // aapt resource value: 0x7F09005C
- public const int forever = 2131296348;
+ public const int FixedBehind = 2131296261;
// aapt resource value: 0x7F090006
- public const int FUNCTION = 2131296262;
+ public const int FixedFront = 2131296262;
+
+ // aapt resource value: 0x7F090055
+ public const int forever = 2131296341;
+
+ // aapt resource value: 0x7F090004
+ public const int FUNCTION = 2131296260;
+
+ // aapt resource value: 0x7F090056
+ public const int gd_btn_back = 2131296342;
+
+ // aapt resource value: 0x7F090057
+ public const int gd_btn_myLocation = 2131296343;
+
+ // aapt resource value: 0x7F090058
+ public const int gd_btn_save = 2131296344;
+
+ // aapt resource value: 0x7F090059
+ public const int gd_img_search_delete = 2131296345;
+
+ // aapt resource value: 0x7F09005A
+ public const int gd_ll_myhome = 2131296346;
+
+ // aapt resource value: 0x7F09005B
+ public const int gd_ll_search = 2131296347;
+
+ // aapt resource value: 0x7F09005C
+ public const int gd_mapView = 2131296348;
// aapt resource value: 0x7F09005D
- public const int gd_btn_back = 2131296349;
+ public const int gd_rl_topview = 2131296349;
// aapt resource value: 0x7F09005E
- public const int gd_btn_myLocation = 2131296350;
+ public const int gd_tv_activity_title = 2131296350;
// aapt resource value: 0x7F09005F
- public const int gd_btn_save = 2131296351;
+ public const int gd_tv_radius = 2131296351;
// aapt resource value: 0x7F090060
- public const int gd_img_search_delete = 2131296352;
+ public const int gd_tv_search_title = 2131296352;
// aapt resource value: 0x7F090061
- public const int gd_ll_myhome = 2131296353;
+ public const int hdl_gallery_rootView = 2131296353;
// aapt resource value: 0x7F090062
- public const int gd_ll_search = 2131296354;
+ public const int hdl_gallery_viewPager = 2131296354;
// aapt resource value: 0x7F090063
- public const int gd_mapView = 2131296355;
+ public const int hdl_options1 = 2131296355;
// aapt resource value: 0x7F090064
- public const int gd_rl_topview = 2131296356;
+ public const int hdl_options2 = 2131296356;
// aapt resource value: 0x7F090065
- public const int gd_tv_activity_title = 2131296357;
+ public const int hdl_options3 = 2131296357;
// aapt resource value: 0x7F090066
- public const int gd_tv_radius = 2131296358;
+ public const int hdl_pickerview_ll = 2131296358;
// aapt resource value: 0x7F090067
- public const int gd_tv_search_title = 2131296359;
+ public const int home = 2131296359;
// aapt resource value: 0x7F090068
- public const int hdl_gallery_rootView = 2131296360;
+ public const int homeAsUp = 2131296360;
// aapt resource value: 0x7F090069
- public const int hdl_gallery_viewPager = 2131296361;
+ public const int hour = 2131296361;
// aapt resource value: 0x7F09006A
- public const int hdl_options1 = 2131296362;
+ public const int icon = 2131296362;
// aapt resource value: 0x7F09006B
- public const int hdl_options2 = 2131296363;
+ public const int icon_group = 2131296363;
// aapt resource value: 0x7F09006C
- public const int hdl_options3 = 2131296364;
+ public const int ifRoom = 2131296364;
// aapt resource value: 0x7F09006D
- public const int hdl_pickerview_ll = 2131296365;
+ public const int image = 2131296365;
// aapt resource value: 0x7F09006E
- public const int home = 2131296366;
+ public const int info = 2131296366;
// aapt resource value: 0x7F09006F
- public const int homeAsUp = 2131296367;
+ public const int italic = 2131296367;
// aapt resource value: 0x7F090070
- public const int hour = 2131296368;
+ public const int item_touch_helper_previous_elevation = 2131296368;
// aapt resource value: 0x7F090071
- public const int icon = 2131296369;
+ public const int largeLabel = 2131296369;
// aapt resource value: 0x7F090072
- public const int icon_group = 2131296370;
+ public const int left = 2131296370;
// aapt resource value: 0x7F090073
- public const int ifRoom = 2131296371;
+ public const int line1 = 2131296371;
// aapt resource value: 0x7F090074
- public const int image = 2131296372;
+ public const int line3 = 2131296372;
// aapt resource value: 0x7F090075
- public const int info = 2131296373;
+ public const int listMode = 2131296373;
// aapt resource value: 0x7F090076
- public const int italic = 2131296374;
+ public const int list_item = 2131296374;
// aapt resource value: 0x7F090077
- public const int item_touch_helper_previous_elevation = 2131296375;
+ public const int masked = 2131296375;
+
+ // aapt resource value: 0x7F090008
+ public const int MatchLayout = 2131296264;
// aapt resource value: 0x7F090078
- public const int largeLabel = 2131296376;
+ public const int media_actions = 2131296376;
// aapt resource value: 0x7F090079
- public const int left = 2131296377;
+ public const int message = 2131296377;
+
+ // aapt resource value: 0x7F090007
+ public const int META = 2131296263;
// aapt resource value: 0x7F09007A
- public const int line1 = 2131296378;
+ public const int middle = 2131296378;
// aapt resource value: 0x7F09007B
- public const int line3 = 2131296379;
+ public const int min = 2131296379;
// aapt resource value: 0x7F09007C
- public const int listMode = 2131296380;
+ public const int mini = 2131296380;
// aapt resource value: 0x7F09007D
- public const int list_item = 2131296381;
+ public const int month = 2131296381;
// aapt resource value: 0x7F09007E
- public const int masked = 2131296382;
-
- // aapt resource value: 0x7F09000A
- public const int MatchLayout = 2131296266;
+ public const int multiply = 2131296382;
// aapt resource value: 0x7F09007F
- public const int media_actions = 2131296383;
+ public const int myButton = 2131296383;
// aapt resource value: 0x7F090080
- public const int message = 2131296384;
-
- // aapt resource value: 0x7F090009
- public const int META = 2131296265;
+ public const int navigation_header_container = 2131296384;
// aapt resource value: 0x7F090081
- public const int middle = 2131296385;
+ public const int never = 2131296385;
// aapt resource value: 0x7F090082
- public const int min = 2131296386;
+ public const int none = 2131296386;
// aapt resource value: 0x7F090083
- public const int mini = 2131296387;
+ public const int normal = 2131296387;
// aapt resource value: 0x7F090084
- public const int month = 2131296388;
+ public const int notification_background = 2131296388;
// aapt resource value: 0x7F090085
- public const int multiply = 2131296389;
+ public const int notification_main_column = 2131296389;
// aapt resource value: 0x7F090086
- public const int myButton = 2131296390;
+ public const int notification_main_column_container = 2131296390;
// aapt resource value: 0x7F090087
- public const int navigation_header_container = 2131296391;
+ public const int options1 = 2131296391;
// aapt resource value: 0x7F090088
- public const int never = 2131296392;
+ public const int options2 = 2131296392;
// aapt resource value: 0x7F090089
- public const int none = 2131296393;
+ public const int options3 = 2131296393;
// aapt resource value: 0x7F09008A
- public const int normal = 2131296394;
-
- // aapt resource value: 0x7F09000B
- public const int Notice = 2131296267;
+ public const int optionspicker = 2131296394;
// aapt resource value: 0x7F09008B
- public const int notification_background = 2131296395;
+ public const int outmost_container = 2131296395;
// aapt resource value: 0x7F09008C
- public const int notification_main_column = 2131296396;
+ public const int parallax = 2131296396;
// aapt resource value: 0x7F09008D
- public const int notification_main_column_container = 2131296397;
+ public const int parentPanel = 2131296397;
// aapt resource value: 0x7F09008E
- public const int options1 = 2131296398;
+ public const int pin = 2131296398;
// aapt resource value: 0x7F09008F
- public const int options2 = 2131296399;
+ public const int progress_circular = 2131296399;
// aapt resource value: 0x7F090090
- public const int options3 = 2131296400;
+ public const int progress_horizontal = 2131296400;
// aapt resource value: 0x7F090091
- public const int optionspicker = 2131296401;
+ public const int radio = 2131296401;
// aapt resource value: 0x7F090092
- public const int outmost_container = 2131296402;
+ public const int right = 2131296402;
// aapt resource value: 0x7F090093
- public const int parallax = 2131296403;
+ public const int right_icon = 2131296403;
// aapt resource value: 0x7F090094
- public const int parentPanel = 2131296404;
-
- // aapt resource value: 0x7F09000C
- public const int Password = 2131296268;
-
- // aapt resource value: 0x7F09000D
- public const int PasswordLabel = 2131296269;
+ public const int right_side = 2131296404;
// aapt resource value: 0x7F090095
- public const int pin = 2131296405;
+ public const int rv_topbar = 2131296405;
+
+ // aapt resource value: 0x7F09000C
+ public const int Scale = 2131296268;
// aapt resource value: 0x7F090096
- public const int progress_circular = 2131296406;
+ public const int screen = 2131296406;
// aapt resource value: 0x7F090097
- public const int progress_horizontal = 2131296407;
-
- // aapt resource value: 0x7F090098
- public const int radio = 2131296408;
-
- // aapt resource value: 0x7F090099
- public const int right = 2131296409;
-
- // aapt resource value: 0x7F09009A
- public const int right_icon = 2131296410;
+ public const int scroll = 2131296407;
// aapt resource value: 0x7F09009B
- public const int right_side = 2131296411;
+ public const int scrollable = 2131296411;
+
+ // aapt resource value: 0x7F090098
+ public const int scrollIndicatorDown = 2131296408;
+
+ // aapt resource value: 0x7F090099
+ public const int scrollIndicatorUp = 2131296409;
+
+ // aapt resource value: 0x7F09009A
+ public const int scrollView = 2131296410;
// aapt resource value: 0x7F09009C
- public const int rv_topbar = 2131296412;
-
- // aapt resource value: 0x7F090013
- public const int Scale = 2131296275;
+ public const int search_badge = 2131296412;
// aapt resource value: 0x7F09009D
- public const int screen = 2131296413;
+ public const int search_bar = 2131296413;
// aapt resource value: 0x7F09009E
- public const int scroll = 2131296414;
-
- // aapt resource value: 0x7F0900A2
- public const int scrollable = 2131296418;
+ public const int search_button = 2131296414;
// aapt resource value: 0x7F09009F
- public const int scrollIndicatorDown = 2131296415;
+ public const int search_close_btn = 2131296415;
// aapt resource value: 0x7F0900A0
- public const int scrollIndicatorUp = 2131296416;
+ public const int search_edit_frame = 2131296416;
// aapt resource value: 0x7F0900A1
- public const int scrollView = 2131296417;
+ public const int search_go_btn = 2131296417;
+
+ // aapt resource value: 0x7F0900A2
+ public const int search_mag_icon = 2131296418;
// aapt resource value: 0x7F0900A3
- public const int search_badge = 2131296419;
+ public const int search_plate = 2131296419;
// aapt resource value: 0x7F0900A4
- public const int search_bar = 2131296420;
+ public const int search_src_text = 2131296420;
// aapt resource value: 0x7F0900A5
- public const int search_button = 2131296421;
+ public const int search_voice_btn = 2131296421;
// aapt resource value: 0x7F0900A6
- public const int search_close_btn = 2131296422;
+ public const int second = 2131296422;
// aapt resource value: 0x7F0900A7
- public const int search_edit_frame = 2131296423;
+ public const int select_dialog_listview = 2131296423;
+
+ // aapt resource value: 0x7F090009
+ public const int SHIFT = 2131296265;
// aapt resource value: 0x7F0900A8
- public const int search_go_btn = 2131296424;
+ public const int shortcut = 2131296424;
// aapt resource value: 0x7F0900A9
- public const int search_mag_icon = 2131296425;
+ public const int showCustom = 2131296425;
// aapt resource value: 0x7F0900AA
- public const int search_plate = 2131296426;
+ public const int showHome = 2131296426;
// aapt resource value: 0x7F0900AB
- public const int search_src_text = 2131296427;
+ public const int showTitle = 2131296427;
// aapt resource value: 0x7F0900AC
- public const int search_voice_btn = 2131296428;
+ public const int smallLabel = 2131296428;
// aapt resource value: 0x7F0900AD
- public const int second = 2131296429;
+ public const int snackbar_action = 2131296429;
// aapt resource value: 0x7F0900AE
- public const int select_dialog_listview = 2131296430;
-
- // aapt resource value: 0x7F09000E
- public const int SHIFT = 2131296270;
+ public const int snackbar_text = 2131296430;
// aapt resource value: 0x7F0900AF
- public const int shortcut = 2131296431;
+ public const int snap = 2131296431;
// aapt resource value: 0x7F0900B0
- public const int showCustom = 2131296432;
+ public const int spacer = 2131296432;
// aapt resource value: 0x7F0900B1
- public const int showHome = 2131296433;
+ public const int split_action_bar = 2131296433;
// aapt resource value: 0x7F0900B2
- public const int showTitle = 2131296434;
+ public const int src_atop = 2131296434;
// aapt resource value: 0x7F0900B3
- public const int smallLabel = 2131296435;
+ public const int src_in = 2131296435;
// aapt resource value: 0x7F0900B4
- public const int snackbar_action = 2131296436;
+ public const int src_over = 2131296436;
// aapt resource value: 0x7F0900B5
- public const int snackbar_text = 2131296437;
+ public const int srl_classics_arrow = 2131296437;
// aapt resource value: 0x7F0900B6
- public const int snap = 2131296438;
+ public const int srl_classics_center = 2131296438;
// aapt resource value: 0x7F0900B7
- public const int spacer = 2131296439;
+ public const int srl_classics_progress = 2131296439;
// aapt resource value: 0x7F0900B8
- public const int split_action_bar = 2131296440;
+ public const int srl_classics_title = 2131296440;
// aapt resource value: 0x7F0900B9
- public const int src_atop = 2131296441;
+ public const int srl_classics_update = 2131296441;
// aapt resource value: 0x7F0900BA
- public const int src_in = 2131296442;
+ public const int start = 2131296442;
// aapt resource value: 0x7F0900BB
- public const int src_over = 2131296443;
+ public const int status = 2131296443;
// aapt resource value: 0x7F0900BC
- public const int srl_classics_arrow = 2131296444;
+ public const int status_bar_latest_event_content = 2131296444;
+
+ // aapt resource value: 0x7F09000A
+ public const int STROKE = 2131296266;
// aapt resource value: 0x7F0900BD
- public const int srl_classics_center = 2131296445;
+ public const int submenuarrow = 2131296445;
// aapt resource value: 0x7F0900BE
- public const int srl_classics_progress = 2131296446;
+ public const int submit_area = 2131296446;
// aapt resource value: 0x7F0900BF
- public const int srl_classics_title = 2131296447;
+ public const int subtitle = 2131296447;
+
+ // aapt resource value: 0x7F09000B
+ public const int SYM = 2131296267;
// aapt resource value: 0x7F0900C0
- public const int srl_classics_update = 2131296448;
-
- // aapt resource value: 0x7F09000F
- public const int SSID = 2131296271;
-
- // aapt resource value: 0x7F090010
- public const int SSIDLabel = 2131296272;
+ public const int tabMode = 2131296448;
// aapt resource value: 0x7F0900C1
- public const int start = 2131296449;
+ public const int text = 2131296449;
// aapt resource value: 0x7F0900C2
- public const int startV1 = 2131296450;
-
- // aapt resource value: 0x7F0900C3
- public const int startV1V4 = 2131296451;
-
- // aapt resource value: 0x7F0900C4
- public const int startV4 = 2131296452;
-
- // aapt resource value: 0x7F0900C5
- public const int status = 2131296453;
+ public const int text2 = 2131296450;
// aapt resource value: 0x7F0900C6
- public const int status_bar_latest_event_content = 2131296454;
+ public const int textinput_counter = 2131296454;
// aapt resource value: 0x7F0900C7
- public const int stop = 2131296455;
+ public const int textinput_error = 2131296455;
- // aapt resource value: 0x7F090011
- public const int STROKE = 2131296273;
+ // aapt resource value: 0x7F0900C3
+ public const int textSpacerNoButtons = 2131296451;
+
+ // aapt resource value: 0x7F0900C4
+ public const int textSpacerNoTitle = 2131296452;
+
+ // aapt resource value: 0x7F0900C5
+ public const int text_input_password_toggle = 2131296453;
// aapt resource value: 0x7F0900C8
- public const int submenuarrow = 2131296456;
+ public const int time = 2131296456;
// aapt resource value: 0x7F0900C9
- public const int submit_area = 2131296457;
+ public const int timepicker = 2131296457;
// aapt resource value: 0x7F0900CA
- public const int subtitle = 2131296458;
-
- // aapt resource value: 0x7F090012
- public const int SYM = 2131296274;
+ public const int title = 2131296458;
// aapt resource value: 0x7F0900CB
- public const int tabMode = 2131296459;
+ public const int titleDividerNoCustom = 2131296459;
// aapt resource value: 0x7F0900CC
- public const int text = 2131296460;
+ public const int title_template = 2131296460;
// aapt resource value: 0x7F0900CD
- public const int text2 = 2131296461;
-
- // aapt resource value: 0x7F0900D1
- public const int textinput_counter = 2131296465;
-
- // aapt resource value: 0x7F0900D2
- public const int textinput_error = 2131296466;
+ public const int top = 2131296461;
// aapt resource value: 0x7F0900CE
- public const int textSpacerNoButtons = 2131296462;
+ public const int topPanel = 2131296462;
// aapt resource value: 0x7F0900CF
- public const int textSpacerNoTitle = 2131296463;
+ public const int touch_outside = 2131296463;
+
+ // aapt resource value: 0x7F09000D
+ public const int Translate = 2131296269;
// aapt resource value: 0x7F0900D0
- public const int text_input_password_toggle = 2131296464;
+ public const int tvTitle = 2131296464;
+
+ // aapt resource value: 0x7F0900D1
+ public const int tv_zxing_back = 2131296465;
+
+ // aapt resource value: 0x7F0900D2
+ public const int tv_zxing_flash = 2131296466;
// aapt resource value: 0x7F0900D3
- public const int time = 2131296467;
+ public const int tv_zxing_scan = 2131296467;
// aapt resource value: 0x7F0900D4
- public const int timepicker = 2131296468;
+ public const int uniform = 2131296468;
// aapt resource value: 0x7F0900D5
- public const int title = 2131296469;
+ public const int up = 2131296469;
// aapt resource value: 0x7F0900D6
- public const int titleDividerNoCustom = 2131296470;
+ public const int useLogo = 2131296470;
// aapt resource value: 0x7F0900D7
- public const int title_template = 2131296471;
+ public const int view_offset_helper = 2131296471;
// aapt resource value: 0x7F0900D8
- public const int top = 2131296472;
+ public const int visible = 2131296472;
// aapt resource value: 0x7F0900D9
- public const int topPanel = 2131296473;
+ public const int withText = 2131296473;
// aapt resource value: 0x7F0900DA
- public const int touch_outside = 2131296474;
-
- // aapt resource value: 0x7F090014
- public const int Translate = 2131296276;
+ public const int wrap_content = 2131296474;
// aapt resource value: 0x7F0900DB
- public const int tvTitle = 2131296475;
-
- // aapt resource value: 0x7F0900DC
- public const int tv_zxing_back = 2131296476;
-
- // aapt resource value: 0x7F0900DD
- public const int tv_zxing_flash = 2131296477;
-
- // aapt resource value: 0x7F0900DE
- public const int tv_zxing_scan = 2131296478;
-
- // aapt resource value: 0x7F0900DF
- public const int uniform = 2131296479;
-
- // aapt resource value: 0x7F0900E0
- public const int up = 2131296480;
-
- // aapt resource value: 0x7F0900E1
- public const int useLogo = 2131296481;
-
- // aapt resource value: 0x7F0900E2
- public const int view_offset_helper = 2131296482;
-
- // aapt resource value: 0x7F0900E3
- public const int visible = 2131296483;
-
- // aapt resource value: 0x7F0900E4
- public const int withText = 2131296484;
-
- // aapt resource value: 0x7F0900E5
- public const int wrap_content = 2131296485;
-
- // aapt resource value: 0x7F0900E6
- public const int year = 2131296486;
+ public const int year = 2131296475;
static Id()
{
@@ -3813,157 +3780,154 @@
public const int abc_select_dialog_material = 2131427354;
// aapt resource value: 0x7F0B001B
- public const int activity_elian = 2131427355;
+ public const int biometric_prompt_dialog_content = 2131427355;
// aapt resource value: 0x7F0B001C
- public const int biometric_prompt_dialog_content = 2131427356;
+ public const int design_bottom_navigation_item = 2131427356;
// aapt resource value: 0x7F0B001D
- public const int design_bottom_navigation_item = 2131427357;
+ public const int design_bottom_sheet_dialog = 2131427357;
// aapt resource value: 0x7F0B001E
- public const int design_bottom_sheet_dialog = 2131427358;
+ public const int design_layout_snackbar = 2131427358;
// aapt resource value: 0x7F0B001F
- public const int design_layout_snackbar = 2131427359;
+ public const int design_layout_snackbar_include = 2131427359;
// aapt resource value: 0x7F0B0020
- public const int design_layout_snackbar_include = 2131427360;
+ public const int design_layout_tab_icon = 2131427360;
// aapt resource value: 0x7F0B0021
- public const int design_layout_tab_icon = 2131427361;
+ public const int design_layout_tab_text = 2131427361;
// aapt resource value: 0x7F0B0022
- public const int design_layout_tab_text = 2131427362;
+ public const int design_menu_item_action_area = 2131427362;
// aapt resource value: 0x7F0B0023
- public const int design_menu_item_action_area = 2131427363;
+ public const int design_navigation_item = 2131427363;
// aapt resource value: 0x7F0B0024
- public const int design_navigation_item = 2131427364;
+ public const int design_navigation_item_header = 2131427364;
// aapt resource value: 0x7F0B0025
- public const int design_navigation_item_header = 2131427365;
+ public const int design_navigation_item_separator = 2131427365;
// aapt resource value: 0x7F0B0026
- public const int design_navigation_item_separator = 2131427366;
+ public const int design_navigation_item_subheader = 2131427366;
// aapt resource value: 0x7F0B0027
- public const int design_navigation_item_subheader = 2131427367;
+ public const int design_navigation_menu = 2131427367;
// aapt resource value: 0x7F0B0028
- public const int design_navigation_menu = 2131427368;
+ public const int design_navigation_menu_item = 2131427368;
// aapt resource value: 0x7F0B0029
- public const int design_navigation_menu_item = 2131427369;
+ public const int design_text_input_password_icon = 2131427369;
// aapt resource value: 0x7F0B002A
- public const int design_text_input_password_icon = 2131427370;
+ public const int hdl_gallery_banner_view_layout = 2131427370;
// aapt resource value: 0x7F0B002B
- public const int hdl_gallery_banner_view_layout = 2131427371;
+ public const int hdl_widget_activity_crop_image = 2131427371;
// aapt resource value: 0x7F0B002C
- public const int hdl_widget_activity_crop_image = 2131427372;
+ public const int hdl_widget_activity_geofence_round = 2131427372;
// aapt resource value: 0x7F0B002D
- public const int hdl_widget_activity_geofence_round = 2131427373;
+ public const int hdl_widget_air_button = 2131427373;
// aapt resource value: 0x7F0B002E
- public const int hdl_widget_air_button = 2131427374;
+ public const int hdl_widget_include_pickerview_topbar = 2131427374;
// aapt resource value: 0x7F0B002F
- public const int hdl_widget_include_pickerview_topbar = 2131427375;
+ public const int hdl_widget_layout_basepickerview = 2131427375;
// aapt resource value: 0x7F0B0030
- public const int hdl_widget_layout_basepickerview = 2131427376;
+ public const int hdl_widget_pickerview = 2131427376;
// aapt resource value: 0x7F0B0031
- public const int hdl_widget_pickerview = 2131427377;
+ public const int hdl_widget_pickerview_options = 2131427377;
// aapt resource value: 0x7F0B0032
- public const int hdl_widget_pickerview_options = 2131427378;
+ public const int hdl_widget_pickerview_time = 2131427378;
// aapt resource value: 0x7F0B0033
- public const int hdl_widget_pickerview_time = 2131427379;
+ public const int Main = 2131427379;
// aapt resource value: 0x7F0B0034
- public const int Main = 2131427380;
+ public const int notification_action = 2131427380;
// aapt resource value: 0x7F0B0035
- public const int notification_action = 2131427381;
+ public const int notification_action_tombstone = 2131427381;
// aapt resource value: 0x7F0B0036
- public const int notification_action_tombstone = 2131427382;
+ public const int notification_media_action = 2131427382;
// aapt resource value: 0x7F0B0037
- public const int notification_media_action = 2131427383;
+ public const int notification_media_cancel_action = 2131427383;
// aapt resource value: 0x7F0B0038
- public const int notification_media_cancel_action = 2131427384;
+ public const int notification_template_big_media = 2131427384;
// aapt resource value: 0x7F0B0039
- public const int notification_template_big_media = 2131427385;
+ public const int notification_template_big_media_custom = 2131427385;
// aapt resource value: 0x7F0B003A
- public const int notification_template_big_media_custom = 2131427386;
+ public const int notification_template_big_media_narrow = 2131427386;
// aapt resource value: 0x7F0B003B
- public const int notification_template_big_media_narrow = 2131427387;
+ public const int notification_template_big_media_narrow_custom = 2131427387;
// aapt resource value: 0x7F0B003C
- public const int notification_template_big_media_narrow_custom = 2131427388;
+ public const int notification_template_custom_big = 2131427388;
// aapt resource value: 0x7F0B003D
- public const int notification_template_custom_big = 2131427389;
+ public const int notification_template_icon_group = 2131427389;
// aapt resource value: 0x7F0B003E
- public const int notification_template_icon_group = 2131427390;
+ public const int notification_template_lines_media = 2131427390;
// aapt resource value: 0x7F0B003F
- public const int notification_template_lines_media = 2131427391;
+ public const int notification_template_media = 2131427391;
// aapt resource value: 0x7F0B0040
- public const int notification_template_media = 2131427392;
+ public const int notification_template_media_custom = 2131427392;
// aapt resource value: 0x7F0B0041
- public const int notification_template_media_custom = 2131427393;
+ public const int notification_template_part_chronometer = 2131427393;
// aapt resource value: 0x7F0B0042
- public const int notification_template_part_chronometer = 2131427394;
+ public const int notification_template_part_time = 2131427394;
// aapt resource value: 0x7F0B0043
- public const int notification_template_part_time = 2131427395;
+ public const int select_dialog_item_material = 2131427395;
// aapt resource value: 0x7F0B0044
- public const int select_dialog_item_material = 2131427396;
+ public const int select_dialog_multichoice_material = 2131427396;
// aapt resource value: 0x7F0B0045
- public const int select_dialog_multichoice_material = 2131427397;
+ public const int select_dialog_singlechoice_material = 2131427397;
// aapt resource value: 0x7F0B0046
- public const int select_dialog_singlechoice_material = 2131427398;
+ public const int srl_classics_footer = 2131427398;
// aapt resource value: 0x7F0B0047
- public const int srl_classics_footer = 2131427399;
+ public const int srl_classics_header = 2131427399;
// aapt resource value: 0x7F0B0048
- public const int srl_classics_header = 2131427400;
+ public const int support_simple_spinner_dropdown_item = 2131427400;
// aapt resource value: 0x7F0B0049
- public const int support_simple_spinner_dropdown_item = 2131427401;
-
- // aapt resource value: 0x7F0B004A
- public const int tooltip = 2131427402;
-
- // aapt resource value: 0x7F0B004C
- public const int zxingscanneractivitylayout = 2131427404;
-
- // aapt resource value: 0x7F0B004D
- public const int zxingscannerfragmentlayout = 2131427405;
+ public const int tooltip = 2131427401;
// aapt resource value: 0x7F0B004B
- public const int zxing_layout = 2131427403;
+ public const int zxingscanneractivitylayout = 2131427403;
+
+ // aapt resource value: 0x7F0B004C
+ public const int zxingscannerfragmentlayout = 2131427404;
+
+ // aapt resource value: 0x7F0B004A
+ public const int zxing_layout = 2131427402;
static Layout()
{
diff --git a/ZigbeeApp20200525/Home.Ios/Home.IOS.csproj b/ZigbeeApp20200525/Home.Ios/Home.IOS.csproj
index 75bf261..a9dfd1d 100644
--- a/ZigbeeApp20200525/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp20200525/Home.Ios/Home.IOS.csproj
@@ -227,6 +227,7 @@
<BundleResource Include="Resources\Phone\Instruct\AirSwitchCloudContr.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorTemperatureHumidity.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFangyueTwoButton.png" />
+ <BundleResource Include="Resources\Phone\Instruct\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelCurtain.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFangyueFourButton.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelFourButton.png" />
@@ -234,6 +235,7 @@
<BundleResource Include="Resources\Phone\Instruct\SensorCeilingGas.png" />
<BundleResource Include="Resources\Phone\Instruct\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorDoorWindow.png" />
+ <BundleResource Include="Resources\Phone\Instruct\ButtonPanelSimpleMultifunction.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorFire.png" />
<BundleResource Include="Resources\Phone\Instruct\SensorPMTwoPointFive.png" />
<BundleResource Include="Resources\Phone\Instruct\PanelThreeButton.png" />
@@ -693,6 +695,8 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelTwo.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpointSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485Selected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleMultifunctionSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelCurtainSelected2.png" />
<BundleResource Include="Resources\Phone\Device\DimmableLightSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPir.png" />
<BundleResource Include="Resources\Phone\Device\SensorFireSelected2.png" />
@@ -751,6 +755,7 @@
<BundleResource Include="Resources\Phone\Device\RelaySelected.png" />
<BundleResource Include="Resources\Phone\Device\Socket1Selected.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocks.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ConverterZb485Selected.png" />
<BundleResource Include="Resources\Phone\Device\ColorLightSelected.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitch.png" />
@@ -765,11 +770,14 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEightSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOneSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleMultifunctionSelected.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerEpoint.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperatureHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirConditionerEpointSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFiveSelected2.png" />
<BundleResource Include="Resources\Phone\Device\DryContactSelected.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironmentSelected.png" />
<BundleResource Include="Resources\Phone\Device\Converter.png" />
<BundleResource Include="Resources\Phone\Device\AirConditioner.png" />
<BundleResource Include="Resources\Phone\Device\SensorFireSelected.png" />
@@ -793,9 +801,11 @@
<BundleResource Include="Resources\Phone\Device\ButtonPanelThreeSelected.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEightSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\SensorPMTwoPointFiveSelected.png" />
<BundleResource Include="Resources\Phone\Device\IntelligentLocksSelected2.png" />
<BundleResource Include="Resources\Phone\Device\CurtainSiphonateSelected.png" />
<BundleResource Include="Resources\Phone\Device\SensorDoorWindow.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleMultifunction.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelOne.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEight.png" />
<BundleResource Include="Resources\Phone\Device\CurtainAutoOpenSelected2.png" />
@@ -821,6 +831,7 @@
<BundleResource Include="Resources\Phone\Device\DimmableLightOneLoad.png" />
<BundleResource Include="Resources\Phone\Device\SensorHumiditySelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorPirSelected2.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelSimpleEnvironmentSelected2.png" />
<BundleResource Include="Resources\Phone\Device\AirSwitchCloudContrSelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueTwo.png" />
<BundleResource Include="Resources\Phone\Device\RelayEpoint.png" />
@@ -829,6 +840,7 @@
<BundleResource Include="Resources\Phone\Device\SensorWater.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelThreeSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorSelected.png" />
+ <BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFreshAirSelected2.png" />
<BundleResource Include="Resources\Phone\Device\SensorTemperatureHumiditySelected.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueFourSelected2.png" />
<BundleResource Include="Resources\Phone\Device\ButtonPanelFangyueEnvironmentSelected2.png" />
@@ -876,14 +888,14 @@
<BundleResource Include="Resources\Phone\RoomIcon\20.jpg" />
<BundleResource Include="Resources\Phone\RoomIcon\18.jpg" />
<BundleResource Include="Resources\Phone\RoomIcon\19.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\4.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\5.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\4.JPG" />
+ <BundleResource Include="Resources\Phone\RoomIcon\5.JPG" />
<BundleResource Include="Resources\Phone\RoomIcon\7.jpg" />
<BundleResource Include="Resources\Phone\RoomIcon\6.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\2.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\3.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\1.jpg" />
- <BundleResource Include="Resources\Phone\RoomIcon\0.jpg" />
+ <BundleResource Include="Resources\Phone\RoomIcon\2.JPG" />
+ <BundleResource Include="Resources\Phone\RoomIcon\3.JPG" />
+ <BundleResource Include="Resources\Phone\RoomIcon\1.JPG" />
+ <BundleResource Include="Resources\Phone\RoomIcon\0.JPG" />
<BundleResource Include="Resources\Phone\Account\Code.png" />
<BundleResource Include="Resources\Phone\Account\Cancle.png" />
<BundleResource Include="Resources\Phone\Account\HidePwd.png" />
@@ -1002,12 +1014,14 @@
<BundleResource Include="Resources\Phone\RealDevice\Repeater.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorTemperatrueHumidity.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueFour.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\ButtonPanelSimpleEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\CommonDevice.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEnvironment.png" />
<BundleResource Include="Resources\Phone\RealDevice\AirConditionerZbGateway.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorCeilingGas.png" />
<BundleResource Include="Resources\Phone\RealDevice\IntelligentLocksH06C.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorDoorWindow.png" />
+ <BundleResource Include="Resources\Phone\RealDevice\ButtonPanelSimpleMultifunction.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelFangyueEight.png" />
<BundleResource Include="Resources\Phone\RealDevice\SensorFire.png" />
<BundleResource Include="Resources\Phone\RealDevice\ButtonPanelThree.png" />
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Language.ini b/ZigbeeApp20200525/Home.Ios/Resources/Language.ini
index 4127b95..aad48d3 100755
--- a/ZigbeeApp20200525/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Language.ini
@@ -253,7 +253,7 @@
249=鎮ㄧ殑甯稿紑妯″紡灏嗚鍙栨秷
250=淇濇寔甯稿紑
251=纭鍙栨秷
-252=(鏈鎿嶄綔浠呬负鍗曟鍙栨秷锛岃嫢闇�瑕佸仠姝㈡墽琛岃嚜鍔ㄥ寲锛岃閫夋嫨鍒嗙被-鑷姩鍖栬繘琛岃缃�)
+252=(鏈鎿嶄綔浠呬负鍗曟鍙栨秷锛岃嫢闇�瑕佸仠姝㈡墽琛岃嚜鍔ㄥ寲锛岃鍒板父寮�鑷姩鍖栬缃�)
253=鑾峰彇闂ㄩ攣甯稿紑妯″紡澶辫触
254=鎵撳紑闂ㄩ攣甯稿紑妯″紡鎴愬姛
255=鎵撳紑闂ㄩ攣甯稿紑妯″紡澶辫触
@@ -324,6 +324,11 @@
321=閲嶅害姹℃煋
322=涓ラ噸姹℃煋
323=鑷姩鍖栧叧闂�愰棬閿佸父寮�妯″紡銆戯紝闂ㄩ攣宸插叧
+324=鍏ョ綉
+;娉ㄦ剰鈥滃叆缃戔�濈殑鑻辨枃鈥淐onnection",鍥犱负灞忓箷涓婃槸杩欐牱鏄剧ず鐨�
+325=鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
+326=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
+327=闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
5097=鍙栨秷
5098=纭畾
@@ -1990,6 +1995,8 @@
30038=鏂规偊鏂伴灏忔ā鍧�
30039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
30040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+30041=绠�绾﹀鍔熻兘闈㈡澘
+30042=绠�绾︾幆澧冮潰鏉�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
40000=閬槼
@@ -2055,6 +2062,8 @@
50038=鏂伴鎺у埗灏忔ā鍧�
50039=Zigbee鍚搁《鐕冩皵浼犳劅鍣�
50040=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+50041=绠�绾﹀鍔熻兘闈㈡澘
+50042=绠�绾︾幆澧冮潰鏉�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄ā鍧桰D鐨勮澶囩被鍨嬪悕瀛�,浠�60000寮�濮�.娉�:瀹冨苟涓嶉渶瑕佸啀R.cs鏂囦欢涓畾涔夆槄鈽呪槄鈽�
60000=浼犳劅鍣�
@@ -2097,4 +2106,6 @@
70023=涓户鍣�
70024=鏅鸿兘绌哄紑
70025=鍚搁《鐕冩皵浼犳劅鍣�
-70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
\ No newline at end of file
+70026=PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
+70027=绠�绾﹀鍔熻兘闈㈡澘
+70028=绠�绾︾幆澧冮潰鏉�
\ No newline at end of file
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelCurtainSelected2.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelCurtainSelected2.png
new file mode 100644
index 0000000..6e4c3ab
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelCurtainSelected2.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelFangyueFreshAirSelected2.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelFangyueFreshAirSelected2.png
new file mode 100644
index 0000000..400f73c
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelFangyueFreshAirSelected2.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironment.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironment.png
new file mode 100644
index 0000000..b600be5
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironment.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironmentSelected.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironmentSelected.png
new file mode 100644
index 0000000..470608c
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironmentSelected.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironmentSelected2.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironmentSelected2.png
new file mode 100644
index 0000000..0432723
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleEnvironmentSelected2.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunction.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunction.png
new file mode 100644
index 0000000..e295871
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunction.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunctionSelected.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunctionSelected.png
new file mode 100644
index 0000000..347ffc4
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunctionSelected.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunctionSelected2.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunctionSelected2.png
new file mode 100644
index 0000000..e6c8858
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/ButtonPanelSimpleMultifunctionSelected2.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFiveSelected.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFiveSelected.png
new file mode 100644
index 0000000..61f33fa
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFiveSelected.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFiveSelected2.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFiveSelected2.png
new file mode 100644
index 0000000..1628d3d
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Device/SensorPMTwoPointFiveSelected2.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Instruct/ButtonPanelSimpleEnvironment.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Instruct/ButtonPanelSimpleEnvironment.png
new file mode 100644
index 0000000..0d3e5d7
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Instruct/ButtonPanelSimpleEnvironment.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/Instruct/ButtonPanelSimpleMultifunction.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Instruct/ButtonPanelSimpleMultifunction.png
new file mode 100644
index 0000000..1f24e24
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/Instruct/ButtonPanelSimpleMultifunction.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/RealDevice/ButtonPanelSimpleEnvironment.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/RealDevice/ButtonPanelSimpleEnvironment.png
new file mode 100644
index 0000000..eb8b51e
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/RealDevice/ButtonPanelSimpleEnvironment.png
Binary files differ
diff --git a/ZigbeeApp20200525/Home.Ios/Resources/Phone/RealDevice/ButtonPanelSimpleMultifunction.png b/ZigbeeApp20200525/Home.Ios/Resources/Phone/RealDevice/ButtonPanelSimpleMultifunction.png
new file mode 100644
index 0000000..981b1f5
--- /dev/null
+++ b/ZigbeeApp20200525/Home.Ios/Resources/Phone/RealDevice/ButtonPanelSimpleMultifunction.png
Binary files differ
diff --git a/ZigbeeApp20200525/Shared/Common/CommonPage.cs b/ZigbeeApp20200525/Shared/Common/CommonPage.cs
old mode 100755
new mode 100644
index da9f199..cc27cc2
--- a/ZigbeeApp20200525/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp20200525/Shared/Common/CommonPage.cs
@@ -50,7 +50,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.0.20051901";
+ public static string CodeIDString = "1.0.20052901";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
diff --git a/ZigbeeApp20200525/Shared/Common/Device.cs b/ZigbeeApp20200525/Shared/Common/Device.cs
index 6fc33f2..87b37f9 100644
--- a/ZigbeeApp20200525/Shared/Common/Device.cs
+++ b/ZigbeeApp20200525/Shared/Common/Device.cs
@@ -978,6 +978,47 @@
return list;
}
+ /// <summary>
+ /// 鏍规嵁MAC鍦板潃,鑾峰彇绠�绾﹂潰鏉垮叏閮ㄥ洖璺殑璁惧瀵硅薄
+ /// </summary>
+ /// <param name="listDevice"></param>
+ /// <returns></returns>
+ public List<CommonDevice> GetMutilfunctionPanelByMac(List<CommonDevice> listDevice, bool sort = true)
+ {
+ //鍜屽姜鍝ャ�佽澶囧拰浜у搧閮ㄥ悓浜嬬‘璁わ細
+ //绠�绾﹀鍔熻兘闈㈡澘[涓嶆樉绀哄浣欑殑鍥炶矾锛屽彧鏄剧ず鎼哄甫鐨�2涓户鐢靛櫒鍜�1涓俯婀垮害浼犳劅鍣�
+ var list = new List<CommonDevice>();
+ foreach (var dev in listDevice)
+ {
+ if (dev.Type == DeviceType.TemperatureSensor)
+ {
+ if (dev.DeviceEpoint == 64)
+ {
+ list.Add(dev);
+ }
+ }
+ else if (dev.Type == DeviceType.OnOffOutput)
+ {
+ list.Add(dev);
+ }
+ }
+
+ if (sort == false)
+ {
+ return list;
+ }
+ list.Sort((obj1, obj2) =>
+ {
+ if (obj1.DeviceEpoint > obj2.DeviceEpoint)
+ {
+ return 1;
+ }
+ return -1;
+ });
+
+ return list;
+ }
+
/// <summary>
/// 鏍规嵁MAC鍦板潃,鑾峰彇鍏ㄩ儴鍥炶矾鐨勮澶囧璞�(寮哄埗鎺掑簭)
/// </summary>
@@ -2872,7 +2913,9 @@
this.dicDeviceModelIdEnum["MPFA/TILE-ZB.18"] = "250-200-60003";//鏂规偊鏂伴闈㈡澘
this.dicDeviceModelIdEnum["MPTE3/TILE-ZB.18"] = "253-200-60003";//鏂规偊鐜闈㈡澘
this.dicDeviceModelIdEnum["MP2W/TILE-ZB.18"] = "256-200-60003";//绐楀笜闈㈡澘
- this.dicDeviceModelIdEnum["MPTL4C/S-ZB.18"] = "212-200-60003";//绠�绾﹀鍔熻兘闈㈡澘
+ this.dicDeviceModelIdEnum["MPTL4C/S-ZB.18"] = "212-200-60003";//绠�绾﹀鍔熻兘闈㈡澘
+ this.dicDeviceModelIdEnum["MPTE3/S-ZB.18"] = "230-200-60003";//绠�绾︾幆澧冮潰鏉�
+
//=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
this.dicDeviceModelIdEnum["MSPIR01-ZB.10"] = "1200-1200-60000";//pir浼犳劅鍣�220
@@ -3051,7 +3094,10 @@
/// 绠�绾﹀鍔熻兘闈㈡澘 闀滃儚ID锛�212
/// </summary>
ButtonPanel_SimpleMultifunction = 212,
-
+ /// <summary>
+ /// 绠�绾︾幆澧冮潰鏉�
+ /// </summary>
+ ButtonPanel_SimpleEnvironment = 230,
//=========鈽呪槄PIR浼犳劅鍣ㄧ被(1200-1299)鈽呪槄=========
/// <summary>
/// 浼犳劅鍣�
diff --git a/ZigbeeApp20200525/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp20200525/Shared/Phone/Device/Logic/SkipView.cs
old mode 100644
new mode 100755
index cb5f80f..697ae26
--- a/ZigbeeApp20200525/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp20200525/Shared/Phone/Device/Logic/SkipView.cs
@@ -8,19 +8,18 @@
namespace Shared.Phone.Device.Logic
{
- public class SkipView : FrameLayout
+ public class SkipView:FrameLayout
{
/// <summary>
/// 鍏跺畠鐣岄潰璺宠繘鏉ョ殑鍏ュ彛
/// </summary>
- public async static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
+ public async static void SkipAddLogic(int intvalue, DoorLock doorLock = null, UserCenter.MemberInfoRes accountObj = null)
{
/// 0.姝ｅ父鑷姩鍖�;1.闂ㄩ攣鑷姩鍖�;2.Sone闂ㄩ攣;
switch (intvalue)
{
case 0:
{
-
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板姝ｅ父鑷姩鍖栧叆鍙�
Common.Logic.CurrentLogic = new Common.Logic();
@@ -31,7 +30,6 @@
UserView.HomePage.Instance.AddChidren(addLogicPage);
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
-
}
break;
case 1:
@@ -66,7 +64,7 @@
}
-
+
#region 鈼� 鑷姩鍖朹_________________________
/// <summary>
/// 鑷姩鍖栧姛鑳戒唬鐮佸叆鍙�
@@ -323,7 +321,7 @@
/// <param name="refresview">Refresview.</param>
private static async void Automationview(VerticalRefreshLayout refresview, bool no)
{
-
+
refresview.RemoveAll();
if (Common.Logic.LogicList.Count == 0 && no == false)
{
@@ -412,7 +410,7 @@
//瀹炵幇android鏄剧ず閫昏緫鍒楄〃鐨勫渾瑙�;
fLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
logicRowlayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft);
-
+
}
i++;
var logicnameBtn = new Button
@@ -764,37 +762,32 @@
/// </summary>
public static async System.Threading.Tasks.Task<int> Exist(int valueInt, ZigBee.Device.DoorLock doorLock)
{
+
int exist = 0;
- var Idlist = await Send.GetLogicId(valueInt);
- if (Idlist.Count != 0)
+ var IdList = await Send.GetLogicId(valueInt);
+ if (IdList.Count != 0)
{
- //榛樿鍙栫涓�涓�昏緫ID
- var id = Idlist[0];
- if (valueInt != 3)
+ for (int i = 0; i < IdList.Count; i++)
{
- exist = id;
- }
- else
- {
- var logic = await Send.GetLogic(id, 3);
+ var id = IdList[i];
+ var logic = await Send.GetLogic(id, valueInt);
if (logic != null)
{
if (ExistLogic(logic, doorLock))
{
exist = id;
- }
- else
- {
- exist = 0;
+ ///鎵惧埌閫�鍑�
+ break;
}
}
+
}
}
return exist;
}
///<summary>
- ///鑾峰彇闂ㄩ攣閫昏緫淇℃伅
+ ///鑾峰彇闂ㄩ攣鏃舵晥鎬ч�昏緫淇℃伅
/// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
/// </summary>
public static async System.Threading.Tasks.Task<Common.Logic> GetLogicIfon(ZigBee.Device.DoorLock doorLock)
@@ -818,14 +811,12 @@
///鍒犻櫎璇ラ棬閿佹墍鏈夋椂鏁堟�ц嚜鍔ㄥ寲
/// 杩斿洖鍊硷細true鎴愬姛;false澶辫触;
/// </summary>
- public static async System.Threading.Tasks.Task<bool> GetLogicAll(ZigBee.Device.DoorLock doorLock)
+ public static async System.Threading.Tasks.Task<bool> DelAllLogic(ZigBee.Device.DoorLock doorLock)
{
bool _if = false;
var Idlist = await Send.GetLogicId(3);
if (Idlist.Count != 0)
{
- _if = true;
-
for (int i = 0; i < Idlist.Count; i++)
{
int id = Idlist[i];
@@ -836,7 +827,16 @@
{
//鏈潵鍙湁涓�鏉℃椂鏁堟�ц嚜鍔ㄥ寲锛�
//闃叉鐗规畩鎯呭喌,鎵惧埌灏卞垹闄ゆ帀;
+ //var valueInt = await Send.DelLogic(id);
+ //if (valueInt == 0)
+ //{
+ // _if = true;
+ //}
+ //(鑰冭檻鎬ц兘榛樿鍒犻櫎鎴愬姛锛岀洿鎺ヨ繑鍥炴垚鍔熺粨鏋渢rue)
+ _if = true;
Send.DelLogic(id);
+
+
}
}
}
@@ -852,7 +852,7 @@
{
for (int j = 0; j < logic.Accounts.Count; j++)
{
- //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
+ //Option4鏄澶噈ac锛�
if (logic.Accounts[j]["Option4"].ToString() == doorLock.DeviceAddr)
{
//鏌ユ壘鏄惁鏄偅涓棬閿侊紱
@@ -866,3 +866,4 @@
}
}
+
diff --git a/ZigbeeApp20200525/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp20200525/Shared/Phone/Device/Logic/SoneLogicList.cs
index 3278852..98ae30c 100644
--- a/ZigbeeApp20200525/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp20200525/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -17,6 +17,8 @@
}
/// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
public Action<bool> action;
+ // 鍒锋柊涓婃姤鐣岄潰鐨凙ction
+ public Action<string, bool> updateCurrentDoorlockActionTemp;
///绗簩鍧楃涓�绾х埗鎺т欢
FrameLayout fLayout = new FrameLayout();
///绗笁鍧楃涓�绾х埗鎺т欢
@@ -32,15 +34,12 @@
/// </summary>
public int timeValue = 0;
/// <summary>
- /// 鏍囪鏄剧ず鎵ц鏃ユ湡(鐢ㄧ綉鍏崇殑锛岃繕鏄敤绯荤粺鐨勬椂闂�)
+ /// 璁板綍鏃堕棿鎴�
/// </summary>
- public bool _if = false;
- /// <summary>
- /// 鏃堕棿鎴�
- /// </summary>
- public long timeLong = 0;
+ public int timeLong = 0;
public async void Show()
{
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
TopView view = new TopView();
@@ -48,7 +47,7 @@
view.toptitleNameBtn.TextID = MyInternationalizationString.openmode;
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
- UserView.HomePage.Instance.ScrollEnabled = true;
+ UserView.HomePage.Instance.ScrollEnabled = true;
//鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
soneLogicList = null;
this.RemoveFromParent();
@@ -66,8 +65,7 @@
};
this.AddChidren(middle);
#endregion
- //鏄父寮�妯″紡鍐嶅幓璇诲彇
-
+ //鏄父寮�妯″紡鍐嶅幓璇诲彇
if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
{
//杩涙潵鏇存柊涓�娆�
@@ -78,10 +76,9 @@
try
{
//杩涙潵鏇存柊涓�娆″��
- logicId = logic.LogicId;
+ logicId = logic.LogicId;
timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]) / 3600;
- timeLong = long.Parse(logic.Conditions[0]["TriggerTime"]);
-
+ timeLong = int.Parse(logic.Conditions[0]["TriggerTime"]);
}
catch { }
}
@@ -172,10 +169,10 @@
actionsInfo.Add("LinkType", 8);
actionsInfo.Add("DeviceAddr", Send.CurrentDoorLock.DeviceAddr);
actionsInfo.Add("Epoint", "200");
- actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
- Dictionary<string, string> accounts = new Dictionary<string, string>();
+ actionsInfo.Add("PassData", "055704010113");//榛樿闂ㄩ攣甯稿叧
+ Dictionary<string, string> accounts = new Dictionary<string, string>();
accounts.Add("Type", "8");
- accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
+ accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr.ToString());//鐢ㄤ簬鍒ゆ柇璇嗗埆鏄摢涓棬閿�;
accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
//new涓�涓柊閫昏緫瀵硅薄锛�
//鏂板闂ㄩ攣甯稿紑妯″紡鑷姩鍖栧叆鍙ｏ紱
@@ -184,7 +181,7 @@
Common.Logic.CurrentLogic.LogicType = 2;//鏍囪閫昏緫绫诲瀷
Common.Logic.CurrentLogic.LogicName = Language.StringByID(MyInternationalizationString.openmode);
Common.Logic.CurrentLogic.Conditions.Add(timeConditionsInfo);//娣诲姞鏉′欢
- Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//娣诲姞鐩爣
+ Common.Logic.CurrentLogic.Actions.Add(actionsInfo);//娣诲姞鐩爣
Common.Logic.CurrentLogic.Accounts.Add(accounts);
var oneLogic = new OneLogic();
UserView.HomePage.Instance.AddChidren(oneLogic);
@@ -224,24 +221,10 @@
});
}
catch { }
- };
-
- UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, _bool) =>
- {
- var key = Send.CurrentDoorLock.DeviceAddr + Send.CurrentDoorLock.DeviceEpoint;
- if (DoorlockKey == key)
- {
- try
- {
- Application.RunOnMainThread(() =>
- {
- Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
- ModeView();
- });
- }
- catch { }
- }
- };
+ };
+
+ updateCurrentDoorlockActionTemp = (DoorlockKey, _bool) =>
{
var key = Send.CurrentDoorLock.DeviceAddr;
if (DoorlockKey == key)
{
try
{
Application.RunOnMainThread(() =>
{
Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
ModeView();
});
}
catch { }
}
};
+ UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += updateCurrentDoorlockActionTemp;
}
/// <summary>
/// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
@@ -300,7 +283,6 @@
Send.DelLogic(logicId);
}
Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
- _if = false;
ModeView();
}
else
@@ -346,23 +328,29 @@
int hour = 0;
int minute = 0;
- if (_if)
+ if (timeLong != 0)
{
- ///绗竴娆¤繘鏉ヨ鍙栫綉鍏虫椂闂达紱
+ ///璇诲彇缃戝叧鏃堕棿锛�
var datetime = GetLocalTime(timeLong);
///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
year = datetime.Year.ToString();//閭ｄ竴骞�
month = datetime.Month.ToString();//閭ｄ竴鏈�
- days = int.Parse(datetime.ToString("dd"));//閭ｄ竴澶�
- hour = int.Parse(datetime.ToString("HH"));//灏忔椂
+ var d = int.Parse(datetime.ToString("dd"));//閭ｄ竴澶�
+ var h = int.Parse(datetime.ToString("HH"));//灏忔椂
+ int dayInt = (h + timeValue) / 24;//璁剧疆鏃堕棿+褰撳墠绯荤粺鏃堕棿鏄惁瓒呭嚭24灏忔椂
+ hour = (h + timeValue) % 24;//璁剧疆鏃堕棿+褰撳墠绯荤粺鏃堕棿鏄惁瓒呭嚭24灏忔椂鍓╀笅澶氬皯灏忔椂
+ days = d + dayInt;//褰撳墠绯荤粺澶╂暟+鎵ц鍚庡ぉ鏁�
minute = datetime.Minute;//鍒嗛挓
}
else
{
- ///鍦ㄥ綋鍓嶇晫闈㈢紪杈戞樉绀虹郴缁熸椂闂�(涓嶈兘姣忎竴娆＄紪杈戦兘鍘荤綉鍏虫嬁鏁版嵁)
- year = DateTime.Now.Year.ToString();//閭ｄ竴骞�
+
+
+
+
+ ///璇诲彇绯荤粺鏃堕棿
year = DateTime.Now.Year.ToString();//閭ｄ竴骞�
month = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
var d = DateTime.Now.ToString("dd");//閭ｄ竴澶�
var h = int.Parse(DateTime.Now.ToString("HH"));//灏忔椂
@@ -432,6 +420,7 @@
{///鍐嶆纭
LogicView.TipView.ShowInputTip(true, async (str) =>
{///纭鍙戦�佸懡浠�
+
CommonPage.Loading.Start();
try
{
@@ -445,7 +434,7 @@
else
{
///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
- SkipView.GetLogicAll(Send.CurrentDoorLock);//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
+ SkipView.DelAllLogic(Send.CurrentDoorLock);//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
if (addResult == 0)
{
@@ -460,9 +449,8 @@
logicId = addResult;
timeValue = int.Parse(str);
Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
- _if = false;
- ModeView();
- ///娣诲姞APP寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
+ ModeView();
+ ///娣诲姞APP寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog(Send.CurrentDoorLock, 9001, string.Empty);
}
@@ -522,10 +510,10 @@
if (logic.LogicType != 2)
{
continue;
- }
- if (SkipView.ExistLogic(logic, Send.CurrentDoorLock))
- {
- Common.Logic.SoneLogicList.Add(logic);
+ }
+ if (SkipView.ExistLogic(logic, Send.CurrentDoorLock))
+ {
+ Common.Logic.SoneLogicList.Add(logic);
}
}
}
@@ -730,16 +718,13 @@
/// </summary>
/// <param name="unixTimeStamp">鏃堕棿鎴�</param>
/// <returns></returns>
- public DateTime GetLocalTime(long unixTimeStamp)
+ public DateTime GetLocalTime(int unixTimeStamp)
{
- //DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
- //long lTime = long.Parse(unixTimeStamp + "0000000");
- //TimeSpan toNow = new TimeSpan(lTime);
- //DateTime dtResult = dtStart.Add(toNow);
- //return dtResult;
-
- System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)); // 褰撳湴鏃跺尯
- return startTime.AddMilliseconds(unixTimeStamp);
+ DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
+ long lTime = long.Parse(unixTimeStamp + "0000000");
+ TimeSpan toNow = new TimeSpan(lTime);
+ DateTime dtResult = dtStart.Add(toNow);
+ return dtResult;
}
}
diff --git a/ZigbeeApp20200525/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs b/ZigbeeApp20200525/Shared/Phone/MainPage/ControlForm/DevicePmSensorDetailCardForm.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index 85a1f1f..aba0955 100644
--- a/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -1295,7 +1295,7 @@
/// <summary>
/// 鑷姩鍖栧父寮�鏃堕棿鍙樻洿涓哄垎閽�,鑰屼笉鏄皬鏃� 1->寮哄埗鍙樻洿涓哄垎閽�
/// </summary>
- public int DoorLockNomallyOpenTimeMode = 1;
+ public int DoorLockNomallyOpenTimeMode = 0;
}
#endregion
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index 63c7c0b..ac89df4 100644
--- a/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -621,7 +621,7 @@
//鏇存柊闂ㄩ攣娑夊強鐨勫父寮�/甯稿叧鐨勭晫闈�
if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)
{
- UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(device.DeviceAddr + device.DeviceEpoint, true);
+ UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(device.DeviceAddr, true);
}
});
}
@@ -845,16 +845,13 @@
{
//鎻愮ず闂ㄩ攣宸茬粡澶辨晥
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.NormallyClosed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+
+ //鏇存柊闂ㄩ攣娑夊強鐨勫父寮�/甯稿叧鐨勭晫闈�
+ if (UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction != null)
+ {
+ UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction(deviceAddr, false);
+ }
});
-
- //鏇存柊闂ㄩ攣鐨勬繁搴︽帶鍒堕〉
- ControlCommonResourse.UpdateDoorLockStatusAction?.Invoke(false);
-
- //閫昏緫鎵ц鐨勫け鏁堣鏇存柊鐘舵��
- if (DoorLock.DoorLockCommonInfo.LogicAction != null)
- {
- DoorLock.DoorLockCommonInfo.LogicAction(false);
- }
});
}
}
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/CommonBase/Resourse/ControlCommonResourse.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
old mode 100755
new mode 100644
index 7edae6d..4010383
--- a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceFunctionSettionForm.cs
@@ -276,8 +276,8 @@
private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
{
//鑾峰彇鎸夌粍鍒嗛厤鐨勮澶�
- var listIcon = this.GetAllDeviceGroup();
-
+ var listIcon = this.GetAllDeviceGroup();
+
var frameBorder = new FrameLayout();
frameBorder.Y = Application.GetRealHeight(147);
frameBorder.Gravity = Gravity.CenterHorizontal;
@@ -355,7 +355,7 @@
//璁＄畻鐪熷疄楂樺害
int realHeight = this.GetPictrueRealSize(58 + 58);//涓婁笅闂磋窛
realHeight += frameBack.ChildrenCount * this.GetPictrueRealSize(124);//鍦嗗湀楂樺害
- realHeight += (frameBack.ChildrenCount-1) * this.GetPictrueRealSize(60);//鍦嗗湀闂磋窛
+ realHeight += (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(60);//鍦嗗湀闂磋窛
if (realHeight > frameBack.Height)
{
//鍙樻洿楂樺害
@@ -426,7 +426,19 @@
{
//鍙鍚屼竴绉嶇被鍨嬬殑
continue;
+ }
+
+ //鑾峰彇璁惧灞炰簬銆愮畝绾﹀鍔熻兘闈㈡澘銆�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)
+ {
+ //绠�绾﹀鍔熻兘闈㈡澘绗�1鍥炶矾鏄竴涓粦瀹氭俯婀垮害浼犳劅鍣ㄧ绫诲瀷锛屼笉鏄湡鐨勬俯婀垮害鐨勪紶鎰熷櫒锛岄渶瑕佸睆钄芥帀
+ continue;
+ }
}
+
listRelay.Add(device);
if (device.DeviceEpoint == deviceObj.DeviceEpoint)
{
@@ -466,12 +478,11 @@
listIcon.Insert(0, listTemp);
}
return listIcon;
- }
-
+ }
#endregion
-
+
#region 鈻� 鍥炶矾閫夋嫨___________________________
-
+
/// <summary>
/// 鍥炶矾閫夋嫨浜嬩欢
/// </summary>
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index fefadb2..269b005 100755
--- a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -316,20 +316,38 @@
int heightValue = ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace;
var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
if (isShow == true)
- {
- //灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
- heightValue = (listDevice.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
- //鏍囬鑷繁灏辨槸涓�涓瓙鎺т欢
- if (rowInfo.frameTable.ChildrenCount == 1)
- {
- //鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
- var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
- foreach (CommonDevice info in listDevice)
- {
- //鍔犺浇瀹冪殑鍒楄〃
- this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);
+ {
+ //鑾峰彇杩欎竴鍫嗚澶囨椂灞炰簬浠�涔堢被鍨嬬殑
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(listDevice);
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ var listTemp = Common.LocalDevice.Current.GetMutilfunctionPanelByMac(listDevice);
+ //灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
+ heightValue = (listTemp.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
+ //鏍囬鑷繁灏辨槸涓�涓瓙鎺т欢
+ if (rowInfo.frameTable.ChildrenCount == 1)
+ {
+ foreach (CommonDevice info in listTemp)
+ {
+ //鍔犺浇瀹冪殑鍒楄〃
+ this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);
+ }
+ }
+ }
+ else
+ {
+ //灞曞紑妯″紡鏃讹紝鎵╁ぇ渚濇嵁涓�:瀹冩湁鍑犱釜瀛愭帶浠�
+ heightValue = (listDevice.Count + 1) * (ControlCommonResourse.ListViewRowHeight + rowInfo.frameTable.rowSpace);
+ //鏍囬鑷繁灏辨槸涓�涓瓙鎺т欢
+ if (rowInfo.frameTable.ChildrenCount == 1)
+ {
+ foreach (CommonDevice info in listDevice)
+ {
+ //鍔犺浇瀹冪殑鍒楄〃
+ this.AddDeviceDetailRow(rowInfo.frameTable, info, deviceEnumInfo);
+ }
}
- }
+ }
}
//鑷韩楂樺害鍙樻洿
rowInfo.frameTable.Height = heightValue;
@@ -447,8 +465,8 @@
{
var form = new DeviceFunctionSettionForm();
form.AddForm(device, true);
- }
- //鏂伴闈㈡澘
+ }
+ //鏂伴闈㈡澘
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFreshAir)
{
//鏂规偊鏂伴闈㈡澘鐨勬寜閿厤缃�
@@ -464,6 +482,7 @@
form.AddForm(device, true);
}
}
+
//鏂规偊闈㈡澘
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueTwo
|| deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_FangyueFour
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
old mode 100755
new mode 100644
index 8082a1b..c00711e
--- a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -32,7 +32,23 @@
/// <summary>
/// 涓ぎ绌鸿皟鐨勭増鏈帶浠�
/// </summary>
- private NormalViewControl btnAirConditionerVersion = null;
+ private NormalViewControl btnAirConditionerVersion = null;
+ /// <summary>
+ /// 绠�绾﹂潰鏉跨粦瀹氱殑娓╁害鐩爣鍚嶅瓧
+ /// </summary>
+ private string bindTemperatureName = string.Empty;
+ /// <summary>
+ /// 绠�绾﹂潰鏉跨粦瀹氱殑婀垮害鐩爣鍚嶅瓧
+ /// </summary>
+ private string bindHumidityName = string.Empty;
+ /// <summary>
+ /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸娓╁害
+ /// </summary>
+ private CommonDevice bindTemperatureDev;
+ /// <summary>
+ /// 绠�绾﹂潰鏉跨粦瀹氳缁戠洰鏍囨槸婀垮害
+ /// </summary>
+ private CommonDevice bindHumidityDev;
#endregion
@@ -247,6 +263,20 @@
{
//娣诲姞銆愬鍐呮満璁剧疆銆戣(绌鸿皟涓撶敤)
this.AddIndoorUnitSettionRow();
+ }
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ //绠�绾﹀鍔熻兘闈㈡澘
+ this.AddIBindRow();
+ this.AddFunctionSettionRow();
+ this.AddHumiditySourceRow();
+ this.AddTemperatureSensorRow();
+
+ }
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleEnvironment)
+ {
+ //娣诲姞銆愮粦瀹氱洰鏍囥�戣(绠�绾︾幆澧冮潰鏉跨敤)
+ this.AddSimplePanelSettionRow();
}
else
{
@@ -529,8 +559,32 @@
var form = new DevicePanel.PanelButtonSettionForm();
form.AddForm(listNewDevice[0]);
};
+ }
+
+ #region 鈻� 绠�绾︾幆澧�(闈㈡澘)_____________________
+
+ /// <summary>
+ /// 娣诲姞銆愭寜閿缃�戣绠�绾︾幆澧�(闈㈡澘)
+ /// </summary>
+ private void AddSimplePanelSettionRow()
+ {
+ //鎸夐敭璁剧疆
+ string caption = Language.StringByID(R.MyInternationalizationString.uPanelSettion);
+ var btnFunction = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(btnFunction);
+ btnFunction.AddLeftCaption(caption, 600);
+ //鍚戝彸鍥炬爣
+ btnFunction.AddRightArrow();
+ //搴曠嚎
+ btnFunction.AddBottomLine();
+ btnFunction.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new DeviceBind.PanelSimpleEnvironmentTargetsForm();
+
+ };
}
+ #endregion
#endregion
#region 鈻� 鎸夐敭璁剧疆(鏂规偊)_____________________
@@ -921,12 +975,120 @@
var form = new DeviceAirConditioner.IndoorUnitListForm();
form.AddForm(listNewDevice[0].DeviceAddr);
};
+ }
+ #endregion
+
+ #region 鈻� 绠�绾﹀鍔熻兘闈㈡澘鐢╛__________________
+ /// <summary>
+ /// 娣诲姞銆愮粦瀹氱洰鏍囥�戣
+ /// </summary>
+ private void AddIBindRow()
+ {
+ string bindTargets = Language.StringByID(R.MyInternationalizationString.uBindTargets);
+ var btnBindTargets = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(btnBindTargets);
+ btnBindTargets.AddLeftCaption(bindTargets, 600);
+ //鍚戝彸鍥炬爣
+ btnBindTargets.AddRightArrow();
+ //搴曠嚎
+ btnBindTargets.AddBottomLine();
+ btnBindTargets.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new DeviceBind.PanelSimpleMutilfunctionTargetsForm();
+ };
+ }
+
+ /// <summary>
+ /// 婀垮害鏉ユ簮琛�
+ /// </summary>
+ private void AddHumiditySourceRow()
+ {
+ //婀垮害
+ var rowHumidity = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowHumidity);
+ rowHumidity.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.HumiditySource), 600);
+ //搴曠嚎
+ rowHumidity.AddBottomLine();
+ //鍙崇澶�
+ rowHumidity.AddRightArrow();
+ var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+ if (!string.IsNullOrEmpty(bindHumidityName))
+ {
+ msg = bindHumidityName;
+ }
+ var btnHumidityStatu = rowHumidity.AddMostRightView(msg, 700);
+ rowHumidity.ButtonClickEvent += (sender, e) =>
+ {
+ //var key = new Panel();
+ //var bindHumiditySensorPage = new Shared.Phone.UserCenter.DeviceBind.PanelSimpleMutilfunctionBindSensorForm(key, bindHumidityDev, 3);
+ //Shared.Phone.UserView.HomePage.Instance.AddChidren(bindHumiditySensorPage);
+ //Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ //bindHumiditySensorPage.Show();
+
+ //bindHumiditySensorPage.actionHumidityTarget += (bindName) =>
+ //{
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (string.IsNullOrEmpty(bindName))
+ // {
+ // btnHumidityStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+ // }
+ // else
+ // {
+ // btnHumidityStatu.Text = bindName;
+ // }
+ // });
+ //};
+ };
}
+ /// <summary>
+ /// 娓╁害鏉ユ簮琛�
+ /// </summary>
+ private void AddTemperatureSensorRow()
+ {
+ //娓╁害鏉ユ簮
+ var rowTemPerature = new FrameRowControl(listview.rowSpace / 2);
+ listview.AddChidren(rowTemPerature);
+ rowTemPerature.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.TemperatureSource), 600);
+ //搴曠嚎
+ rowTemPerature.AddBottomLine();
+ //鍙崇澶�
+ rowTemPerature.AddRightArrow();
+ var msg = Language.StringByID(R.MyInternationalizationString.nothing);
+ if (!string.IsNullOrEmpty(bindTemperatureName))
+ {
+ msg = bindTemperatureName;
+ }
+ var btnTemperatureStatu = rowTemPerature.AddMostRightView(msg, 700);
+ rowTemPerature.ButtonClickEvent += (sender, e) =>
+ {
+ //var key = new Panel();
+ //var bindTemperatureSensorPage = new Shared.Phone.UserCenter.DeviceBind.PanelFangyueFreshAirTargetsForm(key, bindTemperatureDev, 2);
+ //Shared.Phone.UserView.HomePage.Instance.AddChidren(bindTemperatureSensorPage);
+ //Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ //bindTemperatureSensorPage.Show();
+
+ //bindTemperatureSensorPage.actionTemperatureTarget += (bindName) =>
+ //{
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (string.IsNullOrEmpty(bindName))
+ // {
+ // btnTemperatureStatu.Text = Language.StringByID(R.MyInternationalizationString.nothing);
+ // }
+ // else
+ // {
+ // btnTemperatureStatu.Text = bindName;
+ // }
+ // });
+ //};
+ };
+ }
#endregion
-
+
#region 鈻� 鍔熻兘绫诲瀷(绌烘皵寮�鍏充笓鐢�)_____________
-
+
/// <summary>
/// 娣诲姞銆愬姛鑳界被鍨嬨�戣(绌烘皵寮�鍏充笓鐢�)
/// </summary>
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
old mode 100644
new mode 100755
index c4c852e..c096739
--- a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/AddDeviceTypeListForm.cs
@@ -97,12 +97,16 @@
unSelectPic = "Device/ButtonPanelFangyueFreshAir.png";
this.AddMenuRow(objectText, unSelectPic, "PanelFangyueFreshAirDirectionForm");
//绠�绾﹀鍔熻兘闈㈡澘
- objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName8);
- unSelectPic = "Device/ButtonPanelFangyueFreshAir.png";
- this.AddMenuRow(objectText, unSelectPic, "PanelFangyueFreshAirDirectionForm");
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName28);
+ unSelectPic = "Device/ButtonPanelSimpleMultifunction.png";
+ this.AddMenuRow(objectText, unSelectPic, "PanelSimpleMultifunctionDirectionForm");
+ //绠�绾︾幆澧冮潰鏉�
+ objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName29);
+ unSelectPic = "Device/ButtonPanelSimpleEnvironment.png";
+ this.AddMenuRow(objectText, unSelectPic, "PanelSimpleEnvironmentDirectionForm");
//鏂规偊鐜闈㈡澘
objectText = Language.StringByID(R.MyInternationalizationString.uDeviceDirectionName9);
- unSelectPic = "Device/ButtonPanelSimpleMultifunction.png";
+ unSelectPic = "Device/ButtonPanelFangyueEnvironment.png";
this.AddMenuRow(objectText, unSelectPic, "PanelFangyueEnvironmentDirectionForm");
//绐楀笜闈㈡澘
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/PanelSimpleEnvironmentDirectionForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/PanelSimpleEnvironmentDirectionForm.cs
new file mode 100755
index 0000000..650a248
--- /dev/null
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/PanelSimpleEnvironmentDirectionForm.cs
@@ -0,0 +1,74 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+namespace Shared.Phone.UserCenter.DeviceDirection
+{
+ /// <summary>
+ /// 绠�绾︾幆澧冮潰鏉跨殑娣诲姞姝ラ鐣岄潰
+ /// </summary>
+ public class PanelSimpleEnvironmentDirectionForm : DirectionCommonForm
+ {
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //鍥剧墖
+ var framePic = new FrameLayout();
+ framePic.Width = this.GetPictrueRealSize(835);
+ framePic.Height = this.GetPictrueRealSize(708);
+ framePic.Gravity = Gravity.CenterHorizontal;
+ framePic.Y = Application.GetRealHeight(115);
+ bodyFrameLayout.AddChidren(framePic);
+ var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);
+ btnPic.UnSelectedImagePath = "Instruct/ButtonPanelSimpleEnvironment.png";
+ framePic.AddChidren(btnPic);
+
+ //闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
+ var btnPress = new NormalViewControl(this.GetPictrueRealSize(300), this.GetPictrueRealSize(45), false);
+ btnPress.X = this.GetPictrueRealSize(473);
+ btnPress.Y = this.GetPictrueRealSize(311);
+ btnPress.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnPress.TextSize = 10;
+ btnPress.TextID = R.MyInternationalizationString.LongPressButtonSwitch;
+ btnPress.TextAlignment = TextAlignment.CenterLeft;
+ framePic.AddChidren(btnPress);
+
+ //鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿�
+ //鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ string[] msgArry = Language.StringByID(R.MyInternationalizationString.AddSimpleEnvironmentMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+
+ var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ msg1.Y = Application.GetRealHeight(1037);
+ msg1.Text = msgArry[0];
+ msg1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ msg1.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(msg1);
+ var msg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ msg2.Y = msg1.Bottom;
+ if (msgArry.Length > 1)
+ {
+ msg2.Text = msgArry[1];
+ }
+ msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ msg2.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(msg2);
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/PanelSimpleMultifunctionDirectionForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/PanelSimpleMultifunctionDirectionForm.cs
new file mode 100755
index 0000000..5ee4019
--- /dev/null
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Direction/PanelSimpleMultifunctionDirectionForm.cs
@@ -0,0 +1,83 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+namespace Shared.Phone.UserCenter.DeviceDirection
+{
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘鐨勬坊鍔犳楠ょ晫闈�
+ /// </summary>
+ public class PanelSimpleMultifunctionDirectionForm : DirectionCommonForm
+ {
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm()
+ {
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAddDevice));
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //鍥剧墖
+ var framePic = new FrameLayout();
+ framePic.Width = this.GetPictrueRealSize(835);
+ framePic.Height = this.GetPictrueRealSize(708);
+ framePic.Gravity = Gravity.CenterHorizontal;
+ framePic.Y = Application.GetRealHeight(115);
+ bodyFrameLayout.AddChidren(framePic);
+ var btnPic = new PicViewControl(framePic.Width, framePic.Height, false);
+ btnPic.UnSelectedImagePath = "Instruct/ButtonPanelSimpleMultifunction.png";
+ framePic.AddChidren(btnPic);
+
+ //璁剧疆
+ var btnSet = new NormalViewControl(this.GetPictrueRealSize(243), this.GetPictrueRealSize(45), false);
+ btnSet.X = this.GetPictrueRealSize(58);
+ btnSet.Y = this.GetPictrueRealSize(360);
+ btnSet.TextAlignment = TextAlignment.Center;
+ btnSet.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnSet.TextSize = 10;
+ btnSet.TextID = R.MyInternationalizationString.Setting;
+ framePic.AddChidren(btnSet);
+
+ //鍏ョ綉
+ var btnConnect = new NormalViewControl(this.GetPictrueRealSize(250), this.GetPictrueRealSize(45), false);
+ btnConnect.X = this.GetPictrueRealSize(458);
+ btnConnect.Y = this.GetPictrueRealSize(205);
+ btnConnect.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnConnect.TextSize = 10;
+ btnConnect.TextID = R.MyInternationalizationString.Connection;
+ framePic.AddChidren(btnConnect);
+
+ //鎸変綇闈㈡澘鍔熻兘(function)鎸夐敭锛屾墍鏈夋寜閿�
+ //鎸囩ず鐏寒璧凤紝鍒欓厤缃戞垚鍔�
+ string[] msgArry = Language.StringByID(R.MyInternationalizationString.AddSimpleMultifunctionMsg).Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
+
+ var msg1 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ msg1.Y = Application.GetRealHeight(1037);
+ msg1.Text = msgArry[0];
+ msg1.TextColor = UserCenterColor.Current.TextGrayColor3;
+ msg1.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(msg1);
+ var msg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ msg2.Y = msg1.Bottom;
+ if (msgArry.Length > 1)
+ {
+ msg2.Text = msgArry[1];
+ }
+ msg2.TextColor = UserCenterColor.Current.TextGrayColor3;
+ msg2.TextAlignment = TextAlignment.Center;
+ bodyFrameLayout.AddChidren(msg2);
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirButtonSettionForm.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentTargetsForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentTargetsForm.cs
new file mode 100755
index 0000000..1bd7846
--- /dev/null
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentTargetsForm.cs
@@ -0,0 +1,10 @@
+锘縰sing System;
+namespace Shared.Phone.UserCenter.DeviceBind
+{
+ public class PanelSimpleEnvironmentTargetsForm
+ {
+ public PanelSimpleEnvironmentTargetsForm()
+ {
+ }
+ }
+}
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionBindSensorForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionBindSensorForm.cs
new file mode 100644
index 0000000..c7c2992
--- /dev/null
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionBindSensorForm.cs
@@ -0,0 +1,1890 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using Shared.Common;
+using Shared.Phone.UserCenter.Safety;
+using ZigBee.Device;
+using static ZigBee.Device.BindObj;
+using static ZigBee.Device.Panel;
+
+namespace Shared.Phone.UserCenter.DeviceBind
+{
+ public class PanelSimpleMutilfunctionBindSensorForm : BindCommonLayout
+ {
+ #region 鏋勯�犲嚱鏁�
+ /// <summary>
+ /// 鏋勯�犲嚱鏁�
+ /// </summary>
+ /// <param name="device"></param>
+ /// <param name="deviceBindType">1:娓╁害浼犳劅鍣�;2:婀垮害浼犳劅鍣� </param>
+ /// <param name="bindDev">缁戝畾鐩爣 </param>
+ public PanelSimpleMutilfunctionBindSensorForm(CommonDevice device, CommonDevice bindDev, int deviceBindType)
+ {
+ this.curControlDev = device as FreshAir;
+ this.curBindDevice = bindDev;
+ this.curDeviceBindType = deviceBindType;
+ }
+ #endregion
+
+ #region 鍙橀噺鐢虫槑
+ /// <summary>
+ /// 褰撳墠鏂伴闈㈡澘銆愭帶鍒惰澶囥��
+ /// </summary>
+ FreshAir curControlDev;
+ /// <summary>
+ /// 褰撳墠琚粦璁惧
+ /// </summary>
+ CommonDevice curBindDevice;
+ /// <summary>
+ /// 鏄剧ず琚粦瀹氳澶囨垨鍦烘櫙鐨剉iew
+ /// </summary>
+ VerticalFrameRefreshControl midVerticalScrolViewLayout;
+ /// <summary>
+ /// 鏄剧ず鎴块棿鐨剉iew
+ /// </summary>
+ HorizontalScrolViewLayout btnHorizontalScrolViewLayout;
+ /// <summary>
+ /// 鎸夐敭閰嶇疆鐨勭洰鏍囧垪琛�
+ /// </summary>
+ List<CommonDevice> targetList = new List<CommonDevice>();
+ /// <summary>
+ /// 闈㈡澘涓凡缁忓瓨鍦ㄧ殑鐩爣鍒楄〃
+ /// </summary>
+ List<CommonDevice> oldTargetList = new List<CommonDevice>();
+ /// <summary>
+ /// 褰撳墠璁惧缁戝畾绫诲瀷
+ /// 1:鏂伴
+ /// 2:娓╁害浼犳劅鍣�
+ /// 3:婀垮害浼犳劅鍣�
+ /// 4:PM2.5浼犳劅鍣�
+ /// </summary>
+ int curDeviceBindType = 0;
+ /// <summary>
+ /// 鏈湴鎴块棿鍒楄〃
+ /// </summary>
+ List<Room> supportRoomList = new List<Room>();
+ /// <summary>
+ /// 淇濆瓨瀹屾垚鎸夐挳
+ /// </summary>
+ Button btnFinifh;
+ /// <summary>
+ /// 妤煎眰鏂囨湰
+ /// </summary>
+ Button btnFloorText;
+ /// <summary>
+ /// 妤煎眰鍒楄〃
+ /// </summary>
+ Dictionary<string, string> dicFloorList;
+ /// <summary>
+ /// 鎵�鏈夋埧闂翠腑鏀寔琚粦瀹氱殑璁惧鍒楄〃
+ /// </summary>
+ List<CommonDevice> currentPanelSupportBindDeviceList = new List<CommonDevice>();
+ /// <summary>
+ /// 褰撳墠鎴块棿涓敮鎸佽缁戝畾鐨勮澶囧垪琛�
+ /// </summary>
+ List<CommonDevice> currentRoomSupportBindDeviceList = new List<CommonDevice>();
+ /// <summary>
+ /// 闈㈡澘涓瓨鍦ㄧ殑閿��
+ /// </summary>
+ List<String> panelBindListKey = null;
+ /// <summary>
+ /// 鏂伴缁戝畾鐩爣鍥炶皟
+ /// </summary>
+ public Action<string> actionFreshAirTarget = null;
+ /// <summary>
+ /// 娓╁害缁戝畾鐩爣鍥炶皟
+ /// </summary>
+ public Action<string> actionTemperatureTarget = null;
+ /// <summary>
+ /// 婀垮害缁戝畾鐩爣鍥炶皟
+ /// </summary>
+ public Action<string> actionHumidityTarget = null;
+ /// <summary>
+ /// PM缁戝畾鐩爣鍥炶皟
+ /// </summary>
+ public Action<string> actionPMTarget = null;
+
+ #endregion
+
+ #region UI璁捐
+ /// <summary>
+ /// 鐩爣椤垫樉绀�
+ /// </summary>
+ public void Show()
+ {
+ #region 鏍囬鏍�
+ string titleText = "";
+ switch (curDeviceBindType)
+ {
+ case 1:
+ titleText = Language.StringByID(R.MyInternationalizationString.BindFreshAirTarget);
+ break;
+ case 2:
+ titleText = Language.StringByID(R.MyInternationalizationString.TemperatureSource);
+ break;
+ case 3:
+ titleText = Language.StringByID(R.MyInternationalizationString.HumiditySource);
+ break;
+ case 4:
+ titleText = Language.StringByID(R.MyInternationalizationString.PM25Source);
+ break;
+ }
+ this.TopFrameLayout(this, titleText);
+ EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
+ {
+ RemoveFromParent();
+ };
+ this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 300);
+ this.btnBack.MouseUpEventHandler += eHandlerBack;
+ this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
+ this.MidFrameLayout(this);
+ #endregion
+
+ //娣诲姞妤煎眰UI
+ BindDownFrameLayout();
+ //鏍囬鏍忎笅鐨刄I
+ MidFrameLayoutContent();
+ //鍒濆鍖栬澶囨暟鎹�
+ InitData();
+ }
+
+ /// <summary>
+ /// 娣诲姞妤煎眰UI
+ /// </summary>
+ void BindDownFrameLayout()
+ {
+ var btnAddFrameLayout = new FrameLayout
+ {
+ X = Application.GetRealWidth(619),
+ };
+ this.titleFrameLayout.AddChidren(btnAddFrameLayout);
+
+ btnFloorText = new Button
+ {
+ Width = Application.GetRealWidth(300 - 69 - 58),
+ Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
+ TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+ TextSize = 14,
+ IsBold = true,
+ TextAlignment = TextAlignment.CenterRight,
+ };
+ btnAddFrameLayout.AddChidren(btnFloorText);
+
+ var btnBindDownFrameLayout = new FrameLayout
+ {
+ Width = Application.GetMinReal(69 + 58),
+ X = Application.GetRealWidth(300 - 69 - 58),
+ };
+ btnAddFrameLayout.AddChidren(btnBindDownFrameLayout);
+
+ var btnBindDown = new Button
+ {
+ Height = Application.GetMinReal(69),
+ Width = Application.GetMinReal(69),
+ UnSelectedImagePath = "BindPic/BindDown.png",
+ Gravity = Gravity.CenterVertical,
+ };
+ btnBindDownFrameLayout.AddChidren(btnBindDown);
+
+ EventHandler<MouseEventArgs> eHandlerBindDown = (sender, e) =>
+ {
+ SideslipFramelayout();
+ };
+ btnBindDown.MouseDownEventHandler += eHandlerBindDown;
+ btnBindDownFrameLayout.MouseDownEventHandler += eHandlerBindDown;
+ if (Common.Config.Instance.Home.FloorDics.Count == 0)
+ {
+ btnAddFrameLayout.Width = 0;
+ }
+ else
+ {
+ btnAddFrameLayout.Width = Application.GetRealWidth(300);
+ }
+ }
+
+ /// <summary>
+ /// 涓儴UI銆愭爣棰樻爮涓嬬殑UI銆�
+ /// </summary>
+ async void MidFrameLayoutContent()
+ {
+ var btnMidTopLayout = new FrameLayout
+ {
+ Height = Application.GetRealHeight(389 - 184),
+ };
+ this.midFrameLayout.AddChidren(btnMidTopLayout);
+
+ //鎴块棿鏍�
+ btnHorizontalScrolViewLayout = new HorizontalScrolViewLayout
+ {
+ X = Application.GetRealWidth(58),
+ };
+ btnMidTopLayout.AddChidren(btnHorizontalScrolViewLayout);
+
+ //璁惧鏍�
+ midVerticalScrolViewLayout = new VerticalFrameRefreshControl()
+ {
+ Y = btnMidTopLayout.Bottom,
+ Height = Application.GetRealHeight(1145),
+ };
+ this.midFrameLayout.AddChidren(midVerticalScrolViewLayout);
+ midVerticalScrolViewLayout.BeginHeaderRefreshingAction += () =>
+ {
+ midVerticalScrolViewLayout.BeginHeaderRefreshing();
+ InitData();
+ };
+
+ //搴曢儴淇濆瓨鏍�
+ var bottomFrameLayout = new FrameLayout()
+ {
+ Width = LayoutParams.MatchParent,
+ Height = Application.GetRealHeight(127),
+ Y = Application.GetRealHeight(1472),
+ };
+ this.midFrameLayout.AddChidren(bottomFrameLayout);
+
+ btnFinifh = new Button()
+ {
+ Width = Application.GetRealWidth(907),
+ Gravity = Gravity.CenterHorizontal,
+ Radius = (uint)Application.GetRealHeight(127) / 2,
+ TextID = R.MyInternationalizationString.Save,
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ IsBold = true,
+ TextSize = 16,
+ };
+ bottomFrameLayout.AddChidren(btnFinifh);
+ btnFinifh.MouseUpEventHandler += async (sender, e) =>
+ {
+ SaveTarget();
+ };
+ }
+
+ /// <summary>
+ /// 闈㈡澘缁戝畾鐩爣琛ㄦ樉绀�
+ /// </summary>
+ /// <param name="gateway">Gateway.</param>
+ /// <param name="key">Key.</param>
+ void RefreshRoomList()
+ {
+ Room curRoom = null;
+ if (supportRoomList.Count == 0)
+ {
+ return;
+ }
+ btnHorizontalScrolViewLayout.RemoveAll();
+ Button curentOldRoom = null;
+ FrameLayout curentOldRoomFrameLayout = null;
+ int index = 0;
+ var roomTempList = GetSupportRoomList();
+ Room slectedRoom = null;
+
+ for (int i = 0; i < roomTempList.Count; i++)
+ {
+ var room = roomTempList[i];
+ bool canSelect = false;
+ if (curControlDev.currentSelectRoomId == room.Id)
+ {
+ slectedRoom = room;
+ canSelect = true;
+ }
+ //鎴块棿
+ var btnRoomFrameLayout = new FrameLayout
+ {
+ Height = Application.GetMinReal(159),
+ Width = Application.GetMinReal(255),
+ Y = Application.GetRealHeight(23),
+ X = Application.GetRealWidth(5),
+ BackgroundImagePath = "Item/RoomIconBackground.png",
+ BorderWidth = 1,
+ };
+ btnHorizontalScrolViewLayout.AddChidren(btnRoomFrameLayout);
+
+ var btnRoom = new Button
+ {
+ Height = Application.GetRealHeight(58),
+ Width = Application.GetRealWidth(127),
+ Y = Application.GetRealHeight(58),
+ X = Application.GetRealWidth(14),
+ Text = room.Name,
+ TextSize = 12,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ Gravity = Gravity.Center,
+ };
+ btnRoomFrameLayout.AddChidren(btnRoom);
+
+ btnRoom.IsSelected = false;
+ if (canSelect)
+ {
+ btnRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+ btnRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+ curentOldRoom = btnRoom;
+ curentOldRoomFrameLayout = btnRoomFrameLayout;
+ }
+
+ //琚粦瀹氱殑鐩爣杩樻湭鍒嗛厤鍖哄煙锛岄粯璁ゆ槸绗竴涓�
+ if (string.IsNullOrEmpty(curControlDev.currentSelectRoomId))
+ {
+ if (index == 0)
+ {
+ btnRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+ btnRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+ curentOldRoom = btnRoom;
+ curentOldRoomFrameLayout = btnRoomFrameLayout;
+ }
+ }
+
+ if (index == roomTempList.Count - 1 && index > 3)
+ {
+ var btnRoomFrameLayoutEmpty = new FrameLayout
+ {
+ Height = Application.GetMinReal(159),
+ Width = Application.GetMinReal(50),
+ Y = Application.GetRealHeight(23),
+ X = Application.GetRealWidth(5),
+ BorderWidth = 1,
+ };
+ btnHorizontalScrolViewLayout.AddChidren(btnRoomFrameLayoutEmpty);
+ }
+
+ EventHandler<MouseEventArgs> eHandlerRoom = (sender, e) =>
+ {
+ if (!btnRoom.IsSelected)
+ {
+ if (curentOldRoom != null)
+ {
+ curentOldRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+ }
+ curentOldRoom = btnRoom;
+ curentOldRoom.TextColor = Shared.Common.ZigbeeColor.Current.XMWhite;
+ }
+
+ if (btnRoomFrameLayout.BorderWidth == 1)
+ {
+ if (curentOldRoomFrameLayout != null)
+ {
+ curentOldRoomFrameLayout.BorderWidth = 1;
+ curentOldRoomFrameLayout.BorderColor = Shared.Common.ZigbeeColor.Current.XMOrange;
+ curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackground.png";
+ }
+ curentOldRoomFrameLayout = btnRoomFrameLayout;
+ curentOldRoomFrameLayout.BorderWidth = 0;
+ curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
+ }
+ curRoom = room;
+
+ //鏂伴闈㈡澘淇濆瓨浣胯兘
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+
+ RefreshDeviceList(curRoom);
+ };
+ btnRoom.MouseUpEventHandler += eHandlerRoom;
+ btnRoomFrameLayout.MouseUpEventHandler += eHandlerRoom;
+ index++;
+ }
+ BindInfo.FinishDisplay(roomTempList, btnFinifh);
+
+ if (roomTempList.Count == 0)
+ {
+ curRoom = new Shared.Common.Room();
+ }
+ else
+ {
+ if (slectedRoom == null)
+ {
+ curRoom = roomTempList[0];
+ }
+ else
+ {
+ curRoom = slectedRoom;
+ }
+ }
+
+ RefreshDeviceList(curRoom);
+ }
+
+ /// <summary>
+ /// 鎸夐敭缁戠洰鏍囪〃鏄剧ず
+ /// </summary>
+ /// <param name="curRoom"></param>
+ void RefreshDeviceList(Room curRoom)
+ {
+ midVerticalScrolViewLayout.RemoveAll();
+ Button oldDevice = null;
+ int curIndex = 0;
+
+ currentRoomSupportBindDeviceList = GetCurRoomSupportDeviceList(curRoom);
+ if (currentRoomSupportBindDeviceList.Count == 0)
+ {
+ btnFinifh.Enable = false;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ return;
+ }
+ foreach (var device in currentRoomSupportBindDeviceList)
+ {
+ #region 缁戝畾琛║I鏄撅紙鏃犳暟鎹鐞嗭級
+ var rowLayout = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(23 + 127),
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
+ };
+ midVerticalScrolViewLayout.AddChidren(rowLayout);
+
+ var devicePic = new Button()
+ {
+ X = Application.GetMinRealAverage(58),
+ Y = Application.GetMinRealAverage(46),
+ Width = Application.GetMinRealAverage(81),
+ Height = Application.GetMinRealAverage(81),
+ UnSelectedImagePath = device.IconPath,
+ };
+ rowLayout.AddChidren(devicePic);
+
+ var btnBindName = new Button()
+ {
+ Width = Application.GetRealWidth(790),
+ X = devicePic.Right + Application.GetRealWidth(20),
+ TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = 15,
+ Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
+ };
+ rowLayout.AddChidren(btnBindName);
+
+ var btnChoose = new Button()
+ {
+ Width = Application.GetMinReal(60),
+ Height = Application.GetMinReal(60),
+ X = Application.GetRealWidth(861 + 81),
+ Y = Application.GetRealHeight(35),
+ SelectedImagePath = "DoorLock/SelectedIcon.png",
+ Visible = false,
+ };
+ rowLayout.AddChidren(btnChoose);
+
+ var line2 = new Button()
+ {
+ Y = rowLayout.Height - 1,
+ X = devicePic.Right + Application.GetRealWidth(20),
+ Width = Application.GetRealWidth(965 - 116),
+ Height = 1,
+ BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ };
+ rowLayout.AddChidren(line2);
+
+ if (curIndex == currentRoomSupportBindDeviceList.Count - 1)
+ {
+ line2.Visible = false;
+ }
+
+ switch (curDeviceBindType)
+ {
+ case 1:
+ devicePic.UnSelectedImagePath = "Device/FreshAirEpoint.png";
+ break;
+ case 2:
+ devicePic.UnSelectedImagePath = "Device/SensorTemperature.png";
+ if (device.Type == DeviceType.PMSensor)
+ {
+ btnBindName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ }
+ break;
+ case 3:
+ devicePic.UnSelectedImagePath = "Device/SensorHumidity.png";
+ if (device.Type == DeviceType.PMSensor)
+ {
+ btnBindName.Text = Common.LocalDevice.Current.GetDeviceEpointName(device) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+ }
+ break;
+ case 4:
+ devicePic.UnSelectedImagePath = "Device/AirQualitySensorEpoint.png";
+ break;
+ }
+ #endregion
+
+ string mianKey = device.DeviceAddr + device.DeviceEpoint;
+ if (targetList.Count != 0)
+ {
+ foreach (var bindedDev in targetList)
+ {
+ if (bindedDev.DeviceAddr + bindedDev.DeviceEpoint == mianKey)
+ {
+ btnChoose.IsSelected = true;
+ btnChoose.Visible = true;
+ oldDevice = btnChoose;
+ }
+ }
+ }
+
+ EventHandler<MouseEventArgs> hander = (sender, e) =>
+ {
+ btnChoose.IsSelected = !btnChoose.IsSelected;
+ if (!btnChoose.IsSelected)
+ {
+ if (oldDevice != null)
+ {
+ oldDevice.IsSelected = false;
+ oldDevice.Visible = false;
+ }
+ oldDevice = btnChoose;
+ oldDevice.IsSelected = false;
+ oldDevice.Visible = false;
+ targetList.Clear();
+ }
+ else
+ {
+ if (oldDevice != null)
+ {
+ oldDevice.IsSelected = false;
+ oldDevice.Visible = false;
+ }
+ oldDevice = btnChoose;
+ oldDevice.IsSelected = true;
+ oldDevice.Visible = true;
+ targetList.Clear();
+ targetList.Add(device);
+ }
+
+ //鏂伴闈㈡澘锛氱敱浜庣洰鏍囨病鏈夋彁渚涘垹闄ゆ帴鍙ｏ紝鎵�浠ュ彲浠ュ彇娑堥�変腑鑳戒繚瀛�
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ };
+ rowLayout.MouseUpEventHandler += hander;
+ devicePic.MouseUpEventHandler += hander;
+ btnBindName.MouseUpEventHandler += hander;
+ btnChoose.MouseUpEventHandler += hander;
+ curIndex++;
+ }
+ }
+
+ /// <summary>
+ /// 妤煎眰閫夋嫨鐨勪晶杈规爮
+ /// </summary>
+ void SideslipFramelayout()
+ {
+ var dialog = new Dialog
+ {
+ };
+ dialog.Show();
+
+ var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
+ dialog.AddChidren(flMain);
+ flMain.MouseUpEventHandler += (sender11, e11) =>
+ {
+ dialog.Close();
+ };
+
+ var sidelipFrameLayout = new FrameLayout()
+ {
+ Width = Application.GetMinReal(449),
+ Y = Application.GetRealHeight(161),
+ X = Application.GetRealWidth(596),
+ BackgroundImagePath = "DoorLock/SideslipPic.png",
+ };
+ flMain.AddChidren(sidelipFrameLayout);
+
+ var btnSelectFloor = new Button()
+ {
+ Width = Application.GetRealWidth(200),
+ Height = Application.GetRealHeight(58),
+ X = Application.GetRealWidth(81),
+ Y = Application.GetRealHeight(81),
+ TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+ TextSize = 14,
+ IsBold = true,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextID = R.MyInternationalizationString.SelectFloor,
+ };
+ sidelipFrameLayout.AddChidren(btnSelectFloor);
+
+ var sidelipVerticalScrolViewLayout = new VerticalScrolViewLayout()
+ {
+ Y = btnSelectFloor.Bottom + Application.GetRealHeight(45),
+ Height = Application.GetRealHeight(600),
+ };
+ sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
+
+ Button oldbutton = null;
+ Button oldbuttonText = null;
+ int count = 0;
+ foreach (var floorId in dicFloorList.Keys)
+ {
+ var rowFrameLayout = new RowLayout()
+ {
+ Height = Application.GetRealHeight(152),
+ LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+ X = Application.GetRealWidth(81),
+ };
+ sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
+
+ var btnAllMethod = new Button()
+ {
+ Width = Application.GetMinReal(81),
+ Height = Application.GetMinReal(81),
+ UnSelectedImagePath = "Floor/Floor.png",
+ SelectedImagePath = "Floor/FloorSelected.png",
+ Gravity = Gravity.CenterVertical,
+ };
+ rowFrameLayout.AddChidren(btnAllMethod);
+
+ var btnMethodText = new Button()
+ {
+ Width = Application.GetRealWidth(311),
+ Height = Application.GetRealHeight(58),
+ X = Application.GetRealWidth(92),
+ Gravity = Gravity.CenterVertical,
+ TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+ TextSize = 14,
+ TextAlignment = TextAlignment.CenterLeft,
+ Text = dicFloorList[floorId],
+ };
+ rowFrameLayout.AddChidren(btnMethodText);
+
+ if (curControlDev.currentSelectFloorId == floorId)
+ {
+ btnAllMethod.IsSelected = true;
+ btnAllMethod.IsBold = true;
+ btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
+
+ string curFloorId = floorId;
+ EventHandler<MouseEventArgs> hander = (sender, e) =>
+ {
+ if (curControlDev.currentSelectFloorId == curFloorId)
+ {
+ return;
+ }
+ curControlDev.currentSelectFloorId = curFloorId;
+ btnFloorText.Text = dicFloorList[floorId];
+
+ //鑾峰彇妤煎眰涓埧闂村垪琛�
+ supportRoomList = GetFloorRoomList();
+ if (!btnMethodText.IsSelected)
+ {
+ if (oldbutton != null)
+ {
+ oldbutton.IsSelected = false;
+ }
+ if (oldbuttonText != null)
+ {
+ oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
+ }
+ oldbutton = btnMethodText;
+ oldbuttonText = btnMethodText;
+ btnMethodText.IsSelected = true;
+ oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ oldbuttonText.IsBold = true;
+ }
+
+ int index = 0;
+ RefreshRoomList();
+ dialog.Close();
+ };
+ btnAllMethod.MouseUpEventHandler += hander;
+ rowFrameLayout.MouseUpEventHandler += hander;
+ btnMethodText.MouseUpEventHandler += hander;
+ count++;
+ }
+
+ if (count == 0)
+ {
+ sidelipFrameLayout.Height = 0;
+ }
+ else if (count <= 4 && count > 0)
+ {
+ sidelipFrameLayout.Height = Application.GetRealHeight(180) + count * Application.GetRealHeight(150);
+ }
+ else
+ {
+ sidelipFrameLayout.Height = Application.GetMinReal(780);
+ }
+ }
+ #endregion
+
+ #region 鏁版嵁澶勭悊
+ /// <summary>
+ /// 鍒濆鍖栬澶囨暟鎹�
+ /// </summary>
+ void InitData()
+ {
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Start("");
+ });
+ //鑾峰彇琚粦鐩爣绛変俊鎭�
+ BindDevInfo(curBindDevice);
+
+ //鑾峰彇妤煎眰
+ dicFloorList = HdlRoomLogic.Current.GetFloorSortList();
+ //鑾峰彇妤煎眰涓埧闂村垪琛�
+ supportRoomList = GetFloorRoomList();
+
+ //鑾峰彇鎵�鏈夋埧闂翠腑鍖归厤鐨勮兘缁戠殑鐩爣
+ currentPanelSupportBindDeviceList = GetAllRoomSupportDeviceList();
+
+ //鑾峰彇闈㈡澘涓瓨鍦ㄧ殑缁戝畾鐩爣
+ var panelBindListRes = HdlDeviceBindLogic.Current.GetDeviceBindAsync(curControlDev);
+ if (panelBindListRes != null && panelBindListRes.getAllBindResponseData != null)
+ {
+ curControlDev.bindList.Clear();
+ foreach (var bDev in panelBindListRes.getAllBindResponseData.BindList)
+ {
+ curControlDev.bindList.Add(bDev);
+ }
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ midVerticalScrolViewLayout.EndHeaderRefreshing();
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ });
+ }
+
+ targetList.Clear();
+ //閫変腑鐩爣鍒楄〃 targetList
+ if (currentPanelSupportBindDeviceList.Count != 0 && curControlDev.bindList.Count != 0)
+ {
+ foreach (var bindDev in curControlDev.bindList)
+ {
+ var mainKey = bindDev.BindMacAddr + bindDev.BindEpoint;
+ var dev = currentPanelSupportBindDeviceList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == mainKey));
+ if (dev != null)
+ {
+ var device = LocalDevice.Current.GetDevice(dev.DeviceAddr, dev.DeviceEpoint);
+ if (device != null)
+ {
+ switch (curDeviceBindType)
+ {
+ case 1:
+ //鑾峰彇璁惧绫诲瀷鐨�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ {
+ continue;
+ }
+ if (device.Type == DeviceType.FreshAir)
+ {
+ targetList.Add(device);
+ oldTargetList.Add(device);
+ }
+ break;
+ case 2:
+ if (device.Type == DeviceType.TemperatureSensor)
+ {
+ var bDev = device as TemperatureSensor;
+ if (bDev.SensorDiv == 1)
+ {
+ targetList.Add(device);
+ oldTargetList.Add(device);
+ }
+ }
+ if (device.Type == DeviceType.PMSensor)
+ {
+ if (bindDev.BindCluster == 1026)
+ {
+ targetList.Add(device);
+ oldTargetList.Add(device);
+ }
+ }
+ break;
+ case 3:
+ if (device.Type == DeviceType.TemperatureSensor)
+ {
+ var bDev = device as TemperatureSensor;
+ if (bDev.SensorDiv == 2)
+ {
+ targetList.Add(device);
+ oldTargetList.Add(device);
+ }
+ }
+ if (device.Type == DeviceType.FreshAirHumiditySensor)
+ {
+ targetList.Add(device);
+ oldTargetList.Add(device);
+ }
+ if (device.Type == DeviceType.PMSensor)
+ {
+ if (bindDev.BindCluster == 1029)
+ {
+ targetList.Add(device);
+ oldTargetList.Add(device);
+ }
+ }
+ break;
+ case 4:
+ //PM2.5
+ if (device.Type == DeviceType.PMSensor)
+ {
+ if (bindDev.BindCluster == 1066)
+ {
+ targetList.Add(device);
+ oldTargetList.Add(device);
+ }
+ }
+ break;
+ }
+
+ }
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ var mess = ex.Message;
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+
+ //棣栨鏄惁鑳界偣鍑讳繚瀛�
+ if (targetList.Count == 0)
+ {
+ curControlDev.currentSelectFloorId = BindInfo.GetCurrentSelectFloorId();
+ curControlDev.currentSelectRoomId = null;
+ if (BindInfo.GetCurrentSelectFloorIdName() != null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ btnFloorText.Text = BindInfo.GetCurrentSelectFloorIdName();
+ });
+ }
+ btnFinifh.Enable = false;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
+ }
+ else
+ {
+ foreach (var dev in targetList)
+ {
+ //鑾峰彇鏈湴璁惧鍒楄〃
+ var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
+ var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == dev.DeviceAddr && obj.DeviceEpoint == dev.DeviceEpoint);
+ if (tempDev != null)
+ {
+ //鑾峰彇璁惧鎵�灞炴埧闂�
+ var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
+ if (tempDevRoom != null)
+ {
+ curControlDev.currentSelectRoomId = tempDevRoom.Id;
+ curControlDev.currentSelectFloorId = tempDevRoom.FloorId;
+ }
+ }
+ }
+ if (!string.IsNullOrEmpty(curControlDev.currentSelectFloorId))
+ {
+ if (BindInfo.GetBindTargetsFloorIdName(curControlDev.currentSelectFloorId) != null)
+ {
+ btnFloorText.Text = BindInfo.GetBindTargetsFloorIdName(curControlDev.currentSelectFloorId);
+ }
+ }
+
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ }
+
+
+ //鑾峰彇妤煎眰涓埧闂村垪琛�
+ if (supportRoomList.Count != 0)
+ {
+ RefreshRoomList();
+ }
+
+ CommonPage.Loading.Hide();
+ midVerticalScrolViewLayout.EndHeaderRefreshing();
+ });
+ }
+ });
+ }
+
+ /// <summary>
+ /// 淇濆瓨鐩爣
+ /// </summary>
+ /// <param name="curControlDev"></param>
+ void SaveTarget()
+ {
+ btnFinifh.Enable = false;
+ if (targetList.Count == 0)
+ {
+ //绌虹洰鏍�
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ try
+ {
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
+
+ if (oldTargetList.Count != 0)
+ {
+ //鍒犻櫎鍙栨秷鐨勭洰鏍�
+ foreach (var bd in oldTargetList)
+ {
+ var delDevice = new DelDeviceBindData();
+ delDevice.DeviceAddr = curControlDev.DeviceAddr;
+ delDevice.Epoint = curControlDev.DeviceEpoint;
+
+ var removeDevice = new RemoveBindListObj();
+ removeDevice.BindType = 0;
+ switch (curDeviceBindType)
+ {
+ case 1:
+ removeDevice.BindCluster = 514;
+ break;
+ case 2:
+ removeDevice.BindCluster = 1026;
+ break;
+ case 3:
+ removeDevice.BindCluster = 1029;
+ break;
+ case 4:
+ //PM2.5
+ removeDevice.BindCluster = 1066;
+ break;
+ }
+ removeDevice.BindMacAddr = bd.DeviceAddr;
+ removeDevice.BindEpoint = bd.DeviceEpoint;
+ delDevice.RemoveBindList.Add(removeDevice);
+
+ var delResult = new DelDeviceBindResponseAllData();
+ delResult = HdlDeviceBindLogic.Current.DelDeviceBindAsync(delDevice);
+ if (delResult == null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ });
+ return;
+ }
+ else
+ {
+ if (delResult.removeBindResultResponseData == null)
+ {
+ if (delResult.delDeviceBindResponseData != null)
+ {
+ foreach (var d in delResult.delDeviceBindResponseData.RemoveBindList)
+ {
+ if (d.Result == 1)
+ {
+ switch (curDeviceBindType)
+ {
+ case 1:
+ if (actionFreshAirTarget != null)
+ {
+ actionFreshAirTarget("");
+ }
+ break;
+ case 2:
+ if (actionTemperatureTarget != null)
+ {
+ actionTemperatureTarget("");
+ }
+ break;
+ case 3:
+ if (actionHumidityTarget != null)
+ {
+ actionHumidityTarget("");
+ }
+ break;
+ case 4:
+ if (actionPMTarget != null)
+ {
+ actionPMTarget("");
+ }
+ break;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ this.RemoveFromParent();
+ });
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ });
+ return;
+ }
+ }
+ }
+ }
+ else
+ {
+ if (delResult.removeBindResultResponseData.Result == 0)
+ {
+ switch (curDeviceBindType)
+ {
+ case 1:
+ if (actionFreshAirTarget != null)
+ {
+ actionFreshAirTarget("");
+ }
+ break;
+ case 2:
+ if (actionTemperatureTarget != null)
+ {
+ actionTemperatureTarget("");
+ }
+ break;
+ case 3:
+ if (actionHumidityTarget != null)
+ {
+ actionHumidityTarget("");
+ }
+ break;
+ case 4:
+ if (actionPMTarget != null)
+ {
+ actionPMTarget("");
+ }
+ break;
+ }
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ this.RemoveFromParent();
+ });
+
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ });
+ return;
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ //娌℃湁鐩爣鎻愮ず
+ Application.RunOnMainThread(() =>
+ {
+ var myTip = new Tip();
+ myTip.Direction = AMPopTipDirection.None;
+ myTip.CloseTime = 2;
+ myTip.Text = Language.StringByID(R.MyInternationalizationString.BindDeviceTargetIsEmpty);
+ myTip.Show(Common.CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ });
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ var mess = ex.Message;
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ });
+ btnFinifh.Enable = true;
+ }
+ });
+ }
+ else
+ {
+ //閫変腑鐩爣
+ //1銆佸凡缁忕粦瀹氳繃鐨勭洰鏍�
+ if (checkExistDevice())
+ {
+ Application.RunOnMainThread(() =>
+ {
+ var myTip = new Tip();
+ myTip.Direction = AMPopTipDirection.None;
+ myTip.CloseTime = 2;
+ myTip.Text = Language.StringByID(R.MyInternationalizationString.BindExist);
+ myTip.Show(Common.CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ });
+ return;
+ }
+
+ System.Threading.Tasks.Task.Run(async () =>
+ {
+ try
+ {
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
+
+ //鍒犻櫎宸茬粡瀛樺湪鐨勭洰鏍�
+ if (oldTargetList.Count != 0)
+ {
+ foreach (var bd in oldTargetList)
+ {
+ var delDevice = DelBindDevice(bd);
+ var delResult = new DelDeviceBindResponseAllData();
+ delResult = HdlDeviceBindLogic.Current.DelDeviceBindAsync(delDevice);
+
+ if (delResult == null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ });
+ return;
+ }
+ else
+ {
+ if (delResult.removeBindResultResponseData == null)
+ {
+ if (delResult.delDeviceBindResponseData != null)
+ {
+ foreach (var d in delResult.delDeviceBindResponseData.RemoveBindList)
+ {
+ if (d.Result != 1)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ });
+ return;
+ }
+ }
+ }
+ }
+ }
+ if (delResult != null && delResult.removeBindResultResponseData != null)
+ {
+ if (delResult.removeBindResultResponseData.Result != 0)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ });
+ return;
+ }
+ }
+ }
+ }
+ else
+ {
+ //妫�娴嬪凡缁忕粦瀹氱殑鐩爣鏄惁涓嶅湪鏈湴鎴栬�呮病鏈夊垎閰嶅埌浠讳綍鎴块棿涓�
+ //姝ゆ椂闇�瑕佸垹闄ゅ凡缁忚缁戝畾鍒扮洰鏍囷紝鎵嶈兘缁х画缁戝畾鏂扮洰鏍�
+ if (curBindDevice != null)
+ {
+ var delDevice = DelBindDevice(curBindDevice);
+ var delResult = new DelDeviceBindResponseAllData();
+ delResult = HdlDeviceBindLogic.Current.DelDeviceBindAsync(delDevice);
+
+ if (delResult == null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ });
+ return;
+ }
+ else
+ {
+ if (delResult.removeBindResultResponseData == null)
+ {
+ if (delResult.delDeviceBindResponseData != null)
+ {
+ foreach (var d in delResult.delDeviceBindResponseData.RemoveBindList)
+ {
+ if (d.Result != 1)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ });
+ return;
+ }
+ }
+ }
+ }
+ }
+ if (delResult != null && delResult.removeBindResultResponseData != null)
+ {
+ if (delResult.removeBindResultResponseData.Result != 0)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ CommonPage.Loading.Hide();
+ });
+ return;
+ }
+ }
+ }
+ }
+
+ //2銆佹坊鍔犳柊鐨勭洰鏍�
+ string bindName = "";
+ var addBindeDev = new AddBindData();
+ addBindeDev.DeviceAddr = curControlDev.DeviceAddr;
+ addBindeDev.Epoint = curControlDev.DeviceEpoint;
+ foreach (var de in targetList)
+ {
+ var addBindInfo = new AddBindListObj();
+ switch (curDeviceBindType)
+ {
+ case 1:
+ addBindInfo.BindCluster = 514;
+ break;
+ case 2:
+ addBindInfo.BindCluster = 1026;
+ break;
+ case 3:
+ addBindInfo.BindCluster = 1029;
+ break;
+ case 4:
+ //PM2.5
+ addBindInfo.BindCluster = 1066;
+ break;
+ }
+ addBindInfo.BindType = 0;
+ addBindInfo.BindMacAddr = de.DeviceAddr;
+ addBindInfo.BindEpoint = de.DeviceEpoint;
+ addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de);
+ switch (curDeviceBindType)
+ {
+ case 2:
+ if (de.Type == DeviceType.PMSensor)
+ {
+ addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de) + "-" + Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
+ }
+ break;
+ case 3:
+ if (de.Type == DeviceType.PMSensor)
+ {
+ addBindeDev.BindName = Common.LocalDevice.Current.GetDeviceEpointName(de) + "-" + Language.StringByID(R.MyInternationalizationString.HumiditySensor);
+ }
+ break;
+ }
+ addBindeDev.BindList.Add(addBindInfo);
+ }
+
+ var dev = new AddedDeviceBindResponseAllData();
+ dev = HdlDeviceBindLogic.Current.AddDeviceBindAsync(addBindeDev);
+ if (dev == null || dev.addedDeviceBindResponseData == null)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
+ });
+ }
+ else
+ {
+ if (dev.addedDeviceBindResponseData.Result == 0)
+ {
+ targetList.Clear();
+ switch (curDeviceBindType)
+ {
+ case 1:
+ if (actionFreshAirTarget != null)
+ {
+ actionFreshAirTarget(addBindeDev.BindName);
+ }
+ break;
+ case 2:
+ if (actionTemperatureTarget != null)
+ {
+ actionTemperatureTarget(addBindeDev.BindName);
+ }
+ break;
+ case 3:
+ if (actionHumidityTarget != null)
+ {
+ actionHumidityTarget(addBindeDev.BindName);
+ }
+ break;
+ case 4:
+ if (actionPMTarget != null)
+ {
+ actionPMTarget(addBindeDev.BindName);
+ }
+ break;
+ }
+
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ this.RemoveFromParent();
+ });
+ }
+ else if (dev.addedDeviceBindResponseData.Result == 1)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ new Tip()
+ {
+ MaxWidth = 150,
+ Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
+ Direction = AMPopTipDirection.None,
+ CloseTime = 1
+ }.Show(CommonPage.Instance);
+ });
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
+ }
+ else
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ new Tip()
+ {
+ MaxWidth = 150,
+ Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
+ Direction = AMPopTipDirection.None,
+ CloseTime = 1
+ }.Show(CommonPage.Instance);
+ });
+ btnFinifh.Enable = true;
+ btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+ return;
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ });
+ btnFinifh.Enable = true;
+ var mess = ex.Message;
+ }
+ });
+ }
+ }
+
+ /// <summary>
+ /// 褰撳墠琚粦瀹氳澶囨墍灞炴ゼ灞傚拰鎴块棿
+ /// </summary>
+ /// <param name="bindDev"></param>
+ void BindDevInfo(CommonDevice bindDev)
+ {
+ if (bindDev == null)
+ {
+ return;
+ }
+ //鑾峰彇鏈湴璁惧鍒楄〃
+ var localDeviceList = Shared.Common.LocalDevice.Current.listAllDevice;
+ var tempDev = localDeviceList.Find(obj => obj.DeviceAddr == bindDev.DeviceAddr && obj.DeviceEpoint == bindDev.DeviceEpoint);
+ if (tempDev != null)
+ {
+ //鑾峰彇璁惧鎵�灞炴埧闂�
+ var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);
+ if (tempDevRoom != null)
+ {
+ curControlDev.currentSelectRoomId = tempDevRoom.Id;
+ curControlDev.currentSelectFloorId = tempDevRoom.FloorId;
+ }
+ }
+ }
+
+ /// <summary>
+ /// 妫�娴嬬洰鏍囨槸鍚﹁缁戝畾杩�
+ /// </summary>
+ /// <returns></returns>
+ private bool checkExistDevice()
+ {
+ bool exist = false;
+ foreach (var oldDev in oldTargetList)
+ {
+ var key = oldDev.DeviceAddr + oldDev.DeviceEpoint;
+ var result = targetList.Find(obj => (obj != null) && (obj.DeviceAddr + obj.DeviceEpoint == key));
+ if (result != null)
+ {
+ exist = true;
+ }
+ else
+ {
+ exist = false;
+ }
+ }
+ return exist;
+ }
+
+ /// <summary>
+ /// 妫�娴嬪凡缁忕粦瀹氱殑鐩爣鏄惁涓嶅湪鏈湴鎴栬�呮病鏈夊垎閰嶅埌浠讳綍鎴块棿涓�
+ /// </summary>
+ /// <returns></returns>
+ private DelDeviceBindData DelBindDevice(CommonDevice bd)
+ {
+ var delDevice = new DelDeviceBindData();
+ delDevice.DeviceAddr = curControlDev.DeviceAddr;
+ delDevice.Epoint = curControlDev.DeviceEpoint;
+
+ var removeDevice = new RemoveBindListObj();
+ removeDevice.BindType = 0;
+ switch (curDeviceBindType)
+ {
+ case 1:
+ removeDevice.BindCluster = 514;
+ break;
+ case 2:
+ removeDevice.BindCluster = 1026;
+ break;
+ case 3:
+ removeDevice.BindCluster = 1029;
+ break;
+ case 4:
+ //PM2.5
+ removeDevice.BindCluster = 1066;
+ break;
+ }
+ removeDevice.BindMacAddr = bd.DeviceAddr;
+ removeDevice.BindEpoint = bd.DeviceEpoint;
+ delDevice.RemoveBindList.Add(removeDevice);
+ return delDevice;
+ }
+
+ /// <summary>
+ /// 鑳芥樉绀虹殑鎴块棿鍒楄〃
+ /// </summary>
+ private List<Room> GetSupportRoomList()
+ {
+ var roomTempList = new List<Room>();
+ for (int i = 0; i < supportRoomList.Count; i++)
+ {
+ var room = supportRoomList[i];
+ //濡傛灉鎴块棿涓哄枩鐖盵鍚庢潵鏀瑰悕涓哄父鐢ㄦ埧闂碷锛屽垯涓嶆樉绀�
+ if (room.IsLove == true)
+ {
+ continue;
+ }
+
+ //濡傛灉鎴块棿涓病鏈夎澶囷紝鍒欎笉鏄剧ず
+ if (room.ListDevice.Count == 0)
+ {
+ continue;
+ }
+ else
+ {
+ List<CommonDevice> roomIncludeMatchDevice = new List<CommonDevice>();
+
+ //鎴块棿涓病鏈夊搴旂殑鏀寔缁戝畾鐨勭洰鏍�
+ switch (curDeviceBindType)
+ {
+ case 1:
+ foreach (var de in room.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(de);
+
+ if (device != null)
+ {
+ //鑾峰彇璁惧绫诲瀷鐨�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ {
+ continue;
+ }
+ if (device.Type == DeviceType.FreshAir)
+ {
+ roomIncludeMatchDevice.Add(device);
+ }
+ }
+ }
+ break;
+ case 2:
+ roomIncludeMatchDevice = GetMatchTemperatureSensorDevice(room);
+ break;
+ case 3:
+ roomIncludeMatchDevice = GetMatchHumiditySensorDevice(room);
+ foreach (var de in room.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(de);
+ if (device != null)
+ {
+ if (device.Type == DeviceType.FreshAirHumiditySensor)
+ {
+ roomIncludeMatchDevice.Add(device);
+ }
+ }
+ }
+ break;
+ case 4:
+ foreach (var de in room.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(de);
+ if (device != null)
+ {
+ if (device.Type == DeviceType.PMSensor)
+ {
+ roomIncludeMatchDevice.Add(device);
+ }
+ }
+ }
+ break;
+ }
+
+ if (roomIncludeMatchDevice.Count == 0)
+ {
+ continue;
+ }
+
+ if (!string.IsNullOrEmpty(room.FloorId))
+ {
+ //鏈夋ゼ灞�
+ if (room.FloorId == curControlDev.currentSelectFloorId)
+ {
+ roomTempList.Add(room);
+ }
+ }
+ else
+ {
+ //娌℃湁妤煎眰
+ roomTempList.Add(room);
+ }
+ }
+ }
+ return roomTempList;
+ }
+
+ /// <summary>
+ /// 鍖归厤娓╁害浼犳劅鍣�
+ /// </summary>
+ /// <param name="room"></param>
+ List<CommonDevice> GetMatchTemperatureSensorDevice(Room room)
+ {
+ List<CommonDevice> roomIncludeMatchTempDevice = new List<CommonDevice>();
+ foreach (var de in room.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(de);
+ if (device != null)
+ {
+ //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+ if (device.ZigbeeType != 1)
+ {
+ continue;
+ }
+ if (device.Type == DeviceType.TemperatureSensor)
+ {
+ var dev = device as TemperatureSensor;
+ if (dev.SensorDiv == 1)
+ {
+ roomIncludeMatchTempDevice.Add(device);
+ }
+ }
+ else if (device.Type == DeviceType.PMSensor)
+ {
+ var dev = device as PMSensor;
+ foreach (var clu in dev.InClusterList)
+ {
+ if (clu.InCluster == 1026)
+ {
+ roomIncludeMatchTempDevice.Add(device);
+ }
+ }
+ }
+ }
+ }
+ return roomIncludeMatchTempDevice;
+ }
+
+ /// <summary>
+ /// 鍖归厤婀垮害浼犳劅鍣�
+ /// </summary>
+ /// <param name="room"></param>
+ List<CommonDevice> GetMatchHumiditySensorDevice(Room room)
+ {
+ List<CommonDevice> roomIncludeMatchHumpDevice = new List<CommonDevice>();
+ foreach (var de in room.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(de);
+ if (device != null)
+ {
+ //鐢垫睜璁惧涓嶆敮鎸佺粦瀹�
+ if (device.ZigbeeType != 1)
+ {
+ continue;
+ }
+ if (device.Type == DeviceType.TemperatureSensor)
+ {
+ var dev = device as TemperatureSensor;
+ if (dev.SensorDiv == 2)
+ {
+ roomIncludeMatchHumpDevice.Add(device);
+ }
+ }
+ else if (device.Type == DeviceType.PMSensor)
+ {
+ var dev = device as PMSensor;
+ foreach (var clu in dev.InClusterList)
+ {
+ if (clu.InCluster == 1029)
+ {
+ roomIncludeMatchHumpDevice.Add(device);
+ }
+ }
+ }
+ }
+ }
+ return roomIncludeMatchHumpDevice;
+ }
+
+ /// <summary>
+ /// 鑾峰彇妤煎眰瀵瑰簲鐨勬埧闂村垪琛�
+ /// </summary>
+ /// <returns></returns>
+ private List<Room> GetFloorRoomList()
+ {
+ supportRoomList.Clear();
+ var supportRoomListTemp = new List<Room>();
+ var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
+ if (Common.Config.Instance.Home.FloorDics.Count == 0)
+ {
+ // 鑾峰彇娌℃湁妤煎眰鎴块棿
+ foreach (var room in listAllRoom)
+ {
+ if (string.IsNullOrEmpty(room.FloorId))
+ {
+ if (room.IsLove)
+ {
+ continue;
+ }
+ supportRoomListTemp.Add(room);
+ }
+ }
+ }
+ else
+ {
+ // 鑾峰彇鏀寔鐨勬埧闂�
+ foreach (var room in listAllRoom)
+ {
+ if (room.IsLove)
+ {
+ continue;
+ }
+ supportRoomListTemp.Add(room);
+ }
+ }
+ return supportRoomListTemp;
+ }
+
+ /// <summary>
+ /// 鎵�鏈夋埧闂翠腑鍖归厤鐨勬敮鎸佺粦瀹氱殑鎵�鏈夌洰鏍囧垪琛�
+ /// </summary>
+ /// <returns></returns>
+ List<CommonDevice> GetAllRoomSupportDeviceList()
+ {
+ currentPanelSupportBindDeviceList.Clear();
+ List<CommonDevice> currentPanelBindSupportDeviceListTemp = new List<CommonDevice>();
+ switch (curDeviceBindType)
+ {
+ case 1:
+ foreach (var r in supportRoomList)
+ {
+ if (r.ListDevice.Count == 0)
+ {
+ continue;
+ }
+ foreach (var deviceKeys in r.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
+ {
+ //鑾峰彇璁惧绫诲瀷鐨�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ {
+ continue;
+ }
+ if (device.Type == DeviceType.FreshAir)
+ {
+ currentPanelBindSupportDeviceListTemp.Add(device);
+ }
+ }
+ }
+ }
+ break;
+ case 2:
+ foreach (var r in supportRoomList)
+ {
+ if (r.ListDevice.Count == 0)
+ {
+ continue;
+ }
+ var deviceListTemp = GetMatchTemperatureSensorDevice(r);
+ foreach (var dev in deviceListTemp)
+ {
+ currentPanelBindSupportDeviceListTemp.Add(dev);
+ }
+ }
+ break;
+ case 3:
+ foreach (var r in supportRoomList)
+ {
+ if (r.ListDevice.Count == 0)
+ {
+ continue;
+ }
+ var deviceListTemp = GetMatchHumiditySensorDevice(r);
+ foreach (var dev in deviceListTemp)
+ {
+ currentPanelBindSupportDeviceListTemp.Add(dev);
+ }
+ foreach (var deviceKeys in r.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
+ {
+ if (device.Type == DeviceType.FreshAirHumiditySensor)
+ {
+ currentPanelBindSupportDeviceListTemp.Add(device);
+ }
+ }
+ }
+ }
+ break;
+ case 4:
+ foreach (var r in supportRoomList)
+ {
+ if (r.ListDevice.Count == 0)
+ {
+ continue;
+ }
+ foreach (var deviceKeys in r.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
+ {
+ if (device.Type == DeviceType.PMSensor)
+ {
+ currentPanelBindSupportDeviceListTemp.Add(device);
+ }
+ }
+ }
+ }
+ break;
+ }
+ return currentPanelBindSupportDeviceListTemp;
+ }
+
+ /// <summary>
+ /// 鑾峰彇褰撳墠鎴块棿涓尮閰嶇殑鏀寔缁戝畾鐨勮澶囧垪琛�
+ /// </summary>
+ /// <returns></returns>
+ List<CommonDevice> GetCurRoomSupportDeviceList(Room curRoom)
+ {
+ currentRoomSupportBindDeviceList.Clear();
+ List<CommonDevice> curRoomDeviceListTemp = new List<CommonDevice>();
+ switch (curDeviceBindType)
+ {
+ case 1:
+ foreach (var deviceKeys in curRoom.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
+ {
+ //鑾峰彇璁惧绫诲瀷鐨�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
+ //鏂伴闈㈡澘鐨勬柊椋庤澶囷紝鍒欎笉鏄剧ず
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_FangyueFreshAir)
+ {
+ continue;
+ }
+ if (device.Type == DeviceType.FreshAir)
+ {
+ curRoomDeviceListTemp.Add(device);
+ }
+ }
+ }
+ break;
+ case 2:
+ curRoomDeviceListTemp = GetMatchTemperatureSensorDevice(curRoom);
+ break;
+ case 3:
+ curRoomDeviceListTemp = GetMatchHumiditySensorDevice(curRoom);
+ foreach (var deviceKeys in curRoom.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
+ {
+ if (device.Type == DeviceType.FreshAirHumiditySensor)
+ {
+ curRoomDeviceListTemp.Add(device);
+ }
+ }
+ }
+ break;
+ case 4:
+ foreach (var deviceKeys in curRoom.ListDevice)
+ {
+ var device = LocalDevice.Current.GetDevice(deviceKeys);
+ if (device != null)
+ {
+ if (device.Type == DeviceType.PMSensor)
+ {
+ curRoomDeviceListTemp.Add(device);
+ }
+ }
+ }
+ break;
+ }
+ return curRoomDeviceListTemp;
+ }
+ #endregion
+
+ #region 绉婚櫎鏂规硶
+ /// <summary>
+ /// 閲嶅啓绉婚櫎鏂规硶
+ /// </summary>
+ public override void RemoveFromParent()
+ {
+ actionFreshAirTarget = null;
+ actionTemperatureTarget = null;
+ actionHumidityTarget = null;
+ actionPMTarget = null;
+ base.RemoveFromParent();
+ }
+ #endregion
+ }
+}
+
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
new file mode 100755
index 0000000..ddcca6f
--- /dev/null
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
@@ -0,0 +1,10 @@
+锘縰sing System;
+namespace Shared.Phone.UserCenter.DeviceBind
+{
+ public class PanelSimpleMutilfunctionTargetsForm : BindCommonLayout
+ {
+ public PanelSimpleMutilfunctionTargetsForm()
+ {
+ }
+ }
+}
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
old mode 100644
new mode 100755
index 470b734..0943d12
--- a/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs
@@ -16,6 +16,7 @@
public static Action<bool> LogicAction = null;
/// <summary>
/// 鏇存柊褰撳墠闂ㄩ攣娑夊強鐨勭姸鎬併�愪富瑕佺敤浜庨棬閿佹搷浣滃父寮�妯″紡鐨勫洖璋冦��
+ /// string=mac
/// </summary>
public static Action<string, bool> UpdateCurrentDoorlockAction = null;
/// <summary>
@@ -217,7 +218,7 @@
if (haveLogic)
{
//姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
- var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.DelAllLogic(doorLock);
}
}
else
@@ -309,7 +310,7 @@
if (haveLogic)
{
//姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
- var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.DelAllLogic(doorLock);
}
}
else
@@ -358,7 +359,7 @@
if (haveLogic)
{
//姝ゅ鍒犻櫎娓╁眳鍩庣殑甯稿紑妯″紡鐗规畩閫昏緫
- var resTemp1 = await Shared.Phone.Device.Logic.SkipView.GetLogicAll(doorLock);
+ var resTemp1 = await Shared.Phone.Device.Logic.SkipView.DelAllLogic(doorLock);
}
Application.RunOnMainThread(() =>
{
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/FunctionSetting.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index e84d61a..381ae4e 100644
--- a/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp20200525/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -25,14 +25,9 @@
ZbGateway.StatusList.Add(this);
Application.RunOnMainThread(() =>
{
- ControlCommonResourse.UpdateDoorLockStatusAction = (obj) =>
- {
- UpdateNomallyOpenStatus();
- };
-
UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction += (DoorlockKey, status) =>
{
- var key = doorLock.DeviceAddr + doorLock.DeviceEpoint;
+ var key = doorLock.DeviceAddr;
if (DoorlockKey == key)
{
DoorLockCommonInfo.NormallyOpenModeValue(this.doorLock, status);
@@ -638,35 +633,6 @@
}
}
- //缃戝叧鎵ц閫昏緫锛屽父寮�妯″紡澶辨晥涓婃姤
- //if (typeTag == "DoorLockAlarmsSendAlarmInform" && tempDevice != null)
- //{
- // var doorL = (ZigBee.Device.DoorLock)tempDevice;
-
- // if (doorL.DeviceAddr + doorL.DeviceEpoint == doorLock.DeviceAddr + doorLock.DeviceEpoint)
- // {
- // //闈炰富浜轰笉寮硅繖涓獥鍙�
- // if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- // {
- // return;
- // }
- // if (doorLock.IsDoorLockNormallyMode)
- // {
- // if (canOpenNormallyMode)
- // {
- // Application.RunOnMainThread(() =>
- // {
- // Action<bool> action = (obj) =>
- // {
- // UpdateNomallyOpenStatus();
- // };
- // DoorLockCommonInfo.NomallyOpenModeInvalidDialog(doorLock, DoorLockCommonInfo.DoorLockMessType.ServicePush, haveLogicNormallyOpenMode, action);
- // });
- // }
- // }
- // }
- //}
-
if (typeTag == "DeviceStatusReport" && tempDevice != null)
{
if (tempDevice != null)
@@ -736,7 +702,7 @@
Application.RunOnMainThread(async () =>
{
- var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(3, doorLock);
+ var resTemp = await Shared.Phone.Device.Logic.SkipView.Exist(2, doorLock);
if (resTemp == 0)
{
haveLogicNormallyOpenMode = false;
@@ -1102,7 +1068,7 @@
action = () =>
{
- //绯荤粺瀵嗙爜鏀寔鎿嶄綔闂ㄩ攣鍚庯紝璋冪敤娓╁眳鍩庣殑鐣岄潰銆愬父寮�鑷姩鍖栥��
+ //WJC鐨勪唬鐮侊細绯荤粺瀵嗙爜鏀寔鎿嶄綔闂ㄩ攣鍚庯紝璋冪敤娓╁眳鍩庣殑鐣岄潰銆愬父寮�鑷姩鍖栥��
if (doorLock == null)
{
///闃叉鎶涘紓甯�
@@ -1120,13 +1086,25 @@
UserView.HomePage.Instance.AddChidren(addLogicPage);
UserView.HomePage.Instance.PageIndex += 1;
addLogicPage.Show();
- addLogicPage.action += (w) =>
- {
- DoorLockCommonInfo.NormallyOpenModeValue(doorLock, w);
- UpdateNomallyOpenStatus();
- //杩斿洖鎸夐敭娓呯┖褰撳墠閫昏緫瀹氫箟鐨凩ogicAction
- UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
- };
+ addLogicPage.action += async (w) =>
+ {
+ DoorLockCommonInfo.NormallyOpenModeValue(doorLock, w);
+ UpdateNomallyOpenStatus();
+ //杩斿洖鎸夐敭娓呯┖褰撳墠閫昏緫瀹氫箟鐨凩ogicAction
+ UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = null;
+ //鏄惁瀛樺湪甯稿紑妯″紡
+ var resTemp = Shared.Common.Logic.SoneLogicList;
+ if (resTemp.Count == 0)
+ {
+ haveLogicNormallyOpenMode = false;
+ }
+ else
+ {
+ haveLogicNormallyOpenMode = true;
+ }
+
+ UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction -= addLogicPage.updateCurrentDoorlockActionTemp;
+ };
};
HdlCheckLogic.Current.CheckSecondarySecurity(action);
@@ -1232,9 +1210,6 @@
/// </summary>
public override void RemoveFromParent()
{
- //寰愭鐨勯棬閿佺晫闈㈠叧闂�(缃戝叧鍏ㄥ眬鎺ユ敹鏃朵娇鐢�)
- //ControlCommonResourse.IsDoorLockPageOpen = false;
- ControlCommonResourse.UpdateDoorLockStatusAction = null;
UserCenter.DoorLock.DoorLockCommonInfo.UpdateCurrentDoorlockAction = null;
if (IsDrawerLockMode)
{
diff --git a/ZigbeeApp20200525/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp20200525/Shared/Phone/ZigBee/Common/Application.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/Phone/ZigBee/Device/DoorLock.cs b/ZigbeeApp20200525/Shared/Phone/ZigBee/Device/DoorLock.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp20200525/Shared/Phone/ZigBee/Device/ZbGateway.cs
old mode 100644
new mode 100755
diff --git a/ZigbeeApp20200525/Shared/R.cs b/ZigbeeApp20200525/Shared/R.cs
index 6f6bc6a..1bb7dc6 100644
--- a/ZigbeeApp20200525/Shared/R.cs
+++ b/ZigbeeApp20200525/Shared/R.cs
@@ -606,6 +606,22 @@
/// 闂ㄩ攣甯稿紑妯″紡宸插叧
/// </summary>
public const int NormallyClosed = 323;
+ /// <summary>
+ /// 鍏ョ綉
+ /// </summary>
+ public const int Connection = 324;
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘 -> 鎵撳紑闈㈡澘涓昏彍鍗曪紝鍙充笂瑙掔偣鍑粄0}璁剧疆鎸夐挳锛岀偣鍑诲叆缃�
+ /// </summary>
+ public const int AddSimpleMultifunctionMsg = 325;
+ /// <summary>
+ /// 绠�绾︾幆澧冮潰鏉� -> 闀挎寜鈥滃紑鍏斥�濇寜閿�5绉掞紝鎵�鏈夌伅姣忚繘琛寋0}2娆′寒鏆楀垏鎹紝鍗冲叆缃戞垚鍔�
+ /// </summary>
+ public const int AddSimpleEnvironmentMsg = 326;
+ /// <summary>
+ /// 闀挎寜鈥滃紑鍏斥�濇寜閿�5绉�
+ /// </summary>
+ public const int LongPressButtonSwitch = 327;
public readonly static int cancel = 5097;
public readonly static int confrim = 5098;
@@ -6220,6 +6236,14 @@
/// 闀滃儚ID涓�1307鐨勮澶囩殑榛樿鍚嶅瓧锛歅M2.5绌烘皵璐ㄩ噺浼犳劅鍣�
/// </summary>
public const int uDeviceModelId1307 = 30040;
+ /// <summary>
+ /// 闀滃儚ID涓�212鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾﹀鍔熻兘闈㈡澘
+ /// </summary>
+ public const int uDeviceModelId212 = 30041;
+ /// <summary>
+ /// 闀滃儚ID涓�230鐨勮澶囩殑榛樿鍚嶅瓧锛氱畝绾︾幆澧冮潰鏉�
+ /// </summary>
+ public const int uDeviceModelId230 = 30042;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄澶囨墍灞炵绫荤殑缈昏瘧鍚嶅瓧,浠�40000寮�濮嬧槄鈽呪槄鈽�
/// <summary>
@@ -6415,5 +6439,14 @@
/// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
/// </summary>
public const int uDeviceDirectionName27 = 70026;
+ /// <summary>
+ /// 绠�绾﹀鍔熻兘闈㈡澘
+ /// </summary>
+ public const int uDeviceDirectionName28 = 70027;
+ /// <summary>
+ /// 绠�绾︾幆澧冮潰鏉�
+ /// </summary>
+ public const int uDeviceDirectionName29 = 70028;
+
}
}
diff --git a/ZigbeeApp20200525/Shared/Shared.projitems b/ZigbeeApp20200525/Shared/Shared.projitems
old mode 100755
new mode 100644
index f6b91c0..ce0a23d
--- a/ZigbeeApp20200525/Shared/Shared.projitems
+++ b/ZigbeeApp20200525/Shared/Shared.projitems
@@ -17,415 +17,8 @@
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\GetAppVersionCode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\ResultPack.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\UserLoginLocalRegionRes.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\AddOrEditorSceneForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\AdjustTargetAddDelayTimeForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\AdjustTargetAddDeviceForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\AdjustTargetAddSceneForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\CategoryMainForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\Base\DeviceRowCommon.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceAcRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceAirSwitchRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceColorLightRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceCurtainRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceDoorLockRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceFreshAirRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DevicePmSensorRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceRelayRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceSensorRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceTemperatureRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\SelectLocalSceneImageForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\CurrentDeviceState.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\AddDeviceView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\Addview.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\CompleteView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\FunView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\IfString.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\mFunView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\SaveView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\SelectedDeviceView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\TipView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\TopView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\TypeView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\Method.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\OneLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\OneTimePoint.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\RoomAndDeviceView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SkipView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SoneLogicList.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountForgetPWD.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\Logic\AccountLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountRegister.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountRegisterSuccess.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountResetPWDSuccess.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\Controls\PhoneEmailSelectControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\PhoneEmailForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\PhoneZone.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceAcDetailCardMethord.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\SelectFloorForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\SelectHouseForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\CommonEnum.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\CommonFormResouce.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\LeftIconButtonRow.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RoomView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SceneCategoryView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectTime.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectZone.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\TopFrameLayout.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\DeviceTarget.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\AddCondition.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockLogicCommunalPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockLogicList.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\LogicIfon.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\MemberList.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SecurityMode.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\Send.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\MainPage\ControlForm\Base\DeviceDetailCardCommonForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceAcDetailCardForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceColorLightDetailCardForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceCurtainDetailCardForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceFreshAirDetailCardForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DevicePmSensorDetailCardForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceRelayDetailCardForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceFreshAirCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceFunctionUnallocatedControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceSelectUnallocatedControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\SelectLocalDeviceImageForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\DeviceDetailInfoForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\UnallocatedRoomForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\Base\DeviceCardCommon.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceAcCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceAirSwitchCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceColorLightCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceCurtainCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceDoorLockCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceRelayCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceSensorCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceTemperatureCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\ListRoomCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\SafetyShortcutControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\SceneCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\HomeMainPageForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ModelData\DeviceModelDataLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ModelData\ModelDataCommon.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Abount\AbountForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Abount\SLAForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\AccountOption.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\ResidenceOption.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Base\FrameLayoutBase.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Base\RowLayoutBase.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\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\SeekBarControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\TopRightFloorMenuControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\VerificationCodeControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceSimpleSelectControl.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\IconBigViewControl.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\Controls\RowLayoutControls\DeviceFunctionTypeRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\SceneControls\ScenePictrueControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\BottomMenuSelectForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\NumberPswInputDialogForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\PswGestureSecirityForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\PswSecondarySecurityForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlACZbGatewayUpdateLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlCheckLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlControlLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceAirConditionerLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceCommonLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceCurtainLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceDoorLockLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceOtherLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlExperienceAccountLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayBackupLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayUpdateLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlLogLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlResidenceLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlRoomLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlSceneLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlThreadLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlWifiLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\AirConditioner\AirConditionerModeForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\AirConditioner\ACZbGatewayModuleUpdateForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\AirConditioner\ACZbGatewayUpdateMenuForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\AirConditioner\IndoorUnitListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\AirConditioner\IndoorUnitSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\AddDevicePage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\AddScenePage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\BindCommonLayout.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\BindTargetsPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\ChooseKeyModePage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Curtain\AutoOpenDirectionAndLimitSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Curtain\SiphonateDirectionAndLimitSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\AirConditionerZbGatewayDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\AirSwitchCloudContrDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\CommonForm\DirectionCommonForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\CurtainAutoOpenDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\CurtainSiphonateDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelCurtainDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueEightButtonDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueEnvironmentDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueFourButtonDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueFreshAirDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueFreshAirModulDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueTwoButtonDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\RepeaterZigbeeDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorCarbonMonoxideDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorCeilingGasDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorDoorWindowDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorFireDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorInfraredDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorPirDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorPMTwoPointFiveForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorTemperatureHumidityForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorWaterDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelBackLighWithSensorForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueButtonSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueEnvironmentButtonSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueEnvironmentLightSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueEnvironmentTargetForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFreshAirBackLightSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFreshAirButtonSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFreshAirTargetsForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFunctionSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorDimmingModeForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorTargetSelectForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorWorkModeMenuForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\AddUnLockMethod.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\AddUnLockMethodTip.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorLockCommonInfo.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorLockCommonLayout.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorlockDialog.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\EntryStatusPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\FunctionSetting.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\MasterManagementPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\MemberFrozenPage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\ShowDoorLockMsgControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\TemporaryPassword.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\AddGatewayHelpForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApDirection1Form.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApDirection2Form.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApDirection3Form.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApSearchForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApSelectNetworkForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayAddSuccessForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayBackUpListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayProductInfoForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewaySearchListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayRebindForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessUdpDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessUdpSearchForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessUdpSelectNetworkForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayGeneralInformationForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayUploadAndDownLoadForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayCoordinatorInfoForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayVirtualDriveInfoForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Guide\GuideCommonForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Guide\GuideForm1.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Guide\GuideForm2.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Guide\GuideHouseForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Guide\GuideRoomForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HdlBackup\HdlAutoBackupForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HdlBackup\HdlBackupListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionDirectoryListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionFileContentForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionFileListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionGatewayListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionMainForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionMemoryListDeviceForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionSearchAllFile.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" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\EditorGesturePasswordForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\EditorSecondaryPasswordForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\ForgotAccountPasswordForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\ForgotSecondaryPasswordForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\AddNewRoomForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\EditorRoomInforForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\FloorListRoomForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\LookRoomDeviceListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\ResidenceManagementForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\LookRoomSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetStatuSelectAcForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\CoercePswAddNewForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\CoercePswEditorForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\PasswordUserEditorForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\MessageManagementForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\QRCodeForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\ResetAccountPasswordForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\AreaCodeSelectForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\BottomItemSelectForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\CommonForm\CommonFormBase.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\CommonForm\DialogCommonForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\NormalSelectControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\DateSelectControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceUpdateLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ClickButtonControls\NormalClickButton.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\DeviceInformationListControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\PswNumberInputControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SafetyMasterControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SafetySensorStatuControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceInfoIconControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceRoomControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\GatewayRowControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameListControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ClickButtonControls\BottomClickButton.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameLayoutStatuControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalFrameControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalListControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\NormalViewControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Base\ButtonBase.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Common\ClickButtonCommon.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Common\IconControlCommon.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\InformationTipView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameCaptionInputControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameCaptionViewControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceObjectControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SafeguardLogControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\SceneControls\SceneRoomControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\SceneControls\SceneSimpleSelectControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\TextInputControls\TextInputControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\TextInputControls\TextInputExControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\TopRightMenuControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceGeneralInformationForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFourButtonDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\Help\DeviceDirectionHelpForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\DimmableLightOneLoadDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelThreeButtonDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelTwoButtonDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\RelayThreeLoadDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DoorLock\DoorLockHistoryLogForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DoorLock\DoorLockScreeningTypeForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelButtonSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFunctionSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorBindTargetSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceFirmwareUpdateForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelBackLightSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceHistoryFirmwareVersionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceListMainForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelColorSelectForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceSearchForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\SelectDeviceForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\IntelligentLocksH06cDirectionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceDryContactSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceFunctionSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Relay\RelayThreeLoadBackLightSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayFirmwareUpdateForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayHistoryFirmwareVersionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayLinuxInfoForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\BindInfo.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\IMessageCommon.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\UserCenterCommon.cs" />
- <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\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\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\CommonBase\Logic\HdlDeviceBindLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceFixedAttributeLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceHardInfoLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceImageInfoLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlFirmwareUpdateLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlAutoBackupLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlBackupLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceAttributeLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayReceiveLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlJiguangMsgPushLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDevicePanelLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlShardLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDevicePirSensorLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\AddMemberByIdForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\AddMemberInfoForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\AddMemberSuccessForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\SubAccountLevelUpSuccessForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\OtherParty\OtherPartyAccountMenuForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\ResidenceListForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\ControlCommonResourse.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\DirectoryFileNameResourse.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\FirmwareUpdateResourse.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\GatewayResourse.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\CoercePswAddContactForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetAddDeviceForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetAddMenuForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetAddSceneForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetExistSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\GarrisonAreaDelayedSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\PasswordAddNewForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\GarrisonAreaListMenuForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetStatuSelectCurtainForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetStatuSelectLightForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetStatuSelectSwitchForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\PasswordMenuForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\GarrisonAreaSettionMenuForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\GarrisonAreaExistSensorForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\PasswordListUserForm.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" />
- <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" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\FreshAir.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\HumiditySensor.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\PMSensor.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Repeater.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Transverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)R.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\HomePage.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\UserPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\ZigbeeColor.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\UserCenterColor.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\UserCenterLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\UserCenterResourse.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\MemberListForm.cs" />
- <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\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\Login\AccountLoginForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\CommonPage.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\GetAreaCode.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\ResidenceRes.cs" />
@@ -433,58 +26,466 @@
<Compile Include="$(MSBuildThisFileDirectory)Common\ResponseEntity\UserLoginRes.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\SendDataToServer.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\Room.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ListRoomViewFrom.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\SelectLocalRoomImageForm.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" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\CommonForm\EditorCommonForm.cs" />
- <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\UserCenter\Safety\SafetyManagementMainForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameRowControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Common\SceneUI.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\Application.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\AdjustTargetAddDeviceForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\CategoryMainForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\AdjustTargetAddDelayTimeForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\AdjustTargetAddSceneForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\SelectHouseForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\SelectLocalSceneImageForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\SelectFloorForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\AddOrEditorSceneForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceAirSwitchRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceAcRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceFreshAirRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DevicePmSensorRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceSensorRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceTemperatureRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceRelayRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceDoorLockRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceColorLightRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\DeviceCurtainRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Category\Controls\DeviceRow\Base\DeviceRowCommon.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\UnallocatedRoomForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ListRoomViewFrom.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\HomeMainPageForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\DeviceDetailInfoForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\SelectLocalDeviceImageForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceFreshAirDetailCardForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceColorLightDetailCardForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceAcDetailCardForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceAcDetailCardMethord.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DevicePmSensorDetailCardForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceCurtainDetailCardForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\DeviceRelayDetailCardForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\ControlForm\Base\DeviceDetailCardCommonForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\SceneCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceSelectUnallocatedControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\ListRoomCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\SafetyShortcutControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceFunctionUnallocatedControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceRelayCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceDoorLockCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceAirSwitchCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceCurtainCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceFreshAirCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceColorLightCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceTemperatureCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceSensorCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceAcCardControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\Base\DeviceCardCommon.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\LoginLoading.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\UserPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\HomePage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\CommonForm\CommonFormBase.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\CommonForm\EditorCommonForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\CommonForm\DialogCommonForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ModelData\ModelDataCommon.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ModelData\DeviceModelDataLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountForgetPWD.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountRegister.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\PhoneZone.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountLoginForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountRegisterSuccess.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\AccountResetPWDSuccess.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\PhoneEmailForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\Logic\AccountLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Login\Controls\PhoneEmailSelectControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Guide\GuideForm1.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Guide\GuideCommonForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Guide\GuideHouseForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Guide\GuideRoomForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Guide\GuideForm2.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HdlBackup\HdlAutoBackupForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HdlBackup\HdlBackupListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\LookRoomDeviceListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\FloorListRoomForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\SelectLocalRoomImageForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\LookRoomSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\ResidenceListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\AddNewRoomForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\EditorRoomInforForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\ResidenceManagementForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckOldPhoneForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\EditorGesturePasswordForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\ForgotSecondaryPasswordForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckNewPhoneForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\ResetAccountPasswordForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckOldEmailForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\EditorAccountPasswordForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\ForgotAccountPasswordForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\CheckNewEmailForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\EditorSecondaryPasswordForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionDirectoryListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionSearchAllFile.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionGatewayListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionMainForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionFileContentForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionFileListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionMemoryListDeviceForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Suggestion\FeedbackForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\AddMemberSuccessForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\AddMemberByIdForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\MemberNotEsixtForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\AddMemberInfoForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\MemberManagementForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\SubAccountLevelUpSuccessForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\MemberListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\LookSharedContentForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\LookSharedListRoomForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\AddNewSharedListRoomForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\SharedContent\AddNewSharedContentForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetAddMenuForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\GarrisonAreaSettionMenuForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\GarrisonAreaDelayedSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\CoercePswEditorForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\PasswordListUserForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetStatuSelectSwitchForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\GarrisonAreaListMenuForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetExistSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\SafetyManagementMainForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\PasswordAddNewForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetAddSceneForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\CoercePswAddContactForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\GarrisonAreaExistSensorForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetStatuSelectAcForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\PasswordMenuForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetAddDeviceForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetStatuSelectLightForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\CoercePswAddNewForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetStatuSelectCurtainForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\PasswordUserEditorForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\OtherParty\OtherPartyAccountMenuForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UndistributeDoorlockUserPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\EntryStatusPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\MemberFrozenPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorLockCommonLayout.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\FunctionSetting.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\AddUnLockMethodTip.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\MasterManagementPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\ShowDoorLockMsgControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UnLockMethod.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\TimeSettignPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorlockDialog.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UserDoorLockPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\UserManagement.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\AddUnLockMethod.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\TemporaryPassword.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\DoorLock\DoorLockCommonInfo.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Abount\AbountForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Abount\SLAForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceAddSuccessForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceFirmwareUpdateForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceFunctionSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceGeneralInformationForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceSearchForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceHistoryFirmwareVersionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceDryContactSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceMacInfoEditorForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DeviceListMainForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFreshAirTargetsForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueEnvironmentLightSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFunctionSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelBackLighWithSensorForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueEnvironmentTargetForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFreshAirButtonSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFunctionSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueButtonSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelSimpleMutilfunctionTargetsForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelButtonSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelSimpleEnvironmentTargetsForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelBackLightSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelColorSelectForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueEnvironmentButtonSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelFangyueFreshAirBackLightSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Curtain\AutoOpenDirectionAndLimitSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Curtain\SiphonateDirectionAndLimitSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorDimmingModeForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorTargetSelectForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorBindTargetSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\PirSensor\PirSensorWorkModeMenuForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DoorLock\DoorLockScreeningTypeForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\DoorLock\DoorLockHistoryLogForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\AirConditioner\ACZbGatewayModuleUpdateForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\AirConditioner\IndoorUnitSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\AirConditioner\AirConditionerModeForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\AirConditioner\IndoorUnitListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\AirConditioner\ACZbGatewayUpdateMenuForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelSimpleEnvironmentDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorPMTwoPointFiveForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\CurtainSiphonateDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\RelayThreeLoadDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorCeilingGasDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueFourButtonDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\DimmableLightOneLoadDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueEnvironmentDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\RepeaterZigbeeDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueFreshAirModulDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorPirDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\AirConditionerZbGatewayDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\IntelligentLocksH06cDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelThreeButtonDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelSimpleMultifunctionDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorWaterDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorDoorWindowDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\AirSwitchCloudContrDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\AddDeviceTypeListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorInfraredDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelCurtainDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorTemperatureHumidityForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorCarbonMonoxideDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFourButtonDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\CurtainAutoOpenDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelTwoButtonDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueFreshAirDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueTwoButtonDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\SensorFireDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\PanelFangyueEightButtonDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\CommonForm\DirectionCommonForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Direction\Help\DeviceDirectionHelpForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Relay\RelayThreeLoadBackLightSettionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\AddScenePage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\AddDevicePage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\ChooseKeyModePage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\BindTargetsPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\BindCommonLayout.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Bind\BindInfo.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\QRCodeForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\MessageManagementForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\UserInformationForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\SecondAuthenticationForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\UserMainForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\ControlCommonResourse.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\UserCenterResourse.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\GatewayResourse.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\FirmwareUpdateResourse.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\DirectoryFileNameResourse.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\PswSecondarySecurityForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\NumberPswInputDialogForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\BottomMenuSelectForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\SelectDeviceForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\PswGestureSecirityForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\BottomItemSelectForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Form\AreaCodeSelectForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlSafeguardLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlControlLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlBackupLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlFirmwareUpdateLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlThreadLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceUpdateLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\UserCenterLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlAlarmsLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceOtherLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlExperienceAccountLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceAttributeLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceHardInfoLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayReceiveLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlShardLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlLogLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlSceneLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceImageInfoLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayBackupLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlACZbGatewayUpdateLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlResidenceLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceCurtainLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlWifiLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlJiguangMsgPushLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlAutoBackupLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceBindLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDevicePirSensorLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlCheckLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlRoomLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceCommonLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceFixedAttributeLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayUpdateLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDevicePanelLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceAirConditionerLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlDeviceDoorLockLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\IMessageCommon.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\ResidenceOption.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\UserCenterCommon.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\GatewayBackupEnum.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\UserCenterColor.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\UserCenterEnumCommon.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\AccountOption.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\PicViewControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\NormalViewControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\BackViewControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\IconViewControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\InformationTipView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\MostRightIconControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\MessageManagementControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\IconBigViewControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\DateSelectControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\NormalControls\LoadingControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\TextInputControls\TextInputControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\TextInputControls\TextInputExControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\TextInputControls\DialogInputControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameCaptionViewControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameLayoutStatuControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameCaptionInputControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\FrameLayoutControls\FrameListControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\SceneControls\SceneSimpleSelectControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\SceneControls\SceneRoomControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\SceneControls\ScenePictrueControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\MessageControls\ShowMsgControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceInfoIconControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\GatewayRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceSelectControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceSimpleSelectControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceObjectControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\DeviceControls\DeviceRoomControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\RowLayoutControls\RowLayoutControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\RowLayoutControls\DeviceFunctionTypeRowControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalListControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalListRefreshControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalFrameRefreshControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ListViewLayoutControls\VerticalFrameControl.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\ClickButtonControls\BottomClickButton.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\ClickButtonControls\NormalClickButton.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SafeguardLogControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\TopRightMenuControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\RoomDeviceGroupMenuControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\PswGestureInputControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\TopRightFloorMenuControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\NormalSelectControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\VerificationCodeControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\DeviceInformationListControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SeekBarControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\ProgressFormBar.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\PswNumberInputControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\BelongAreaControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\InformationEditorControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SceneFunctionSwitchControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SearchEditText.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SafetyMasterControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\ProgressBar.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\CompoundControls\SafetySensorStatuControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Common\IconControlCommon.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Common\ClickButtonCommon.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Base\TextInputBase.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Base\FrameLayoutBase.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Base\ButtonBase.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Controls\BaseCommonControl\Base\RowLayoutBase.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayFirmwareUpdateForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayCoordinatorInfoForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayVirtualDriveInfoForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayHistoryFirmwareVersionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Update\GatewayLinuxInfoForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessUdpSelectNetworkForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\NewGateWayMenuSelectForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApSelectNetworkForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApDirection3Form.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessUdpSearchForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApDirection1Form.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGatewaySearchForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WiredGatewayDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\AddGatewayHelpForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApDirection2Form.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessUdpDirectionForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Add\WirelessApSearchForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayInfoEditorForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayAddSuccessForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayProductInfoForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewaySearchListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayGeneralInformationForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayBackUpListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayRebindForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Gateway\Manage\GatewayUploadAndDownLoadForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\BigInteger.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\CloudMqttResponsePack.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\CommonInfo.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\Config.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\EncryptionService.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\Global.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\IStatus.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\OwnCodes.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\Config.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\Global.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\CloudMqttResponsePack.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\IStatus.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\EncryptionService.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\Application.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\CommonInfo.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\SendDataToGateway.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\RemoteOperatorConsts.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\SecuritySet.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\SendDataToGateway.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\AirSwitch.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\BindObj.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ColorDimmableLight.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\CommonDevice.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\CurtainBase.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DeviceType.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Enum.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\HDLbutton.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\IASZone.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\LigthtBase.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\OTADevice.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Panel.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\PIRSensor.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Rollershade.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\FreshAir.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Safeguard.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\CommonDevice.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Scene.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\HumiditySensor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\TemperatureSensor.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ThermostatObj.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ToggleLight.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ZbGateway.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ZbGatewayData.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlSafeguardLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlAlarmsLogic.cs" />
- </ItemGroup>
- <ItemGroup>
- <Folder Include="$(MSBuildThisFileDirectory)Phone\CommonForm\" />
- <Folder Include="$(MSBuildThisFileDirectory)Phone\Login\Logic\" />
- <Folder Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\Base\" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\AC.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ThermostatObj.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Transverter.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Rollershade.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\CurtainBase.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Repeater.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Enum.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\BindObj.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\AirSwitch.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Panel.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\PIRSensor.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\IASZone.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DeviceType.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DoorLock.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\HDLbutton.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\LigthtBase.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\OTADevice.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ColorDimmableLight.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\PMSensor.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ToggleLight.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DimmableLight.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\Send.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\OneTimePoint.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\EveryyearPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\TemplatePage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\AddScenePage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SkipView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicCommunalPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\MemberList.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\Cycle.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\TimePage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\RoomAndDeviceView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\EverymonthPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicIfon.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\OneLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DelayTime.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\AddLogicPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\TimePoint.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DeviceTarget.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\CurrentDeviceState.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\IgnoreTime.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SoneLogicList.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\SecurityMode.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\Method.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\WeekPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\CustomText.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\mFunView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\TopView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\IfString.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\TypeView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\Addview.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\TipView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\CompleteView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\FunView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\SelectedDeviceView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\AddDeviceView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\SaveView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockLogicCommunalPage.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\LockLogicList.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\DoorLockLogic\AddCondition.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectTime.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\TopFrameLayout.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\CommonFormResouce.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\LeftIconButtonRow.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SceneCategoryView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\SelectZone.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\CommonEnum.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\CommonForm\RoomView.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Device\Panel\PanelSimpleMutilfunctionBindSensorForm.cs" />
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)DLL\Android\Shared.Droid.dll" />
--
Gitblit v1.8.0